klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-12-27 02:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,625 Commits 24 Branches 0 Tags 113 MiB
d4b9c3afb1
Commit Graph

2625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soldat
bf321aaac3 Message change color when unread 2018-10-16 21:08:47 +02:00
Sli
75dd171714 Merge branch 'historique_cotisations' into 'master' 
user: allow subscription history to be visible when subscription is expired

See merge request ae/Sith!169
 2018-10-16 15:43:23 +02:00
Bartuccio Antoine
4d3ff3e9dc user: allow subscription history to be visible when subscription is expired 2018-10-16 15:28:45 +02:00
Sli
917b559b4a Merge branch 'historique_cotisations' into 'master' 
user: add subscription history

See merge request ae/Sith!167
 2018-10-16 15:17:57 +02:00
Sli
9089fe3a6a Merge branch 'formulaire_cotisation' into 'master' 
subscriptions: add date_of_birth for new users created in subscription form

See merge request ae/Sith!168
 2018-10-16 15:01:25 +02:00
Bartuccio Antoine
72a4bde6a2 user: fix populate for dev and use native django function to fetch payment_method 2018-10-16 14:52:47 +02:00
klmp200
e24eb8ce37
subscriptions: add date_of_birth for new users created in subscription form 2018-10-16 00:44:32 +02:00
klmp200
f6968facbe
user: add subscription history 2018-10-16 00:17:19 +02:00
Sli
b2b03e530a Merge branch 'sentry' into 'master' 
senrty: fix SENTRY_DSN in error page

See merge request ae/Sith!166
 2018-10-10 16:40:57 +02:00
Bartuccio Antoine
f91ba25b25 senrty: fix SENTRY_DSN in error page 2018-10-10 16:33:12 +02:00
Sli
6fd34bcaa0 Merge branch 'sentry' into 'master' 
Intégration d'une page d'incident automatique

See merge request ae/Sith!165
 2018-10-10 16:23:05 +02:00
Bartuccio Antoine
f4122bbc37 sentry: deal with sentry's js as external resource 2018-10-10 15:27:21 +02:00
Soldat
e44c8bf828 Merge branch 'il-faut-sauver-le-css' into 'master' 
Change design

See merge request ae/Sith!163
 2018-10-10 10:13:49 +02:00
klmp200
bdd8427758
sentry: integration with error 500 page 2018-10-10 02:18:19 +02:00
Soldat
87b70d4597 Changed color 2018-10-09 22:04:17 +02:00
Soldat
20b513a381 Decrease nav and agenda border radius, change shadow, change tool bar border and margin 2018-10-09 22:04:17 +02:00
Soldat
680d29a2b4 Darker nav color 2018-10-09 22:04:17 +02:00
Sli
f7be284b30 Merge branch 'sentry' into 'master' 
Support de sentry pour récupérer les erreurs utilisateur

See merge request ae/Sith!161
 2018-10-09 12:14:50 +02:00
Soldat
3ae0c3f3e1 Merge branch 'il-faut-sauver-le-css' into 'master' 
Changed the design of the Sith.

See merge request ae/Sith!162
 2018-10-07 22:21:12 +02:00
Soldat
cce33d13b3 Change hex to hsl 2018-10-07 21:48:03 +02:00
Soldat
a78f1101c3 Changed site design v1 2018-10-07 21:48:03 +02:00
Soldat
3a778e2105 First commit and fix overlapping text and logo 2018-10-07 14:59:04 +02:00
klmp200
b2d44e83b4
debug: add sentry support 2018-10-06 03:37:36 +02:00
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