 therbret
|
5e0ac26f85
|
Merge branch 'main' into display-download-and-link
|
2022-10-04 00:35:37 +02:00 |
|
therbret
|
58bee83a81
|
Allow displaying a link and a download for event challenges
|
2022-10-04 00:19:19 +02:00 |
|
therbret
|
1274364953
|
Allow displaying a link and a download for challenges
|
2022-10-04 00:11:35 +02:00 |
 Danhia
|
73cf94515d
|
Merge pull request 'Added command to prune users who never logged in' (#80) from Danhia/website:management/prune-users into main
Well maybe it will remove all users from the db but we can't know until we try it, can we ?
|
2022-09-30 16:24:18 +02:00 |
|
Danhia
|
94237bd9b6
|
Added command to prune users who never logged in
|
2022-09-30 16:20:17 +02:00 |
 Starthur
|
a983aafba2
|
Merge pull request 'Repare search' (#79) from Starthur/website:main into main
Reviewed-on: #79
|
2022-08-29 14:02:22 +02:00 |
|
Starthur
|
cce09ed254
|
Repare search
|
2022-08-29 14:01:05 +02:00 |
|
Danhia
|
c2e58c4f92
|
Merge pull request 'Fix logo size and position with some highly advanced CSS' (#78) from Danhia/website:scoreboard/fix-network into main
Reviewed-on: #78
|
2022-08-27 11:38:16 +02:00 |
|
Danhia
|
eba672d067
|
Merge branch 'main' into scoreboard/fix-network
|
2022-08-27 11:37:40 +02:00 |
|
Danhia
|
1a6c31f5e8
|
fix logo size and position with some highly advanced CSS
|
2022-08-27 11:36:07 +02:00 |
|
Danhia
|
bd17ad5f8f
|
Merge pull request 'Fix missing url in top3 network scoreboard' (#77) from Danhia/website:scoreboard/fix-network into main
Reviewed-on: #77
|
2022-08-27 11:18:28 +02:00 |
|
Danhia
|
40984a2a0c
|
fix missing url in top3 network scoreboard
|
2022-08-27 11:10:20 +02:00 |
|
Danhia
|
9ac003ea3c
|
Merge pull request 'Podium added and working, logo and website of campuses added in campus model' (#76) from ix/website:main into main
Reviewed-on: #76
Reviewed-by: Danhia <danhia@protonmail.com>
|
2022-08-27 10:47:46 +02:00 |
|
Danhia
|
5cf86b9c36
|
Merge branch 'main' into main
|
2022-08-27 10:47:33 +02:00 |
zero
|
7c06c24d9f
|
Fix hardcoded logo value in network scoreboard template
|
2022-08-21 20:37:05 +02:00 |
|
zero
|
9b2da1e2cc
|
Someone forgot to remove prints in a file...
|
2022-08-19 15:51:10 +02:00 |
|
zero
|
891c2530e6
|
Podium added and working, logo and website of campuses added in campus model
|
2022-08-19 15:43:25 +02:00 |
|
Danhia
|
13895d7712
|
Merge pull request 'Fix member conversion page UI and SEO upgrades' (#75) from ix/website:main into main
Reviewed-on: #75
Reviewed-by: Danhia <danhia@protonmail.com>
|
2022-08-18 14:21:13 +02:00 |
|
Danhia
|
0f64c7579c
|
Merge branch 'main' into main
|
2022-08-18 14:20:43 +02:00 |
|
zero
|
02331beff4
|
fix domain in canonical url
|
2022-08-18 13:58:13 +02:00 |
|
zero
|
5b2abeac20
|
add canonical meta
|
2022-08-18 13:44:38 +02:00 |
|
Danhia
|
1771f3c2bb
|
Merge pull request 'Removed the is_member attribute for campus name' (#74) from Danhia/website:scoreboard/fix-network into main
Reviewed-on: #74
|
2022-08-18 10:40:32 +02:00 |
|
Danhia
|
09118cac7a
|
removed the is_member attribute for campus name
|
2022-08-18 10:38:53 +02:00 |
|
Danhia
|
7cd43ca35f
|
Merge pull request 'Scoreboard for 42 Network' (#73) from Danhia/website:scoreboard/42network into main
Reviewed-on: #73
|
2022-08-17 22:59:40 +02:00 |
|
Danhia
|
d21915405e
|
removed pagination on network scoreboard
|
2022-08-17 22:58:36 +02:00 |
|
zero
|
dd7a69aa50
|
42CTF/website#72 |42CTF/website#36 sitemap and titles fixed
|
2022-08-17 16:42:06 +02:00 |
|
Danhia
|
8a2cc6f3ae
|
scoreboard for 42 Network
|
2022-08-17 12:59:29 +02:00 |
|
Danhia
|
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
Reviewed-on: #71
|
2022-08-16 22:37:00 +02:00 |
|
Danhia
|
63876e91ef
|
rephrase a bit the become member page + improved french translation for resources
|
2022-08-16 19:46:53 +02:00 |
|
Danhia
|
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
Reviewed-on: #70
Reviewed-by: Danhia <danhia@protonmail.com>
|
2022-08-16 19:09:33 +02:00 |
|
zero
|
d1992e1476
|
Rework of resources pages and a page to become member, added it in the navbar and fix global UI spacing issue.
|
2022-08-16 18:07:13 +02:00 |
|
Danhia
|
1ee02fc964
|
Merge pull request 'fix-campus-in-scoreboard' (#65) from fix-campus-in-scoreboard into main
Reviewed-on: #65
Reviewed-by: Danhia <danhia@protonmail.com>
|
2022-08-01 22:21:44 +02:00 |
|
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: #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: #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: #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: #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: #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 |