mnds
/
website
forked from 42CTF/website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
252 Commits 8 Branches 0 Tags 3.6 MiB
Commit Graph

252 Commits

Author SHA1 Message Date
Starthur ff23250275
Remove old field 2022-08-01 22:18:23 +02:00
Starthur c449f26ad7
Check FK to print value in scoreboard 2022-08-01 22:18:23 +02:00
Danhia 42858e4342 Hotfix for indentation error 2022-07-02 00:26:12 +02:00
Danhia ec61f06be0 Merge pull request 'hotfix for solo events' (#63) from Danhia/website:fix-event into main 
Reviewed-on: 42CTF/website#63
 2022-07-01 23:57:17 +02:00
Danhia 2233474c89 hotfix for solo events 2022-07-01 23:51:36 +02:00
Danhia 7b9dfad15d Merge pull request 'Limit events to certain campus' (#62) from events_campus into main 
Reviewed-on: 42CTF/website#62
Reviewed-by: Danhia <danhia@protonmail.com>
 2022-06-02 19:50:05 +02:00
Starthur 46ea80161d Chack campus before password 2022-05-31 22:14:11 +02:00
Starthur d222784bb0 Remove unsued import 2022-05-31 22:13:54 +02:00
Starthur 86fbf93dbf Remove a useless migration 2022-05-31 22:13:45 +02:00
Arthur-TRT ff657c070a Limit events to certain campus 2022-05-30 10:25:18 +02:00
Starthur a1ec3e5f20 Merge pull request 'Broken CSS register page' (#61) from html-refacto into main 
Reviewed-on: 42CTF/website#61
 2022-05-28 12:05:24 +02:00
Starthur 0d7f39d335 Broken CSS register page 2022-05-28 12:04:00 +02:00
Danhia f56322bd6e Merge pull request 'Fix duplicates in created challenges' (#59) from Danhia/website:fix-challenges into main 
Reviewed-on: 42CTF/website#59
 2022-05-28 11:00:23 +02:00
Danhia 506eb54d49 fixed duplicates in created challenges 2022-05-28 10:53:46 +02:00
Starthur 87efa03ed0 Merge pull request 'Esthetic change' (#57) from challenge_created into main 
Reviewed-on: 42CTF/website#57
 2022-05-27 21:04:07 +02:00
Starthur 5435ea3316 Esthetic change 2022-05-27 21:02:54 +02:00
Starthur 4245cfd19f Merge branch 'Yir-registration-failed-restore' 2022-05-27 20:57:06 +02:00
Starthur f391a5a5cb Merge branch 'registration-failed-restore' of https://gitea.42ctf.org/Yir/website into Yir-registration-failed-restore 2022-05-27 20:56:42 +02:00
Starthur ebdc3b9c9e Merge pull request 'challenges_created' (#56) from challenges_created into main 
Reviewed-on: 42CTF/website#56
 2022-05-27 16:56:57 +02:00
Starthur 9d3b9ebf5f remove debug 2022-05-27 16:55:23 +02:00
Starthur 04318e3b0a Add created challenges on profile 2022-05-27 16:53:53 +02:00
Starthur eeb752d605 Merge pull request 'Change because preprod can't acces tld' (#55) from mail into main 
Reviewed-on: 42CTF/website#55
 2022-05-27 16:12:54 +02:00
Starthur 2d466454f5 Change because preprod can't acces tld 2022-05-27 16:10:36 +02:00
Starthur 7ff972e623 Merge pull request 'Change mail service for local mail server' (#54) from mail into main 
Reviewed-on: 42CTF/website#54
 2022-05-27 15:54:24 +02:00
Starthur d8791353fb Change mail service for local mail server 2022-05-27 15:52:18 +02:00
Starthur dc3e7f4b27 Merge pull request 'Broken CSS Issue#45' (#53) from html_refacto into main 
Reviewed-on: 42CTF/website#53
 2022-05-27 15:36:29 +02:00
Starthur 763853b3c6 Broken CSS Issue#45 2022-05-27 15:35:11 +02:00
Starthur c1c82ff9e0 Merge pull request 'new_logo' (#52) from new_logo into main 
Reviewed-on: 42CTF/website#52
 2022-05-27 14:57:20 +02:00
Starthur fdc3796667 Resize image 2022-05-27 14:55:57 +02:00
Starthur b25bf03485 Change image for social card 2022-05-27 14:53:30 +02:00
Starthur 5a08764df7 Merge pull request 'Vectorized typography in logo' (#51) from UncleReaton/website:main into main 
Reviewed-on: 42CTF/website#51
Reviewed-by: Starthur <contact+42ctf@arthur-trt.fr>
 2022-05-18 11:45:55 +02:00
UncleReaton 084fb1a62d Vectorized typography in logo 2022-05-18 11:42:03 +02:00
Starthur d8c35db454 Merge pull request 'Change old logo for the new one + Add favicon' (#50) from UncleReaton/website:main into main 
Reviewed-on: 42CTF/website#50
Reviewed-by: Starthur <contact+42ctf@arthur-trt.fr>
 2022-05-18 11:25:15 +02:00
UncleReaton 6e860b2997 Change old logo for the new one + Add favicon 2022-05-18 00:34:02 +02:00
Starthur 4ee613d9af Merge pull request 'Reformulate to the context' (#46) from Aslan/website:translation into main 
Reviewed-on: 42CTF/website#46
Reviewed-by: Starthur <contact+42ctf@arthur-trt.fr>
 2022-05-17 20:30:44 +02:00
Starthur 9c75b317eb Merge branch 'main' into translation 2022-05-17 20:29:42 +02:00
Starthur 2d2e97e794 Merge pull request 'Correcting typo' (#49) from refactor/42OAuth into main 
Reviewed-on: 42CTF/website#49
 2022-05-17 17:35:58 +02:00
Arthur-TRT 66ab43bf2b Correcting typo 2022-05-17 17:34:49 +02:00
Starthur 4213883774 Merge pull request 'Refactoring 42Oauth' (#48) from refactor/42OAuth into main 
Reviewed-on: 42CTF/website#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: 42CTF/website#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
Aslan 6b2b0cef7d Reformulate to the context 2022-04-10 13:12:40 +02:00
Aslan d7bf9ae74e Update 'src/locale/ru/LC_MESSAGES/django.po' 2022-04-03 17:09:35 +02:00
Danhia dfa36b58a6 Merge pull request 'campus_scoreboard' (#42) from campus_scoreboard into main 
Reviewed-on: 42CTF/website#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: 42CTF/website#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: 42CTF/website#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