 Danhia
|
11164bb84a
|
replaced the bad request with a redirect to account edit
|
2022-02-18 11:32:08 +01:00 |
|
Danhia
|
67a4d180e0
|
corrected typo
|
2022-02-18 11:27:58 +01:00 |
|
Danhia
|
3b86441259
|
Merge branch 'main' into bot-api
|
2022-02-18 11:11:58 +01:00 |
|
Danhia
|
7b2552f0b5
|
added try except in case user cancels oauth
|
2022-02-18 11:11:34 +01:00 |
|
Danhia
|
eac835bef5
|
removed merge artifact
|
2022-02-18 10:55:54 +01:00 |
|
Danhia
|
06593b26f9
|
fixed merge conflict
|
2022-02-17 23:59:21 +01:00 |
|
Danhia
|
e8f5f33269
|
Merge branch 'challenges-description' into main
|
2022-02-17 23:50:28 +01:00 |
|
Danhia
|
f0479f6577
|
Merge branch 'challenges-description' into main
|
2022-02-17 23:21:56 +01:00 |
|
Danhia
|
60a59b23e6
|
fixed error 500 when requesting german or russian translation
|
2022-02-17 23:21:41 +01:00 |
|
Danhia
|
8f32ef9a6e
|
excluded the API from the i18n patterns
|
2022-02-17 13:09:11 +01:00 |
|
Danhia
|
a0b76903a7
|
added endpoint API for bot
|
2022-02-17 12:40:40 +01:00 |
|
Danhia
|
a7de7b8054
|
removed language code in redirect_uri
|
2022-02-17 12:21:17 +01:00 |
|
Danhia
|
0d734e98b1
|
removed language code in redirect_uri
|
2022-02-17 12:19:52 +01:00 |
|
Danhia
|
3d24fe9b3b
|
tentative for fixing url redirect
|
2022-02-17 12:03:52 +01:00 |
|
Danhia
|
ba0d75c250
|
restored discord OAuth, not working in local, let's test on preprod if the url problem is solved
|
2022-02-17 11:11:36 +01:00 |
|
Danhia
|
3ae80ca17f
|
fixed end of sentence in french with quote badly escaped
|
2022-02-16 20:14:29 +01:00 |
|
Danhia
|
a7e75b2a43
|
fixed quotes that where badly escaped in resources
|
2022-02-16 20:07:19 +01:00 |
|
Danhia
|
9ea67ae2a0
|
Merge branch 'main' into translation
|
2022-02-16 19:28:39 +01:00 |
|
Danhia
|
899a01e472
|
Merge branch 'main' into challenges-description
|
2022-02-16 15:41:52 +01:00 |
|
Danhia
|
c40d49c326
|
Merge pull request 'Ressource page translation' (#22) from Starthur/website:main into translation
Reviewed-on: #22
|
2022-02-16 15:37:18 +01:00 |
 Starthur
|
d6b1380552
|
Last push before pull request
|
2022-02-16 15:23:15 +01:00 |
Arthur-TRT
|
d0c93f98a1
|
Correct some mistake
|
2022-02-16 15:19:07 +01:00 |
|
Arthur-TRT
|
97e120e5fc
|
First translation of Ressources in fr
|
2022-02-16 15:03:40 +01:00 |
|
Danhia
|
494377399c
|
Merge pull request 'Update README' (#21) from update-readme into main
Reviewed-on: #21
|
2022-02-16 14:34:14 +01:00 |
|
Starthur
|
28d8874272
|
Update README
Better solution to create superuser admin
|
2022-02-16 14:33:21 +01:00 |
|
Starthur
|
b9704d3cb3
|
Update README
Add information about migrate and admin right on local dev
|
2022-02-16 14:13:00 +01:00 |
|
Danhia
|
0ac395def8
|
Update 'requirements.txt'
|
2022-02-16 13:53:57 +01:00 |
|
Danhia
|
7ff556a986
|
Update 'README.md'
|
2022-02-16 13:50:19 +01:00 |
|
Danhia
|
5e02041f0c
|
put challenges descriptions outside of the db
|
2022-02-15 18:13:43 +01:00 |
|
Danhia
|
f75a034094
|
replaced jp with ja for news
|
2022-02-15 14:27:37 +01:00 |
|
Danhia
|
5f28bc5d2c
|
Merge pull request '[translation] Added Japanese version' (#9) from ysaito/website:translation-jp into translation
Reviewed-on: #9
|
2022-02-15 13:20:02 +01:00 |
ysaito
|
904ce1b748
|
feat(welcome_ctf_2021.html): Added Japanese version
|
2022-02-15 18:11:00 +09:00 |
|
ysaito
|
5b15b9cd6f
|
feat(sql_challenges.html): Added Japanese version
|
2022-02-15 18:07:48 +09:00 |
|
ysaito
|
5d46bd6df0
|
feat(speed_dating_ctf_2022.html): Added Japanese version
|
2022-02-15 18:06:46 +09:00 |
|
ysaito
|
67de669459
|
feat(dynamic_scoring.html): Added Japanese version
|
2022-02-15 18:05:43 +09:00 |
|
ysaito
|
26aeb6d7bd
|
feat(42ctf_vm.html): Added Japanese version
|
2022-02-15 18:04:30 +09:00 |
|
Danhia
|
1b89fa88d8
|
updated all .po with makemessages
|
2022-02-14 19:38:16 +01:00 |
Danhia
|
0bb3a8b805
|
Merge pull request #8 from ClemaX/translation/de
German news translation and typos fix
|
2022-02-14 18:34:08 +00:00 |
|
Danhia
|
5eec76dd00
|
removed start challenge button when event is over
|
2022-02-14 19:18:00 +01:00 |
 Clément Hamada
|
6b6f264fe0
|
news: locale: de: Initial translation
|
2022-02-13 21:47:03 +01:00 |
|
Clément Hamada
|
c4fd6d05c3
|
locale: de: Fix some typos
|
2022-02-13 21:30:40 +01:00 |
|
Danhia
|
901c73a4f2
|
Merge branch 'main' of https://github.com/Danhia/42CTF into main
|
2022-02-13 13:14:24 +01:00 |
|
Danhia
|
01c0f28b16
|
hotfix for 500 when joining team
|
2022-02-13 13:13:54 +01:00 |
|
Danhia
|
7174cf9edb
|
Update README.md
|
2022-02-12 20:35:41 +01:00 |
|
Danhia
|
ef0fcc5fea
|
Merge pull request #7 from Miliviu/main
Set Spanish to done in the readme todo list
|
2022-02-12 19:28:07 +00:00 |
|
Danhia
|
aabba3ea53
|
dynamic scoring for events, i'm pretty sure everything is gonna break
|
2022-02-12 19:56:46 +01:00 |
Miliviu
|
1abeabebfe
|
Set Spanish to done in the readme todo list
|
2022-02-11 19:55:50 +01:00 |
|
Danhia
|
9f2d78ac33
|
challenges not yet published
|
2022-02-09 14:14:41 +01:00 |
|
Danhia
|
27ed107501
|
Merge pull request #6 from Miliviu/main
Add translation of news to Spanish
|
2022-02-09 13:36:45 +01:00 |
 Miliviu
|
0dea7fb619
|
Add translation of news to Spanish
|
2022-02-09 13:08:02 +01:00 |