website

Commit Graph

Select branches

Hide Pull Requests

bot-api

challenges-description

ctf-ordered-by-points

home-refacto

main

news-content

resources

translation

#25

#26

#28

#29

#30

#31

#32

#33

#34

#37

#39

#40

#41

#42

#43

#46

#47

#48

#49

#50

#51

#52

#53

#54

#55

#56

#57

#59

#60

#61

#62

#63

#65

#69

#70

#71

#73

#74

#75

#76

#77

#78

#79

#80

#81

#82

#83

#84

#85

#87

#88

#89

f1b1214291 Merge pull request 'New permissions to allow a group of user to manage event-related objects' (#89) from Danhia/website:admin/events-permissions into main main Danhia 2023-09-24 15:25:41 +0200
8b28f73bdb added special permissions to allow a group of user to manage event-related objects Danhia 2023-09-24 15:17:49 +0200
c8adc6caf9 Merge pull request 'Added speed bonus points for events' (#88) from Danhia/website:events/bonus-points into main Danhia 2023-09-17 20:43:42 +0200
6ecb94eab5 added speed bonus points for events Danhia 2023-09-17 20:39:13 +0200
44897411f5 Merge pull request 'Fix invalid characters in team name that causes error 500' (#87) from Danhia/website:events/fix-teamname into main Danhia 2023-09-01 11:10:54 +0200
5a10e033a2 Merge pull request 'fix(api): Check if user has campus before add to response' (#85) from Starthur/website:main into main Danhia 2023-09-01 11:09:53 +0200
3d86f21ba2 add forbidden characters in teamname to avoir error 500 Danhia 2023-09-01 11:07:13 +0200
691c53e110

fix(api): Check if user has campus before add to response Starthur 2023-02-07 10:15:30 +0100
2d4816e78f Merge pull request '[API][BOT] New endpoint to retrieve campus associated to discord id' (#84) from Danhia/website:api-campus into main Starthur 2023-02-07 09:43:57 +0100
5d84174db2 Added new endpoint to retrieve campus associated to discord id Danhia 2023-02-06 19:41:48 +0100
9ad64e72bc Merge pull request 'doc(tools): Broken link GEF' (#83) from Starthur/website:main into main Danhia 2023-02-05 23:20:19 +0100
9d0a420cac Merge pull request 'Separate profile page for events' (#69) from Danhia/website:event/fix-chall-slug into main Danhia 2023-02-05 23:13:44 +0100
7120a80c1d

doc(tools): Broken link GEF Starthur 2023-02-01 18:41:53 +0100
fe71460537 Merge branch 'main' into event/fix-chall-slug Starthur 2022-10-13 20:23:21 +0200
32bbc392d6 Merge pull request 'Facilitate access to the user's profile' (#82) from UncleReaton/website:main into main Danhia 2022-10-10 21:03:09 +0200
acf306097a Change user.userprofileinfo.user to user UncleReaton 2022-10-10 21:01:31 +0200
dc955fc189 Add a button to view the user's profile by clicking on their score on the navbar UncleReaton 2022-10-10 20:37:11 +0200
e304f7cd15 Add a button to view the user's profile from their edit page UncleReaton 2022-10-10 20:27:31 +0200
5e0ac26f85 Merge branch 'main' into display-download-and-link therbret 2022-10-04 00:35:37 +0200
58bee83a81 Allow displaying a link and a download for event challenges therbret 2022-10-04 00:19:19 +0200
1274364953 Allow displaying a link and a download for challenges therbret 2022-10-04 00:11:35 +0200
73cf94515d Merge pull request 'Added command to prune users who never logged in' (#80) from Danhia/website:management/prune-users into main Danhia 2022-09-30 16:24:18 +0200
94237bd9b6 Added command to prune users who never logged in Danhia 2022-09-30 16:20:17 +0200
a983aafba2 Merge pull request 'Repare search' (#79) from Starthur/website:main into 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
00acec6fdb separate profile page for events Danhia 2022-08-16 18:03:39 +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
daaaade096 Broken CSS register page Starthur 2022-05-28 11:56:23 +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
b61bc5d4f3 Merge branch 'main' into registration-failed-restore Starthur 2022-05-27 20:57:46 +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
7e27b23242 Refactor 42OAuth Starthur 2022-03-30 18:05:14 +0200
dfa36b58a6 Merge pull request 'campus_scoreboard' (#42) from campus_scoreboard into main Danhia 2022-03-29 21:09:30 +0200