|
|
cbd333eb47
|
Changed default display time for posters and permissions on it
|
2018-03-18 22:28:25 +01:00 |
|
Skia
|
d83bb20547
|
core: small update on footnotes style
Signed-off-by: Skia <skia@libskia.so>
|
2018-02-22 22:56:15 +01:00 |
|
Skia
|
606f1af4d5
|
forum: add favorite topics
Signed-off-by: Skia <skia@libskia.so>
|
2018-02-22 22:28:28 +01:00 |
|
Skia
|
f47f846d26
|
forum: add button CSS class
Signed-off-by: Skia <skia@libskia.so>
|
2018-02-22 22:15:10 +01:00 |
|
|
|
80bffd00d1
|
Merge branch 'bugfix' into 'master'
Bugfix for mailing list and posters
See merge request ae/Sith!141
|
2017-12-22 12:59:51 +01:00 |
|
|
|
43b4579a98
|
Fix datetime forms for posters
|
2017-12-22 12:53:43 +01:00 |
|
|
|
c014a6e379
|
Fix translations
|
2017-12-22 12:22:37 +01:00 |
|
|
|
b7483513be
|
Fix for mailing lists
|
2017-12-22 12:06:23 +01:00 |
|
Skia
|
10dfb2c122
|
Merge branch 'nabos' into 'master'
Communication screens
See merge request ae/Sith!116
|
2017-12-21 18:25:56 +01:00 |
|
Skia
|
a2ee017668
|
club/views: fix call to parent's get_context_data in PosterListView
|
2017-12-21 18:16:32 +01:00 |
|
gnikwo
|
22e277d4f7
|
merged migrations
|
2017-12-21 16:15:11 +01:00 |
|
gnikwo
|
903f07ecbd
|
Added screen list on poster + Added unmoderated poster artefact + discussions fixes
|
2017-12-21 12:25:07 +01:00 |
|
|
|
72d2862e3e
|
Posters now working + notifications for com admin
|
2017-12-16 20:48:36 +01:00 |
|
|
|
5132eb49e4
|
Merge branch 'elections' into 'master'
It's better to delete an object in delete
See merge request ae/Sith!140
|
2017-12-12 14:58:02 +01:00 |
|
|
|
5915de9603
|
It's better to delete an object in delete
|
2017-12-12 14:52:08 +01:00 |
|
|
|
73bd8b0fd3
|
Merge branch 'revert-3c2f48b7' into 'master'
Revert "Merge branch 'pere200' into 'master'"
See merge request ae/Sith!139
|
2017-12-12 13:12:10 +01:00 |
|
|
|
d2c278ba0e
|
Revert "Merge branch 'pere200' into 'master'"
This reverts merge request !138
|
2017-12-12 13:01:09 +01:00 |
|
|
|
3c2f48b750
|
Merge branch 'pere200' into 'master'
Pere200
See merge request ae/Sith!138
|
2017-12-11 05:19:30 +01:00 |
|
|
|
93f430ac38
|
PERE 200
|
2017-12-11 05:11:23 +01:00 |
|
|
|
6335d60ad6
|
Merge branch 'quickux' into 'master'
Better ui for group selection on election and wiki
See merge request ae/Sith!137
|
2017-12-10 21:43:54 +01:00 |
|
|
|
d49f7858d3
|
Better ui for group selection on election and wiki
|
2017-12-10 21:37:50 +01:00 |
|
|
|
cc99cecaa0
|
Fix tab mixin on clubs
|
2017-12-05 15:53:36 +01:00 |
|
gnikwo
|
91d3e9e4dc
|
Delete function + club tabs
|
2017-12-05 15:24:46 +01:00 |
|
|
|
c8fae39ff0
|
Merge branch 'elections' into 'master'
Avoid moving role order in election by reloading page
See merge request ae/Sith!136
|
2017-12-05 14:30:52 +01:00 |
|
|
|
4217b92941
|
Avoid moving role order in election by reloading page
|
2017-12-05 14:22:59 +01:00 |
|
|
|
bc7cfc2dba
|
Merge branch 'elections' into 'master'
Election improvements
See merge request ae/Sith!135
|
2017-12-04 13:36:25 +01:00 |
|
|
|
2f3b481037
|
Improve deletion and add ordering on roles
|
2017-12-02 19:05:48 +01:00 |
|
|
|
625b5132c4
|
Election list deletion and ux improvements
|
2017-12-01 19:45:28 +01:00 |
|
Skia
|
9ca82af219
|
Merge branch 'counter' into 'master'
fix can_buy in customer
See merge request ae/Sith!134
|
2017-12-01 16:03:16 +01:00 |
|
|
|
4af3239f4c
|
fix can_buy in customer
|
2017-12-01 01:44:38 +01:00 |
|
gnikwo
|
88d68ea510
|
Ready for review
|
2017-11-28 15:12:25 +01:00 |
|
gnikwo
|
5cd031f579
|
Ready for review
|
2017-11-28 15:12:25 +01:00 |
|
gnikwo
|
21b24f2891
|
Club views and discussions fixes
|
2017-11-28 15:12:04 +01:00 |
|
gnikwo
|
693c3ed27e
|
Moved club field + migrations
|
2017-11-28 15:09:21 +01:00 |
|
gnikwo
|
17d3860ec5
|
Fix bad merge
|
2017-11-28 15:09:20 +01:00 |
|
gnikwo
|
8d1c648032
|
Communication screen - without club tool
|
2017-11-28 15:09:05 +01:00 |
|
Skia
|
23d86464c8
|
Merge branch 'admin_area' into 'master'
Search field in Subscription admin area
See merge request ae/Sith!133
|
2017-11-17 12:02:31 +01:00 |
|
|
|
bb47ad97a3
|
Search field in Subscription admin area
|
2017-11-17 11:48:16 +01:00 |
|
Skia
|
64c479a02e
|
Merge branch 'bugfix' into 'master'
Bugfix
See merge request ae/Sith!132
|
2017-11-16 15:43:54 +01:00 |
|
|
|
33964e0bab
|
Better way to check if a user is subscriber
|
2017-11-16 13:50:34 +01:00 |
|
|
|
42f8ee3518
|
Merge branch 'teeshirt' into 'master'
Fix translations error for gifts
See merge request ae/Sith!131
|
2017-11-14 10:23:32 +01:00 |
|
|
|
eb485215d9
|
Fix translations error for gifts
|
2017-11-13 18:30:05 +01:00 |
|
Skia
|
6ee1ee365b
|
Merge branch 'bugfix' into 'master'
Fix AGAIN subscription display
See merge request ae/Sith!130
|
2017-11-09 15:22:06 +01:00 |
|
|
|
0ba69da3b6
|
Fix AGAIN subscription display
|
2017-11-09 14:49:07 +01:00 |
|
Skia
|
3793321c37
|
Update README and Markdown test assets
Signed-off-by: Skia <skia@libskia.so>
|
2017-11-09 14:37:29 +01:00 |
|
Skia
|
4bf805e2f5
|
Merge branch 'krophil' into 'master'
Add comment in product type
See merge request ae/Sith!126
|
2017-11-07 12:10:49 +01:00 |
|
|
|
846be54431
|
Merge branch 'teeshirt' into 'master'
Add gift function
See merge request ae/Sith!129
|
2017-11-06 00:55:28 +01:00 |
|
|
|
c6847ebc47
|
Translations for gifts
|
2017-11-06 00:44:18 +01:00 |
|
|
|
e3fd3b81ab
|
Add gift function
|
2017-11-06 00:30:37 +01:00 |
|
|
|
9ab7cb98dc
|
Merge branch 'bugfix' into 'master'
Fix external ressources
See merge request ae/Sith!128
|
2017-11-05 23:31:29 +01:00 |
|
