Arthur TROUILLET
|
39e3859836
|
Done
|
2022-03-29 11:52:40 +02:00 |
Arthur-TRT
|
a26784cd98
|
First version of 42Oauth
|
2022-03-29 11:02:07 +02:00 |
Danhia
|
7dad96d79f
|
Merge pull request 'API for events data' (#33) from Danhia/website:api-events into main
Reviewed-on: 42CTF/website#33
|
2022-03-19 20:42:35 +01:00 |
Danhia
|
d554961dd1
|
added API for events data
|
2022-03-19 20:38:52 +01:00 |
Danhia
|
280ba0d1fc
|
Merge pull request 'Fixed a typo in resources /locale/fr' (#32) from FdB/website:fdb-patch-typo-binaires into main
Reviewed-on: 42CTF/website#32
|
2022-03-19 19:54:39 +01:00 |
Bertrand C
|
bdd51b6cf9
|
Merge branch 'main' into fdb-patch-typo-binaires
|
2022-03-19 19:50:25 +01:00 |
Bertrand C
|
c004c18e75
|
Fixed a typo in resources /locale/fr
Binaies to binaires
|
2022-03-19 19:41:47 +01:00 |
Danhia
|
e8d43586a6
|
merge main into translation
|
2022-03-19 19:33:09 +01:00 |
Danhia
|
2da57b7b9b
|
Merge pull request 'Change text color of input for better readibility' (#31) from UncleReaton/website:main into main
Reviewed-on: 42CTF/website#31
|
2022-03-19 19:21:33 +01:00 |
Danhia
|
a828ce2ece
|
Merge pull request 'Add a partial translation into Russian language' (#30) from Aslan/website:translation into translation
Reviewed-on: 42CTF/website#30
|
2022-03-19 19:20:27 +01:00 |
UncleReaton
|
16030c14a4
|
Change text color of flag submission input for better readibility
|
2022-03-19 16:52:47 +01:00 |
Aslan
|
ca86079148
|
Add translation of remaining part into Russian language
|
2022-03-18 00:38:42 +01:00 |
Aslan
|
93c9844efa
|
Add translation of languages into Russian language
|
2022-03-18 00:28:58 +01:00 |
Aslan
|
4c06ed41bf
|
Add translation of home templates into Russian language
|
2022-03-18 00:26:39 +01:00 |
Aslan
|
fca3609c1b
|
Add translation of events templates into Russian language
|
2022-03-18 00:24:31 +01:00 |
Aslan
|
b0380d4fc3
|
Add translation of events templates into Russian language
|
2022-03-16 22:25:45 +01:00 |
Aslan
|
3ea2a41d2b
|
Add translation of ctfs templates into Russian language
|
2022-03-16 22:24:53 +01:00 |
Aslan
|
de87c70ae0
|
Add translation of accounts templates into Russian language
|
2022-03-16 22:23:33 +01:00 |
Aslan
|
22fe0d601a
|
Fix typo in the error message
|
2022-03-16 22:13:16 +01:00 |
Danhia
|
5191e300df
|
changed color for member so difference is more noticeable
|
2022-03-15 21:53:55 +01:00 |
Danhia
|
09377c509f
|
updated git links in resources + donation section
|
2022-03-13 18:14:32 +01:00 |
Danhia
|
6a76f4b99f
|
Merge pull request 'Add Japanese version of "gitea.html"' (#28) from ysaito/website:main into translation
Reviewed-on: 42CTF/website#28
|
2022-02-23 14:38:52 +01:00 |
ysaito
|
5908ce4778
|
docs(news/ja/): Add Japanese version of gitea.html
|
2022-02-23 14:36:42 +09:00 |
Danhia
|
4e5fe52984
|
added latest news to repository
|
2022-02-21 16:37:34 +01:00 |
Danhia
|
2f24fae611
|
Merge pull request 'merge translation into main' (#26) from translation into main
Reviewed-on: 42CTF/website#26
|
2022-02-18 16:19:51 +01:00 |
Danhia
|
02385dcd08
|
Merge pull request 'Add Japanese message string for django.po' (#25) from ysaito/website:main into translation
Reviewed-on: 42CTF/website#25
|
2022-02-18 16:17:47 +01:00 |
ysaito
|
7b2de06225
|
refactor(news/ja/): Corrected the translation of a word
|
2022-02-18 22:48:26 +09:00 |
ysaito
|
ba1cb03dbf
|
feat(*/django.po): Add Japanese message string
|
2022-02-18 22:45:09 +09:00 |
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: 42CTF/website#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 |