 Danhia
|
7887074b3d
|
fixed merge conflict
|
2022-02-17 23:59:21 +01:00 |
mguerrea
|
b6c36cbffb
|
Merge branch 'challenges-description' into main
|
2022-02-17 23:50:28 +01:00 |
|
mguerrea
|
02950319d7
|
Merge branch 'challenges-description' into main
|
2022-02-17 23:21:56 +01:00 |
|
mguerrea
|
9b3ae741c1
|
fixed error 500 when requesting german or russian translation
|
2022-02-17 23:21:41 +01:00 |
|
Danhia
|
7515eb8dce
|
fixed end of sentence in french with quote badly escaped
|
2022-02-16 20:14:29 +01:00 |
|
Danhia
|
11f9d43560
|
fixed quotes that where badly escaped in resources
|
2022-02-16 20:07:19 +01:00 |
|
Danhia
|
2615ad01cd
|
Merge branch 'main' into translation
|
2022-02-16 19:28:39 +01:00 |
|
Danhia
|
00962b40d3
|
Merge branch 'main' into challenges-description
|
2022-02-16 15:41:52 +01:00 |
|
Danhia
|
e6402f37dd
|
Merge pull request 'Ressource page translation' (#22) from Starthur/website:main into translation
Reviewed-on: #22
|
2022-02-16 15:37:18 +01:00 |
 Starthur
|
eb320b7b49
|
Last push before pull request
|
2022-02-16 15:23:15 +01:00 |
Arthur-TRT
|
2b0d058672
|
Correct some mistake
|
2022-02-16 15:19:07 +01:00 |
|
Arthur-TRT
|
210e217660
|
First translation of Ressources in fr
|
2022-02-16 15:03:40 +01:00 |
|
Danhia
|
a12dd0d020
|
Merge pull request 'Update README' (#21) from update-readme into main
Reviewed-on: #21
|
2022-02-16 14:34:14 +01:00 |
|
Starthur
|
377607239e
|
Update README
Better solution to create superuser admin
|
2022-02-16 14:33:21 +01:00 |
|
Starthur
|
3829ad11ef
|
Update README
Add information about migrate and admin right on local dev
|
2022-02-16 14:13:00 +01:00 |
|
Danhia
|
c7ddf8a435
|
Update 'requirements.txt'
|
2022-02-16 13:53:57 +01:00 |
|
Danhia
|
8cada5b6d2
|
Update 'README.md'
|
2022-02-16 13:50:19 +01:00 |
|
Danhia
|
678abaa1fc
|
put challenges descriptions outside of the db
|
2022-02-15 18:13:43 +01:00 |
|
Danhia
|
e69a18922c
|
replaced jp with ja for news
|
2022-02-15 14:27:37 +01:00 |
|
Danhia
|
b3583196e8
|
Merge pull request '[translation] Added Japanese version' (#9) from ysaito/website:translation-jp into translation
Reviewed-on: #9
|
2022-02-15 13:20:02 +01:00 |
ysaito
|
49a66e9565
|
feat(welcome_ctf_2021.html): Added Japanese version
|
2022-02-15 18:11:00 +09:00 |
|
ysaito
|
7b2ab40378
|
feat(sql_challenges.html): Added Japanese version
|
2022-02-15 18:07:48 +09:00 |
|
ysaito
|
715db01981
|
feat(speed_dating_ctf_2022.html): Added Japanese version
|
2022-02-15 18:06:46 +09:00 |
|
ysaito
|
837c625d8e
|
feat(dynamic_scoring.html): Added Japanese version
|
2022-02-15 18:05:43 +09:00 |
|
ysaito
|
4eceb91f60
|
feat(42ctf_vm.html): Added Japanese version
|
2022-02-15 18:04:30 +09:00 |
|
Danhia
|
2f308f75b7
|
updated all .po with makemessages
|
2022-02-14 19:38:16 +01:00 |
Danhia
|
b3a37445a2
|
Merge pull request #8 from ClemaX/translation/de
German news translation and typos fix
|
2022-02-14 18:34:08 +00:00 |
|
Danhia
|
f417ff59f4
|
removed start challenge button when event is over
|
2022-02-14 19:18:00 +01:00 |
 Clément Hamada
|
76533f42b7
|
news: locale: de: Initial translation
|
2022-02-13 21:47:03 +01:00 |
|
Clément Hamada
|
8ed0fb1d64
|
locale: de: Fix some typos
|
2022-02-13 21:30:40 +01:00 |
|
Danhia
|
6d68192f2a
|
Merge branch 'main' of https://github.com/Danhia/42CTF into main
|
2022-02-13 13:14:24 +01:00 |
|
Danhia
|
1fb9f410ac
|
hotfix for 500 when joining team
|
2022-02-13 13:13:54 +01:00 |
|
Danhia
|
bdcfa253b9
|
Update README.md
|
2022-02-12 20:35:41 +01:00 |
|
Danhia
|
cf4860b8ff
|
Merge pull request #7 from Miliviu/main
Set Spanish to done in the readme todo list
|
2022-02-12 19:28:07 +00:00 |
|
Danhia
|
b36c38fd60
|
dynamic scoring for events, i'm pretty sure everything is gonna break
|
2022-02-12 19:56:46 +01:00 |
Miliviu
|
91ec913b8e
|
Set Spanish to done in the readme todo list
|
2022-02-11 19:55:50 +01:00 |
|
Danhia
|
d86d5f4e92
|
challenges not yet published
|
2022-02-09 14:14:41 +01:00 |
|
Danhia
|
01edb75cc6
|
Merge pull request #6 from Miliviu/main
Add translation of news to Spanish
|
2022-02-09 13:36:45 +01:00 |
 Miliviu
|
40fcf1e07a
|
Add translation of news to Spanish
|
2022-02-09 13:08:02 +01:00 |
|
Danhia
|
d77d9386f0
|
added english version of news contents
|
2022-02-09 12:39:12 +01:00 |
|
Danhia
|
947650f07d
|
news content is now out of the db for languages other than english
|
2022-02-09 12:22:12 +01:00 |
|
Danhia
|
2dec4de04f
|
Merge pull request #5 from Miliviu/main
All Spanish strings translated
|
2022-02-09 11:12:32 +01:00 |
|
Miliviu
|
5e75e9f411
|
Add trasnlator references and date of translation
|
2022-02-09 10:58:12 +01:00 |
|
Miliviu
|
973af232b5
|
Add Spanish to availible languages in the Settings.py file
|
2022-02-09 10:53:11 +01:00 |
|
Miliviu
|
41377a56c5
|
Added spanish translation to both django files
|
2022-02-09 10:44:40 +01:00 |
|
Danhia
|
c8a171fa76
|
added option to open team to automatching
|
2022-02-08 15:36:06 +01:00 |
|
Danhia
|
dae0a87548
|
added japanese empty files
|
2022-02-06 23:39:46 +01:00 |
|
Danhia
|
aedbdf57ca
|
fixed redirection when leaving team + few details in html
|
2022-02-04 19:28:09 +01:00 |
|
Danhia
|
9b938c7f67
|
updated .po files for last modifications
|
2022-02-04 19:05:11 +01:00 |
|
Danhia
|
f9ae6edc13
|
Merge branch 'main' into events
|
2022-02-04 19:04:20 +01:00 |
|
Danhia
|
ef1242af46
|
fixed redirection in events
|
2022-02-04 19:04:17 +01:00 |
 ix
|
09cfc722c7
|
fix event html
|
2022-02-04 17:13:50 +01:00 |
|
Danhia
|
5010213a13
|
fixed centering flag vertically
|
2022-02-04 16:04:56 +01:00 |
|
ix
|
ae9a28fc80
|
fix flags
|
2022-02-04 15:43:56 +01:00 |
|
Danhia
|
a5c97c4e38
|
beginning of lang flag refacto
|
2022-02-04 15:28:06 +01:00 |
|
Danhia
|
559c39c4f9
|
Merge pull request #4 from ClemaX/translation/de
locale: de: Translate all existing messages
|
2022-02-04 13:05:05 +01:00 |
|
Clément Hamada
|
54226b8904
|
resources: locale: de: Translate all existing messages
|
2022-02-04 06:02:00 +01:00 |
|
Clément Hamada
|
ca41f8f924
|
locale: de: Spellcheck
|
2022-02-04 05:58:07 +01:00 |
|
Clément Hamada
|
cb0c2ee639
|
resources: locale: de: Update messages
|
2022-02-04 03:34:01 +01:00 |
|
Clément Hamada
|
d8e5236bac
|
locale: de: Update file references
|
2022-02-04 03:30:49 +01:00 |
|
Clément Hamada
|
de249cab9c
|
locale: de: Translate all existing messages
|
2022-02-04 03:13:51 +01:00 |
|
Danhia
|
358de109db
|
changed position of logos in footer for mobile devices + added helloasso button in resources
|
2022-02-04 00:27:29 +01:00 |
|
ix
|
74cb657501
|
Merge branch 'main' of github.com:Danhia/42CTF into main
|
2022-02-03 21:03:18 +01:00 |
|
Danhia
|
d5e2554602
|
hotfix for dynamic scoring
|
2022-02-03 21:02:55 +01:00 |
|
ix
|
c6bbc2a9a1
|
Fix resources page
|
2022-02-03 21:00:04 +01:00 |
|
ix
|
65214b46d4
|
fix spaces between nav elements
|
2022-02-03 20:49:24 +01:00 |
|
ix
|
0ebf804976
|
Fix resources page
|
2022-02-03 20:49:02 +01:00 |
|
ix
|
0d9057eac4
|
Fix unused html
|
2022-02-03 20:45:56 +01:00 |
|
Danhia
|
2f6362360b
|
added dynamic scoring for permanent platform, let's hope nothing breaks
|
2022-02-03 20:27:55 +01:00 |
|
Danhia
|
a639904ee2
|
fixed latest flags when chall is disabled + fixed recompute_scoreboard
|
2022-02-03 18:46:37 +01:00 |
|
Danhia
|
63d22cdf6d
|
added disabled attribute for challenge + fixed recomputescoreboard
|
2022-02-03 18:37:24 +01:00 |
|
Danhia
|
911c9f6732
|
hotfix for 0 division when there is an empty category in profile page
|
2022-02-02 19:34:22 +01:00 |
|
Danhia
|
6337a0dcdb
|
added different color for members almost everywhere
|
2022-02-02 19:23:13 +01:00 |
|
Danhia
|
c25f58341d
|
replaced flags counter by flag because css is broken on medium devices
|
2022-01-31 19:27:20 +01:00 |
|
Danhia
|
2ab42b20c7
|
you can now delete your account
|
2022-01-31 19:21:14 +01:00 |
|
Danhia
|
c38cc8dc94
|
hotfix for command recompute_scoreboard
|
2022-01-31 18:46:34 +01:00 |
|
Danhia
|
396d8ee99b
|
Merge branch 'home-refacto' into main
|
2022-01-30 21:43:20 +01:00 |
|
Danhia
|
da6e51bdcd
|
fixed links css for challenges in home
|
2022-01-30 19:22:58 +01:00 |
|
Danhia
|
0beafc39fa
|
changed timezone in settings.py
|
2022-01-30 18:22:59 +01:00 |
|
Danhia
|
b352a2341a
|
added weekly top 5 + latest flags to home page
|
2022-01-30 17:59:02 +01:00 |
|
Danhia
|
0c08fdda96
|
hotfix for too long pseudos breaking top10 css
|
2022-01-24 21:11:30 +01:00 |
|
Danhia
|
314a7e17b4
|
fixed broken responsive design for footer
|
2022-01-24 17:20:23 +01:00 |
|
Danhia
|
3c4478dddb
|
hotfix for duplicate messages in .po files
|
2022-01-24 16:16:25 +01:00 |
|
Danhia
|
6455a8ddc6
|
replaced subscribe by register for events
|
2022-01-24 16:11:03 +01:00 |
|
Danhia
|
4802218005
|
added event filter for teams in admin panel
|
2022-01-24 12:59:09 +01:00 |
|
Danhia
|
5242150b92
|
added event filter for teams in admin panel
|
2022-01-24 12:57:14 +01:00 |
|
Danhia
|
c06c94e807
|
updtaed footer with twitter and linkedin
|
2022-01-24 10:27:38 +01:00 |
|
Danhia
|
5219778d5b
|
fixed missing og_img for page preview
|
2022-01-24 09:57:03 +01:00 |
|
Danhia
|
a1bda8a7cc
|
corrected typo in no solves message
|
2022-01-23 18:48:55 +01:00 |
|
Danhia
|
aea1ecda15
|
changed color in top 10 + updated resources
|
2022-01-23 18:45:10 +01:00 |
|
Danhia
|
79c74e1946
|
added member and visitor status + different colors in scoreboard
|
2022-01-23 18:40:57 +01:00 |
|
Danhia
|
94a24376d4
|
finished first version of resources, let's deploy !
|
2022-01-23 17:08:13 +01:00 |
|
Danhia
|
bd4dadeaf1
|
Merge branch 'main' into ressources
|
2022-01-23 15:48:57 +01:00 |
|
Danhia
|
827068f113
|
Merge branch 'events' into main
|
2022-01-16 22:19:38 +01:00 |
|
Danhia
|
818be801b2
|
split views.py in events + new field in events model for automatching
|
2022-01-16 22:18:39 +01:00 |
|
Danhia
|
6a16e0fdbd
|
added auto matching for teams in event
|
2022-01-15 00:44:25 +01:00 |
|
Danhia
|
40a7d4ebdd
|
Merge branch 'events' into main
|
2022-01-14 23:42:53 +01:00 |
|
Danhia
|
a6095cc5c4
|
removed 500 when user is not connected and want to access public event
|
2022-01-14 23:41:59 +01:00 |
|
Danhia
|
66a9bd6b09
|
first draft of resources
|
2022-01-08 14:12:09 +01:00 |
|
Danhia
|
ceede3cfa0
|
updated fr translations for events
|
2022-01-08 11:23:20 +01:00 |
|
Danhia
|
ef1673dbd4
|
updated translation files
|
2022-01-08 10:55:57 +01:00 |
|
Danhia
|
e4f68edeff
|
fixed error when displaying challenge info in solo mode
|
2022-01-02 21:53:38 +01:00 |
|
Danhia
|
2ab410efdf
|
fixed starting date for graph on event's profile
|
2022-01-02 21:46:23 +01:00 |
|
Danhia
|
dfa5c3830d
|
fixed case where a category has no challenge in an event and profile crash
|
2022-01-02 21:41:32 +01:00 |
|
Danhia
|
6ec1a20e74
|
fixed missing team when event is not password protected
|
2022-01-02 21:00:02 +01:00 |
|
Danhia
|
7ae36e2cee
|
it's possible to modify and leave team
|
2022-01-02 20:42:10 +01:00 |
|
Danhia
|
411896bf01
|
you can create and join team + eventplayer and team profile
|
2021-12-28 20:17:39 +01:00 |
|
Danhia
|
9405fcabde
|
first draft for team events
|
2021-12-17 19:02:19 +01:00 |
|
Danhia
|
727e11a29e
|
Merge branch 'main' of https://github.com/Danhia/42CTF into main
|
2021-12-14 21:22:03 +01:00 |
|
Danhia
|
be0fc5dd67
|
added rank on profile page
|
2021-12-14 21:21:29 +01:00 |
|
Danhia
|
d20b3f75d9
|
Update README.md
|
2021-12-14 20:38:03 +01:00 |
|
Danhia
|
3d456ea26b
|
little fix for flag length + restrict access for unpublished challenges
|
2021-12-14 20:35:59 +01:00 |
|
ix
|
e5c4a2856e
|
fix access to event challenges when event not begun or user not connected
|
2021-12-10 09:47:45 +01:00 |
|
Danhia
|
7cf7fd82d4
|
Merge pull request #3 from Lindoriel/main
correcting syntax error
|
2021-10-25 21:01:04 +02:00 |
Maxime ROTH
|
ca34f76465
|
correcting ". error
|
2021-10-25 20:58:59 +02:00 |
|
Danhia
|
0123edd87a
|
Merge pull request #2 from Lindoriel/main
adding french translation
|
2021-10-25 20:52:14 +02:00 |
|
Maxime ROTH
|
a295321f19
|
adding french translation
|
2021-10-25 20:22:11 +02:00 |
|
ix
|
2dcea7cd74
|
update patreon link
|
2021-10-25 13:22:07 +02:00 |
|
Danhia
|
ecd7ca69db
|
first draft for cgu
|
2021-10-24 20:26:26 +02:00 |
|
ix
|
e6e50fcd05
|
footer reworked, patreon link added, messages recompiled and cgu view added
|
2021-10-24 16:25:46 +02:00 |
|
ix
|
4dcc953baf
|
fix solve list for event challenges, fix link color
|
2021-10-23 11:13:02 +02:00 |
|
ix
|
a7620eec77
|
fix template profile
|
2021-10-22 16:09:05 +02:00 |
|
ix
|
baa598f1aa
|
fix template profile
|
2021-10-22 16:08:22 +02:00 |
|
ix
|
ddccb96586
|
Merge branch 'events' into main
|
2021-10-22 14:21:16 +02:00 |
|
ix
|
9f0273a85b
|
Merge branch 'main' of github.com:Danhia/42CTF into main
|
2021-10-22 14:21:12 +02:00 |
|
ix
|
63349df20f
|
Update fix
|
2021-10-22 14:21:05 +02:00 |
Ix
|
1274a6b7fe
|
Merge pull request #1 from Danhia/events
Update fix
|
2021-10-22 13:59:27 +02:00 |
|
ix
|
f5b54e3ed6
|
Merge branch 'main' of github.com:Danhia/42CTF into main
|
2021-10-22 13:58:40 +02:00 |
|
ix
|
0a42af4a9b
|
Update fix
|
2021-10-22 13:58:23 +02:00 |
|
Ix
|
87b1a5f6f8
|
Update README.md
|
2021-10-22 11:48:28 +02:00 |
|
ix
|
a379f4934d
|
Update todo
|
2021-10-22 11:46:48 +02:00 |
|
ix
|
86cc6070e1
|
Events done
|
2021-10-22 11:45:50 +02:00 |
|
ix
|
c98e89b5ca
|
events added, need to smooth html and css
|
2021-10-21 15:02:02 +02:00 |
|
Ix
|
8d3cd60ae4
|
Update README.md
|
2021-09-21 21:42:55 +02:00 |
|
ix
|
e956082385
|
category challenges listed by point decrease
|
2021-09-08 21:50:28 +02:00 |
|
ix
|
071ba34792
|
Discord button removed, css fix when 0 at category stat, messages recompiled
|
2021-09-08 21:36:15 +02:00 |
|
ix
|
81e283ea69
|
Categories stats added, css modified, fix responsive display of profile page
|
2021-09-08 16:53:00 +02:00 |
|
ix
|
ed928f6f33
|
Merge branch 'graph' into main
|
2021-09-08 04:00:39 +02:00 |
|
ix
|
ce31ce30ee
|
Charts changed to highcharts
|
2021-09-08 03:59:35 +02:00 |
|
ix
|
500d6fe228
|
Charts added
|
2021-09-08 00:32:44 +02:00 |
|
Danhia
|
0c0506505b
|
fixed missing translation header in password reset templates
|
2021-09-07 20:42:18 +00:00 |
|
ix
|
62b3b7e5cd
|
internationalization for news
|
2021-09-07 21:13:30 +02:00 |
|
ix
|
acbf38a6a7
|
Merge remote-tracking branch 'origin/traduction-fr' into main
|
2021-09-07 19:54:05 +02:00 |
|
ix
|
dbdd6b06f8
|
internationalization fixed, templates url fixed, messages recompiled
|
2021-09-07 19:52:40 +02:00 |
|
Danhia
|
428edadb31
|
changed translation for sign up
|
2021-09-06 21:34:45 +02:00 |
|
Danhia
|
768e62f369
|
french translation
|
2021-09-06 21:04:42 +02:00 |
|
ix
|
52c2dcdec3
|
last
|
2021-09-06 20:15:03 +02:00 |
|
ix
|
42441e7854
|
local settings
|
2021-09-06 20:14:23 +02:00 |
|
ix
|
b0cea92ea8
|
local settings
|
2021-09-06 20:12:03 +02:00 |
|
ix
|
0c285cc486
|
okay it's done i think
|
2021-09-06 19:59:13 +02:00 |
|
ix
|
5e0da0e8b3
|
okay it's done i think
|
2021-09-06 19:42:13 +02:00 |
|
Ix
|
faec388ad5
|
Create settings.py
|
2021-07-10 12:34:42 +02:00 |
|
Ix
|
afb572d091
|
Update .gitignore
|
2021-07-10 12:29:40 +02:00 |