Commit Graph

  • a983aafba2 Merge pull request 'Repare search' (#79) from Starthur/website:main into main main Starthur 2022-08-29 14:02:22 +0200
  • cce09ed254
    Repare search Starthur 2022-08-29 14:01:05 +0200
  • c2e58c4f92 Merge pull request 'Fix logo size and position with some highly advanced CSS' (#78) from Danhia/website:scoreboard/fix-network into main Danhia 2022-08-27 11:38:16 +0200
  • eba672d067 Merge branch 'main' into scoreboard/fix-network Danhia 2022-08-27 11:37:40 +0200
  • 1a6c31f5e8 fix logo size and position with some highly advanced CSS Danhia 2022-08-27 11:36:07 +0200
  • bd17ad5f8f Merge pull request 'Fix missing url in top3 network scoreboard' (#77) from Danhia/website:scoreboard/fix-network into main Danhia 2022-08-27 11:18:28 +0200
  • 40984a2a0c fix missing url in top3 network scoreboard Danhia 2022-08-27 11:10:20 +0200
  • 9ac003ea3c Merge pull request 'Podium added and working, logo and website of campuses added in campus model' (#76) from ix/website:main into main Danhia 2022-08-27 10:47:46 +0200
  • 5cf86b9c36 Merge branch 'main' into main Danhia 2022-08-27 10:47:33 +0200
  • 7c06c24d9f Fix hardcoded logo value in network scoreboard template zero 2022-08-21 20:37:05 +0200
  • 9b2da1e2cc Someone forgot to remove prints in a file... zero 2022-08-19 15:51:10 +0200
  • 891c2530e6 Podium added and working, logo and website of campuses added in campus model zero 2022-08-19 15:43:25 +0200
  • 13895d7712 Merge pull request 'Fix member conversion page UI and SEO upgrades' (#75) from ix/website:main into main Danhia 2022-08-18 14:21:13 +0200
  • 0f64c7579c Merge branch 'main' into main Danhia 2022-08-18 14:20:43 +0200
  • 02331beff4 fix domain in canonical url zero 2022-08-18 13:58:13 +0200
  • 5b2abeac20 add canonical meta zero 2022-08-18 13:44:38 +0200
  • 1771f3c2bb Merge pull request 'Removed the is_member attribute for campus name' (#74) from Danhia/website:scoreboard/fix-network into main Danhia 2022-08-18 10:40:32 +0200
  • 09118cac7a removed the is_member attribute for campus name Danhia 2022-08-18 10:38:53 +0200
  • 7cd43ca35f Merge pull request 'Scoreboard for 42 Network' (#73) from Danhia/website:scoreboard/42network into main Danhia 2022-08-17 22:59:40 +0200
  • d21915405e removed pagination on network scoreboard Danhia 2022-08-17 22:58:36 +0200
  • dd7a69aa50 42CTF/website#72 |42CTF/website#36 sitemap and titles fixed zero 2022-08-17 16:42:06 +0200
  • 8a2cc6f3ae scoreboard for 42 Network Danhia 2022-08-17 12:59:29 +0200
  • e36ca2b146 Merge pull request 'Rephrase a bit the become member page + improved french translation for resources' (#71) from Danhia/website:resources/fix-typos into main Danhia 2022-08-16 22:37:00 +0200
  • 63876e91ef rephrase a bit the become member page + improved french translation for resources Danhia 2022-08-16 19:46:53 +0200
  • eadede339b Merge pull request 'Rework of resources pages and a page to become member, added it in the navbar and fix global UI spacing issue.' (#70) from ix/website:main into main Danhia 2022-08-16 19:09:33 +0200
  • d1992e1476 Rework of resources pages and a page to become member, added it in the navbar and fix global UI spacing issue. zero 2022-08-16 18:07:13 +0200
  • 1ee02fc964 Merge pull request 'fix-campus-in-scoreboard' (#65) from fix-campus-in-scoreboard into main Danhia 2022-08-01 22:21:44 +0200
  • ff23250275
    Remove old field Starthur 2022-08-01 22:15:58 +0200
  • c449f26ad7
    Check FK to print value in scoreboard Starthur 2022-08-01 22:15:42 +0200
  • 121d06aff2
    Order CTF by flags ctf-ordered-by-points Starthur 2022-08-01 12:04:09 +0200
  • 42858e4342 Hotfix for indentation error Danhia 2022-07-02 00:26:12 +0200
  • ec61f06be0 Merge pull request 'hotfix for solo events' (#63) from Danhia/website:fix-event into main Danhia 2022-07-01 23:57:17 +0200
  • 2233474c89 hotfix for solo events Danhia 2022-07-01 23:51:36 +0200
  • 7b9dfad15d Merge pull request 'Limit events to certain campus' (#62) from events_campus into main Danhia 2022-06-02 19:50:05 +0200
  • 46ea80161d Chack campus before password Starthur 2022-05-31 22:14:11 +0200
  • d222784bb0 Remove unsued import Starthur 2022-05-31 22:13:54 +0200
  • 86fbf93dbf Remove a useless migration Starthur 2022-05-31 22:13:45 +0200
  • ff657c070a Limit events to certain campus Arthur-TRT 2022-05-30 10:25:18 +0200
  • a1ec3e5f20 Merge pull request 'Broken CSS register page' (#61) from html-refacto into main Starthur 2022-05-28 12:05:24 +0200
  • 0d7f39d335 Broken CSS register page Starthur 2022-05-28 12:04:00 +0200
  • f56322bd6e Merge pull request 'Fix duplicates in created challenges' (#59) from Danhia/website:fix-challenges into main Danhia 2022-05-28 11:00:23 +0200
  • 506eb54d49 fixed duplicates in created challenges Danhia 2022-05-28 10:53:46 +0200
  • 87efa03ed0 Merge pull request 'Esthetic change' (#57) from challenge_created into main Starthur 2022-05-27 21:04:07 +0200
  • 5435ea3316 Esthetic change Starthur 2022-05-27 21:02:54 +0200
  • 4245cfd19f Merge branch 'Yir-registration-failed-restore' Starthur 2022-05-27 20:57:06 +0200
  • f391a5a5cb Merge branch 'registration-failed-restore' of https://gitea.42ctf.org/Yir/website into Yir-registration-failed-restore Starthur 2022-05-27 20:56:42 +0200
  • ebdc3b9c9e Merge pull request 'challenges_created' (#56) from challenges_created into main Starthur 2022-05-27 16:56:57 +0200
  • 9d3b9ebf5f remove debug Starthur 2022-05-27 16:55:23 +0200
  • 04318e3b0a Add created challenges on profile Starthur 2022-05-27 16:53:53 +0200
  • eeb752d605 Merge pull request 'Change because preprod can't acces tld' (#55) from mail into main Starthur 2022-05-27 16:12:54 +0200
  • 2d466454f5 Change because preprod can't acces tld Starthur 2022-05-27 16:10:36 +0200
  • 7ff972e623 Merge pull request 'Change mail service for local mail server' (#54) from mail into main Starthur 2022-05-27 15:54:24 +0200
  • d8791353fb Change mail service for local mail server Starthur 2022-05-27 15:52:18 +0200
  • dc3e7f4b27 Merge pull request 'Broken CSS Issue#45' (#53) from html_refacto into main Starthur 2022-05-27 15:36:29 +0200
  • 763853b3c6 Broken CSS Issue#45 Starthur 2022-05-27 15:35:11 +0200
  • c1c82ff9e0 Merge pull request 'new_logo' (#52) from new_logo into main Starthur 2022-05-27 14:57:20 +0200
  • fdc3796667 Resize image Starthur 2022-05-27 14:55:57 +0200
  • b25bf03485 Change image for social card Starthur 2022-05-27 14:53:30 +0200
  • 5a08764df7 Merge pull request 'Vectorized typography in logo' (#51) from UncleReaton/website:main into main Starthur 2022-05-18 11:45:55 +0200
  • 084fb1a62d Vectorized typography in logo UncleReaton 2022-05-18 11:42:03 +0200
  • d8c35db454 Merge pull request 'Change old logo for the new one + Add favicon' (#50) from UncleReaton/website:main into main Starthur 2022-05-18 11:25:15 +0200
  • 6e860b2997 Change old logo for the new one + Add favicon UncleReaton 2022-05-18 00:34:02 +0200
  • 4ee613d9af Merge pull request 'Reformulate to the context' (#46) from Aslan/website:translation into main Starthur 2022-05-17 20:30:44 +0200
  • 9c75b317eb Merge branch 'main' into 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 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
  • ba7992e7be Preserve registration form fields that passed error check when the registration failed. Yir 2022-03-20 22:43:38 +0100
  • 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 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