klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-23 14:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,152 Commits 23 Branches 0 Tags 106 MiB
9295325d21
Commit Graph

2152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soldat
a88430d43b Merge branch 'black' into 'master' 
Passer black sur tout le repo et l'imposer

See merge request ae/Sith!159
 2018-10-05 23:26:57 +02:00
klmp200
d2fe9e56cf
Add black for sublime text in contributing 2018-10-05 23:18:35 +02:00
Soldat
66957750ba Ajout de black dans contributing 2018-10-05 23:03:45 +02:00
klmp200
d56a5138a8
contributing: freshen up infos while I'm at it 2018-10-05 22:30:54 +02:00
klmp200
839f585f87
CI: improve CI 2018-10-05 21:53:14 +02:00
klmp200
cb58b00b6e
All: Apply Black coding rules 2018-10-05 21:52:55 +02:00
klmp200
0581c667de
Club: blackify view file 2018-10-05 21:51:54 +02:00
klmp200
88d6f8dc8a
CI: introduce black 2018-10-05 21:48:26 +02:00
Soldat
d1d1ba4aff Merge branch 'clubs' into 'master' 
clubs: un champ plus joli pour la short_description, crack vas être content

See merge request ae/Sith!158
 2018-10-05 21:41:21 +02:00
klmp200
5a6c7aaadf
clubs: un champ plus joli pour la short_description, crack vas être content 2018-10-04 00:15:47 +02:00
Soldat
9a9eb52768 Merge branch 'cotiz' into 'master' 
add 1 day cotiz

See merge request ae/Sith!157
 2018-09-20 19:28:04 +02:00
Soldat
cd7672f08c Change local for one day cotiz 2018-09-20 14:48:40 +02:00
Soldat
2fca548e15 Add 1 day cotiz 2018-09-20 14:30:35 +02:00
Skia
be36b7f38a com: fix birthdays query 2018-09-19 11:37:16 +02:00
Krophil
09bde1bfdf Merge branch 'cotiz' into 'master' 
added 6 month free cotiz and changed compute_end

See merge request ae/Sith!156
 2018-09-01 18:42:13 +02:00
Soldat
7a1b9bd412 compute_end count day by day now (not month by month like before) to allow 6 weeks cotiz 2018-09-01 17:45:13 +02:00
Soldat
f78d8e1d95 change sub 2 month free to 6 weeks free 2018-08-31 18:41:06 +02:00
Sli
bef10c0fe3 Merge branch 'sli' into 'master' 
Add subscription for 2018 Euroks

See merge request ae/Sith!155
 2018-07-07 00:19:22 +02:00
klmp200
e3cb6d41f9
Add subscription for 2018 Euroks 2018-07-07 00:13:31 +02:00
Skia
290f6ca883 Merge branch 'feature/captcha' into 'master' 
Add captcha to registration form

Closes #52

See merge request ae/Sith!154
 2018-07-06 11:35:03 +02:00
Grégoire Duvauchelle
afe78ea634 Add captcha to registration form 2018-07-06 11:35:02 +02:00
Sli
b2abc78694 Merge branch 'new_django' into 'master' 
Fix subscription bug for old subscribers on subscription page

See merge request ae/Sith!153
 2018-06-12 15:07:09 +02:00
klmp200
f1e8d55b41
Fix subscription bug for old subscribers on subscription page 2018-06-12 15:00:51 +02:00
Sli
7322882002 Merge branch 'new_django' into 'master' 
Fix user pictures display

See merge request ae/Sith!152
 2018-06-10 18:49:44 +02:00
klmp200
5c4a16d14c
Fix user pictures display 2018-06-10 18:43:39 +02:00
Sli
1cfc4f8092 Merge branch 'new_django' into 'master' 
Migration to django 1.11

See merge request ae/Sith!146
 2018-06-10 16:37:57 +02:00
klmp200
08de5dfe6a
Migration to django 1.11 2018-06-10 16:31:58 +02:00
Sli
39119f586a Merge branch 'sli' into 'master' 
Image promo 19 et demande du bdf

See merge request ae/Sith!151
 2018-06-10 16:16:37 +02:00
klmp200
a0a86ef8e1
Allow BDF's members to see subscriptions on users 2018-06-10 16:09:21 +02:00
klmp200
90e1e7c1bb
Add promo logo 2018-06-10 16:09:04 +02:00
klmp200
c5be9b5597
Add promo 19's logo 2018-06-10 15:49:53 +02:00
Skia
f2106a37a3 counter: fix tests 2018-06-07 19:57:56 +02:00
Skia
eae7825260 core/static: fix Matmat results with long names 2018-06-07 00:10:33 +02:00
Skia
61d34b3a09 core, matmat: fix search form 2018-06-06 00:25:27 +02:00
Skia
fecb1ae902 core/static: fix Markdown code vertical-align 2018-06-05 00:49:43 +02:00
Skia
be1dc62848 core: make a nice user profile 2018-06-05 00:28:43 +02:00
Skia
9146251642 Prevent generation of useless migrations upon settings change 2018-05-08 18:51:29 +02:00
Sli
01240ce75e Merge branch 'bugfix' into 'master' 
Small modification in hope to fix communication screen deformations

See merge request ae/Sith!150
 2018-04-29 14:12:22 +02:00
gnikwo
3fe4e64098
Small modification in hope to fix communication screen deformations 2018-04-29 13:53:55 +02:00
Skia
23291ac60e Merge branch 'bugfix' into 'master' 
Forum and Com fixes

See merge request ae/Sith!147
 2018-04-26 19:50:49 +02:00
klmp200
83f38e617b
Forum Form optimisation 2018-04-26 19:38:39 +02:00
klmp200
443616a762
Forum permission fix and form display 2018-04-26 15:20:45 +02:00
klmp200
afa9bd8735
Fix Poster form 2018-04-26 14:48:29 +02:00
Skia
0cc3707059 subscription/tests: remove silly print 2018-04-19 01:10:06 +02:00
Skia
bf57329bd8 sas/templates: Improve generation time display 2018-04-18 23:49:12 +02:00
Skia
4d36a961db core/models: improve repair_fs output 2018-04-18 23:02:19 +02:00
Skia
874dfa6cc3 sas/views: change categories ordering 2018-04-18 22:58:03 +02:00
Skia
b5aee62558 core/models: don't always repair every single file 2018-04-18 22:54:30 +02:00
Skia
52832eed4d Merge branch 'skia' into 'master' 
core/models: make some tools to repair the SithFiles FS regarding the DB

See merge request ae/Sith!144
 2018-04-18 22:19:17 +02:00
Skia
b2306b62d6 core/models: better handle broken files 
Signed-off-by: Skia <skia@libskia.so>
 2018-04-16 18:35:00 +02:00