Aslan
/
website
forked from 42CTF/website
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 9c75b317eb Merge branch 'main' into translation translation Starthur 2022-05-17 20:29:42 +0200
  • 2d2e97e794 Merge pull request 'Correcting typo' (#49) from refactor/42OAuth into main Starthur 2022-05-17 17:35:58 +0200
  • 66ab43bf2b Correcting typo Arthur-TRT 2022-05-17 17:34:49 +0200
  • 4213883774 Merge pull request 'Refactoring 42Oauth' (#48) from refactor/42OAuth into main Starthur 2022-05-17 15:48:05 +0200
  • 9cb4b2b3a8 Refactoring 42Oauth Arthur-TRT 2022-05-17 15:29:58 +0200
  • b90cc55b8d Merge pull request 'Add alt texts to base template and fr+en news' (#47) from UncleReaton/website:main into main Starthur 2022-05-17 14:28:19 +0200
  • d19514f629 Add alt texts to base template and fr+en news UncleReaton 2022-05-11 20:43:20 +0200
  • 6b2b0cef7d Reformulate to the context Aslan 2022-04-10 13:12:40 +0200
  • d7bf9ae74e Update 'src/locale/ru/LC_MESSAGES/django.po' Aslan 2022-04-03 17:09:35 +0200
  • dfa36b58a6 Merge pull request 'campus_scoreboard' (#42) from campus_scoreboard into main main 42OAuth Danhia 2022-03-29 21:09:30 +0200
  • bf5678d371 Merge branch 'main' into campus_scoreboard Starthur 2022-03-29 21:06:31 +0200
  • 3c013794d7 Merge pull request '42OAuth' (#41) from 42OAuth into main Danhia 2022-03-29 21:03:47 +0200
  • 6110408cd0 Merge pull request 'home-refacto' (#40) from Starthur/website:home-refacto into campus_scoreboard Danhia 2022-03-29 20:35:03 +0200
  • bb2617a3e4 Merge branch 'home-refacto' of https://gitea.42ctf.org/Starthur/website into home-refacto Starthur 2022-03-29 19:53:10 +0200
  • e23d6d7f49 HTML typo Starthur 2022-03-29 18:55:54 +0200
  • 978dd24a00 Add campuses scoreboard Starthur 2022-03-29 18:46:19 +0200
  • 15f3a21c60 Merge pull request 'Add 42Oauth' (#37) from Starthur/website:main into 42OAuth Danhia 2022-03-29 19:51:57 +0200
  • e480aec493 Remove debug Starthur 2022-03-29 19:49:52 +0200
  • 3991dda7d3 HTML typo Starthur 2022-03-29 18:55:54 +0200
  • e8575d559e Add campuses scoreboard Starthur 2022-03-29 18:46:19 +0200
  • ea691204c4 Upgrad po file Starthur 2022-03-29 16:46:03 +0200
  • 21f38906df Change OAuth secret to env Arthur TROUILLET 2022-03-29 14:19:06 +0200
  • 39e3859836 Done Arthur TROUILLET 2022-03-29 11:52:40 +0200
  • a26784cd98 First version of 42Oauth Arthur-TRT 2022-03-29 11:02:07 +0200
  • 7dad96d79f Merge pull request 'API for events data' (#33) from Danhia/website:api-events into main Danhia 2022-03-19 20:42:35 +0100
  • d554961dd1 added API for events data Danhia 2022-03-19 20:38:52 +0100
  • 280ba0d1fc Merge pull request 'Fixed a typo in resources /locale/fr' (#32) from FdB/website:fdb-patch-typo-binaires into main Danhia 2022-03-19 19:54:39 +0100
  • bdd51b6cf9 Merge branch 'main' into fdb-patch-typo-binaires Bertrand C 2022-03-19 19:50:25 +0100
  • c004c18e75 Fixed a typo in resources /locale/fr Bertrand C 2022-03-19 19:41:47 +0100
  • e8d43586a6 merge main into translation Danhia 2022-03-19 19:33:09 +0100
  • 2da57b7b9b Merge pull request 'Change text color of input for better readibility' (#31) from UncleReaton/website:main into main Danhia 2022-03-19 19:21:33 +0100
  • a828ce2ece Merge pull request 'Add a partial translation into Russian language' (#30) from Aslan/website:translation into translation Danhia 2022-03-19 19:20:27 +0100
  • 16030c14a4 Change text color of flag submission input for better readibility UncleReaton 2022-03-19 16:52:47 +0100
  • ca86079148 Add translation of remaining part into Russian language Aslan 2022-03-18 00:38:42 +0100
  • 93c9844efa Add translation of languages into Russian language Aslan 2022-03-18 00:28:58 +0100
  • 4c06ed41bf Add translation of home templates into Russian language Aslan 2022-03-18 00:26:39 +0100
  • fca3609c1b Add translation of events templates into Russian language Aslan 2022-03-18 00:24:31 +0100
  • b0380d4fc3 Add translation of events templates into Russian language Aslan 2022-03-16 22:25:45 +0100
  • 3ea2a41d2b Add translation of ctfs templates into Russian language Aslan 2022-03-16 22:24:53 +0100
  • de87c70ae0 Add translation of accounts templates into Russian language Aslan 2022-03-16 22:23:33 +0100
  • 22fe0d601a Fix typo in the error message Aslan 2022-03-16 22:13:16 +0100
  • 5191e300df changed color for member so difference is more noticeable members Danhia 2022-03-15 21:53:55 +0100
  • 09377c509f updated git links in resources + donation section resources Danhia 2022-03-13 18:14:32 +0100
  • 6a76f4b99f Merge pull request 'Add Japanese version of "gitea.html"' (#28) from ysaito/website:main into translation Danhia 2022-02-23 14:38:52 +0100
  • 5908ce4778 docs(news/ja/): Add Japanese version of gitea.html ysaito 2022-02-23 14:36:42 +0900
  • 4e5fe52984 added latest news to repository news-content Danhia 2022-02-21 16:37:34 +0100
  • 2f24fae611 Merge pull request 'merge translation into main' (#26) from translation into main Danhia 2022-02-18 16:19:51 +0100
  • 02385dcd08 Merge pull request 'Add Japanese message string for django.po' (#25) from ysaito/website:main into translation Danhia 2022-02-18 16:17:47 +0100
  • 7b2de06225 refactor(news/ja/): Corrected the translation of a word ysaito 2022-02-18 22:48:26 +0900
  • ba1cb03dbf feat(*/django.po): Add Japanese message string ysaito 2022-02-18 22:45:09 +0900
  • 11164bb84a replaced the bad request with a redirect to account edit bot-api Danhia 2022-02-18 11:32:08 +0100
  • 67a4d180e0 corrected typo Danhia 2022-02-18 11:27:58 +0100
  • 3b86441259 Merge branch 'main' into bot-api Danhia 2022-02-18 11:11:58 +0100
  • 7b2552f0b5 added try except in case user cancels oauth Danhia 2022-02-18 11:11:34 +0100
  • eac835bef5 removed merge artifact Danhia 2022-02-18 10:55:54 +0100
  • 06593b26f9 fixed merge conflict Danhia 2022-02-17 23:59:21 +0100
  • e8f5f33269 Merge branch 'challenges-description' into main Danhia 2022-02-17 23:21:56 +0100
  • f0479f6577 Merge branch 'challenges-description' into main Danhia 2022-02-17 23:21:56 +0100
  • 60a59b23e6 fixed error 500 when requesting german or russian translation challenges-description Danhia 2022-02-17 23:21:41 +0100
  • 8f32ef9a6e excluded the API from the i18n patterns Danhia 2022-02-17 13:09:11 +0100
  • a0b76903a7 added endpoint API for bot Danhia 2022-02-17 12:40:40 +0100
  • a7de7b8054 removed language code in redirect_uri Danhia 2022-02-17 12:21:17 +0100
  • 0d734e98b1 removed language code in redirect_uri Danhia 2022-02-17 12:19:52 +0100
  • 3d24fe9b3b tentative for fixing url redirect Danhia 2022-02-17 12:03:52 +0100
  • ba0d75c250 restored discord OAuth, not working in local, let's test on preprod if the url problem is solved Danhia 2022-02-17 11:11:36 +0100
  • 3ae80ca17f fixed end of sentence in french with quote badly escaped Danhia 2022-02-16 20:14:29 +0100
  • a7e75b2a43 fixed quotes that where badly escaped in resources Danhia 2022-02-16 20:07:19 +0100
  • 9ea67ae2a0 Merge branch 'main' into translation Danhia 2022-02-16 19:28:39 +0100
  • 899a01e472 Merge branch 'main' into challenges-description Danhia 2022-02-16 15:41:52 +0100
  • c40d49c326 Merge pull request 'Ressource page translation' (#22) from Starthur/website:main into translation Danhia 2022-02-16 15:37:18 +0100
  • d6b1380552 Last push before pull request Starthur 2022-02-16 15:23:15 +0100
  • d0c93f98a1 Correct some mistake Arthur-TRT 2022-02-16 15:19:07 +0100
  • 97e120e5fc First translation of Ressources in fr Arthur-TRT 2022-02-16 15:03:40 +0100
  • 494377399c Merge pull request 'Update README' (#21) from update-readme into main Danhia 2022-02-16 14:34:14 +0100
  • 28d8874272 Update README Starthur 2022-02-16 14:33:21 +0100
  • b9704d3cb3 Update README Starthur 2022-02-16 14:13:00 +0100
  • 0ac395def8 Update 'requirements.txt' Danhia 2022-02-16 13:53:57 +0100
  • 7ff556a986 Update 'README.md' Danhia 2022-02-16 13:50:19 +0100
  • 5e02041f0c put challenges descriptions outside of the db Danhia 2022-02-15 18:13:43 +0100
  • f75a034094 replaced jp with ja for news Danhia 2022-02-15 14:27:37 +0100
  • 5f28bc5d2c Merge pull request '[translation] Added Japanese version' (#9) from ysaito/website:translation-jp into translation Danhia 2022-02-15 13:20:02 +0100
  • 904ce1b748 feat(welcome_ctf_2021.html): Added Japanese version ysaito 2022-02-15 18:11:00 +0900
  • 5b15b9cd6f feat(sql_challenges.html): Added Japanese version ysaito 2022-02-15 18:07:48 +0900
  • 5d46bd6df0 feat(speed_dating_ctf_2022.html): Added Japanese version ysaito 2022-02-15 18:06:46 +0900
  • 67de669459 feat(dynamic_scoring.html): Added Japanese version ysaito 2022-02-15 18:05:43 +0900
  • 26aeb6d7bd feat(42ctf_vm.html): Added Japanese version ysaito 2022-02-15 18:04:30 +0900
  • 1b89fa88d8 updated all .po with makemessages Danhia 2022-02-14 19:38:16 +0100
  • 0bb3a8b805 Merge pull request #8 from ClemaX/translation/de Danhia 2022-02-14 18:34:08 +0000
  • 5eec76dd00 removed start challenge button when event is over Danhia 2022-02-14 19:18:00 +0100
  • 6b6f264fe0 news: locale: de: Initial translation Clément Hamada 2022-02-13 21:28:54 +0100
  • c4fd6d05c3 locale: de: Fix some typos Clément Hamada 2022-02-10 19:53:09 +0100
  • 901c73a4f2 Merge branch 'main' of https://github.com/Danhia/42CTF into main Danhia 2022-02-13 13:14:24 +0100
  • 01c0f28b16 hotfix for 500 when joining team Danhia 2022-02-13 13:13:54 +0100
  • 7174cf9edb Update README.md Danhia 2022-02-12 20:35:41 +0100
  • ef0fcc5fea Merge pull request #7 from Miliviu/main Danhia 2022-02-12 19:28:07 +0000
  • aabba3ea53 dynamic scoring for events, i'm pretty sure everything is gonna break Danhia 2022-02-12 19:56:46 +0100
  • 1abeabebfe Set Spanish to done in the readme todo list Miliviu 2022-02-11 19:55:50 +0100
  • 9f2d78ac33 challenges not yet published Danhia 2022-02-09 14:14:41 +0100
  • 27ed107501 Merge pull request #6 from Miliviu/main Danhia 2022-02-09 13:36:45 +0100
  • 0dea7fb619 Add translation of news to Spanish Miliviu 2022-02-09 13:08:02 +0100