 Starthur
|
4213883774
|
Merge pull request 'Refactoring 42Oauth' (#48) from refactor/42OAuth into main
Reviewed-on: #48
|
2022-05-17 15:48:05 +02:00 |
Arthur-TRT
|
9cb4b2b3a8
|
Refactoring 42Oauth
|
2022-05-17 15:29:58 +02:00 |
|
Starthur
|
b90cc55b8d
|
Merge pull request 'Add alt texts to base template and fr+en news' (#47) from UncleReaton/website:main into main
Reviewed-on: #47
Reviewed-by: Starthur <contact+42ctf@arthur-trt.fr>
|
2022-05-17 14:28:19 +02:00 |
UncleReaton
|
d19514f629
|
Add alt texts to base template and fr+en news
|
2022-05-11 20:43:20 +02:00 |
 Danhia
|
dfa36b58a6
|
Merge pull request 'campus_scoreboard' (#42) from campus_scoreboard into main
Reviewed-on: #42
Reviewed-by: Danhia <danhia@protonmail.com>
|
2022-03-29 21:09:30 +02:00 |
|
Starthur
|
bf5678d371
|
Merge branch 'main' into campus_scoreboard
|
2022-03-29 21:06:31 +02:00 |
|
Danhia
|
3c013794d7
|
Merge pull request '42OAuth' (#41) from 42OAuth into main
Reviewed-on: #41
|
2022-03-29 21:03:47 +02:00 |
|
Danhia
|
6110408cd0
|
Merge pull request 'home-refacto' (#40) from Starthur/website:home-refacto into campus_scoreboard
Reviewed-on: #40
|
2022-03-29 20:35:03 +02:00 |
|
Starthur
|
bb2617a3e4
|
Merge branch 'home-refacto' of https://gitea.42ctf.org/Starthur/website into home-refacto
|
2022-03-29 19:53:10 +02:00 |
|
Starthur
|
e23d6d7f49
|
HTML typo
|
2022-03-29 19:53:00 +02:00 |
|
Starthur
|
978dd24a00
|
Add campuses scoreboard
|
2022-03-29 19:53:00 +02:00 |
|
Danhia
|
15f3a21c60
|
Merge pull request 'Add 42Oauth' (#37) from Starthur/website:main into 42OAuth
Reviewed-on: #37
|
2022-03-29 19:51:57 +02:00 |
|
Starthur
|
e480aec493
|
Remove debug
|
2022-03-29 19:49:52 +02:00 |
|
Starthur
|
3991dda7d3
|
HTML typo
|
2022-03-29 18:55:54 +02:00 |
|
Starthur
|
e8575d559e
|
Add campuses scoreboard
|
2022-03-29 18:46:19 +02:00 |
|
Starthur
|
ea691204c4
|
Upgrad po file
|
2022-03-29 16:46:03 +02:00 |
Arthur TROUILLET
|
21f38906df
|
Change OAuth secret to env
|
2022-03-29 14:19:06 +02:00 |
|
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: #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: #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: #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: #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: #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: #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: #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 |