Commit Graph

311 Commits

Author SHA1 Message Date
ix 5ea11f9951 Merge branch 'events' into main 2021-10-22 14:21:16 +02:00
ix 9f0273a85b Merge branch 'main' of github.com:Danhia/42CTF into main 2021-10-22 14:21:12 +02:00
ix 0469a140cb Merge branch 'main' of github.com:Danhia/42CTF into main 2021-10-22 14:21:12 +02:00
ix 63349df20f Update fix 2021-10-22 14:21:05 +02:00
ix 71b612babe Update fix 2021-10-22 14:21:05 +02:00
Ix 1274a6b7fe
Merge pull request #1 from Danhia/events
Update fix
2021-10-22 13:59:27 +02:00
Ix 1730f1048e Merge pull request #1 from Danhia/events
Update fix
2021-10-22 13:59:27 +02:00
ix f5b54e3ed6 Merge branch 'main' of github.com:Danhia/42CTF into main 2021-10-22 13:58:40 +02:00
ix 7c5c33b31a Merge branch 'main' of github.com:Danhia/42CTF into main 2021-10-22 13:58:40 +02:00
ix 0a42af4a9b Update fix 2021-10-22 13:58:23 +02:00
ix fca47da223 Update fix 2021-10-22 13:58:23 +02:00
Ix 87b1a5f6f8
Update README.md 2021-10-22 11:48:28 +02:00
Ix f914c27a28 Update README.md 2021-10-22 11:48:28 +02:00
ix a379f4934d Update todo 2021-10-22 11:46:48 +02:00
ix 8728d5cd3e Update todo 2021-10-22 11:46:48 +02:00
ix 86cc6070e1 Events done 2021-10-22 11:45:50 +02:00
ix 6997aaf93b Events done 2021-10-22 11:45:50 +02:00
ix c98e89b5ca events added, need to smooth html and css 2021-10-21 15:02:02 +02:00
ix 06dc8188a0 events added, need to smooth html and css 2021-10-21 15:02:02 +02:00
Ix 8d3cd60ae4
Update README.md 2021-09-21 21:42:55 +02:00
Ix 0f231a4988 Update README.md 2021-09-21 21:42:55 +02:00
ix e956082385 category challenges listed by point decrease 2021-09-08 21:50:28 +02:00
ix 2b49c995a0 category challenges listed by point decrease 2021-09-08 21:50:28 +02:00
ix 071ba34792 Discord button removed, css fix when 0 at category stat, messages recompiled 2021-09-08 21:36:15 +02:00
ix 4a2504be73 Discord button removed, css fix when 0 at category stat, messages recompiled 2021-09-08 21:36:15 +02:00
ix 81e283ea69 Categories stats added, css modified, fix responsive display of profile page 2021-09-08 16:53:00 +02:00
ix 0f92cf3da1 Categories stats added, css modified, fix responsive display of profile page 2021-09-08 16:53:00 +02:00
ix ed928f6f33 Merge branch 'graph' into main 2021-09-08 04:00:39 +02:00
ix 8a203161ed Merge branch 'graph' into main 2021-09-08 04:00:39 +02:00
ix ce31ce30ee Charts changed to highcharts 2021-09-08 03:59:35 +02:00
ix c5dedbfc26 Charts changed to highcharts 2021-09-08 03:59:35 +02:00
ix 500d6fe228 Charts added 2021-09-08 00:32:44 +02:00
ix c5713d3887 Charts added 2021-09-08 00:32:44 +02:00
Danhia 0c0506505b fixed missing translation header in password reset templates 2021-09-07 20:42:18 +00:00
Danhia 299b47f598 fixed missing translation header in password reset templates 2021-09-07 20:42:18 +00:00
ix 62b3b7e5cd internationalization for news 2021-09-07 21:13:30 +02:00
ix 9f431ac4fa internationalization for news 2021-09-07 21:13:30 +02:00
ix acbf38a6a7 Merge remote-tracking branch 'origin/traduction-fr' into main 2021-09-07 19:54:05 +02:00
ix 2f7d96ed03 Merge remote-tracking branch 'origin/traduction-fr' into main 2021-09-07 19:54:05 +02:00
ix dbdd6b06f8 internationalization fixed, templates url fixed, messages recompiled 2021-09-07 19:52:40 +02:00
ix 1caccc6428 internationalization fixed, templates url fixed, messages recompiled 2021-09-07 19:52:40 +02:00
Danhia 428edadb31 changed translation for sign up 2021-09-06 21:34:45 +02:00
Danhia b84349b414 changed translation for sign up 2021-09-06 21:34:45 +02:00
Danhia 768e62f369 french translation 2021-09-06 21:04:42 +02:00
Danhia 04cbde8326 french translation 2021-09-06 21:04:42 +02:00
ix 52c2dcdec3 last 2021-09-06 20:15:03 +02:00
ix ebb3712702 last 2021-09-06 20:15:03 +02:00
ix 42441e7854 local settings 2021-09-06 20:14:23 +02:00
ix 58947f2b89 local settings 2021-09-06 20:14:23 +02:00
ix b0cea92ea8 local settings 2021-09-06 20:12:03 +02:00