ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
1,822 Commits 17 Branches 3 Tags 24 MiB
Commit Graph

1822 Commits

Author SHA1 Message Date
misterkrafts 81c12436a8 Revert "missing comma" 
This reverts commit 1ca4246cbd.
 2023-03-31 16:51:48 +02:00
misterkrafts 8eee14075c test6 2023-03-31 16:37:22 +02:00
misterkrafts ab9ba62af1 test5 2023-03-31 16:31:53 +02:00
misterkrafts 8ca0648e75 test4 2023-03-31 16:23:41 +02:00
misterkrafts 77ecfd6ed5 test3 2023-03-31 16:14:29 +02:00
misterkrafts 0ab1367e55 test2 2023-03-31 15:56:34 +02:00
misterkrafts 524f0e098a test 2023-03-31 15:48:45 +02:00
misterkrafts 1ca4246cbd missing comma 2023-03-31 14:58:46 +02:00
Otthorn 6a9021ec14 Merge branch 'couleur_totalist_spies' into 'main' 
Couleur totalist spies

See merge request bde/nk20!208
 2023-03-31 12:37:24 +02:00
misterkrafts cb74311e7b Commit migration, j'étais triggered 2023-03-30 19:14:52 +02:00
misterkrafts 9d7dd566c9 Ignore /tmp/ 2023-03-30 17:26:06 +02:00
parpaing 9944ebcaad changement des couleurs de la note vers les couleurs totalist spies 2023-03-25 02:13:16 +01:00
parpaing 8537f043f7 changement des couleurs de la note vers les couleurs totalist spies 2023-03-25 00:57:19 +01:00
bleizi c89a95f8d2 Merge branch 'invoice-logo-totalist' into 'main' 
changement du fond des factures

See merge request bde/nk20!207
 2023-01-30 13:06:39 +01:00
parpaing 73640b1dfa changement du fond des factures 2023-01-30 00:06:45 +01:00
bleizi 84b16ab603 Merge branch 'SogeCreditDate' into 'main' 
link SogeCredit to WEI by creation date instead of civil year

See merge request bde/nk20!206
 2023-01-17 15:58:52 +01:00
bleizi 6a1b51dbbf Merge branch 'api_pagination' into 'main' 
Add custom pagination size as an API parameter

See merge request bde/nk20!205
 2023-01-11 22:46:13 +01:00
Théo Le Moigne c441a43a8b
link SogeCredit to WEI by creation date instead of civil year 2023-01-10 21:40:03 +01:00
Otthorn 87f3b51b04 Add custom pagination size as an API parameter 2022-12-14 18:37:13 +01:00
bleizi 0a853fd3e6 Merge branch 'permission_trez' into 'main' 
fix trez perm

See merge request bde/nk20!204
 2022-12-10 14:41:57 +01:00
Théo Le Moigne c429734810
fix bug 2022-11-12 14:51:22 +01:00
bleizi 5d759111b6 Merge branch 'weiWords' into 'main' 
change wei words

See merge request bde/nk20!203
 2022-09-05 13:24:24 +02:00
Théo Le Moigne 70baf7566c
change wei words 2022-09-05 13:20:00 +02:00
bleizi eb355f547c Merge branch 'SogeNotForMembership' into 'main' 
Soge not for membership

See merge request bde/nk20!202
 2022-09-04 22:56:07 +02:00
Yoann Beaugnon 7068170f18 fixing grammar in comments 2022-09-04 13:24:39 +02:00
Théo Le Moigne 45ee9a8941
Soge only payd WEI (not bde/kfet membership) 2022-09-04 12:52:40 +02:00
Théo Le Moigne 454ea19603
hide Soge during registration 2022-09-04 12:31:08 +02:00
ynerant 5a77a66391 Merge branch 'beta' into 'main' 
Friendships

See merge request bde/nk20!200
 2022-04-13 12:45:06 +02:00
elkmaennchen 761fc170eb
Update Spanish translation 2022-04-13 12:30:22 +02:00
Nicolas Margulies ac23d7eb54
Generated translation files for de/es (but didn't translate anything) 2022-04-13 12:30:22 +02:00
Nicolas Margulies 40e7415062
Added translations for friendships 2022-04-13 12:30:22 +02:00
Nicolas Margulies 319405d2b1
Added a message to explain what frendships do 
Signed-off-by: Nicolas Margulies <nicomarg@crans.org>
 2022-04-13 12:30:22 +02:00
Nicolas Margulies 633ab88b04
Linting 2022-04-13 12:30:22 +02:00
Nicolas Margulies e29b42eecc
Add permissions related to trusting 2022-04-13 12:30:22 +02:00
Nicolas Margulies dc69faaf1d
Better user search to add friendships 2022-04-13 12:30:22 +02:00
Nicolas Margulies 442a5c5e36
First proro of trusting, with models and front, but no additional permissions 2022-04-13 12:30:22 +02:00
Nicolas Margulies 7ab0fec3bc
Added trust model 2022-04-13 12:30:22 +02:00
aeltheos bd4fb23351 Merge branch 'color_survi' into 'main' 
switching to survivalist color

See merge request bde/nk20!199
 2022-04-12 20:16:55 +02:00
Yoann Beaugnon ee22e9b3b6 fixing color to follow the proper theme 2022-04-12 18:33:22 +02:00
Yoann Beaugnon 19ae616fb4 switching to survivalist color 2022-04-12 17:40:52 +02:00
Otthorn b7657ec362 Merge branch 'color_ttlsp' into 'main' 
Passage des couleur vers ttlsp

See merge request bde/nk20!197
 2022-04-05 15:05:41 +02:00
parpaing 4d03d9460d Passage des couleurs ttlsp 2022-04-05 14:45:41 +02:00
ynerant 3633f66a87 Merge branch 'beta' into 'main' 
Corrections de bugs

See merge request bde/nk20!195
 2022-03-09 15:10:37 +01:00
ynerant d43fbe7ac6 Merge branch 'harden' into 'beta' 
Harden Django project configuration

See merge request bde/nk20!194
 2022-03-09 12:30:23 +01:00
Alexandre Iooss df5f9b5f1e Harden Django project configuration 
Set session and CSRF cookies as secure for production.
Set HSTS header to let browser remember HTTPS for 1 year.
 2022-03-09 12:12:56 +01:00
Yohann D'ANELLO 4161248bff
Add permissions to view/create/change/delete OAuth2 applications 
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
 2022-03-09 12:06:19 +01:00
Yohann D'ANELLO 58136f3c48
Fix permission checks in the /api/me view 
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
 2022-03-09 11:45:24 +01:00
Yohann D'ANELLO d9b4e0a9a9
Fix membership tables for clubs without an ending membership date 
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
 2022-02-13 17:53:05 +01:00
Yohann D'ANELLO 8563a8d235
Fix membership tables for clubs without an ending membership date 
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
 2022-02-13 17:51:22 +01:00
ynerant 5f69232560 Merge branch 'beta' into 'main' 
Optional scopes + small bug fix

See merge request bde/nk20!193
 2022-02-12 14:37:58 +01:00