|
|
6d09a9e9b0
|
Merge branch 'krophil' into 'master'
Oups, I did it again...
See merge request !106
|
2017-09-02 15:39:01 +02:00 |
|
|
|
9489b52304
|
Oups, I did it again...
|
2017-09-02 15:31:20 +02:00 |
|
|
|
e581de0a94
|
Merge branch 'krophil' into 'master'
Add color palette creator + add list of refillings
See merge request !105
|
2017-09-02 15:28:19 +02:00 |
|
|
|
e71db5a997
|
Add translations
|
2017-09-02 15:22:50 +02:00 |
|
|
|
39ce14804a
|
Add refillings list
|
2017-09-02 15:16:29 +02:00 |
|
|
|
63ae89b30a
|
Add color palette creator
|
2017-09-02 13:41:29 +02:00 |
|
Skia
|
9f259b35bd
|
core, counter: add preferences for counter notifications
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-02 12:42:07 +02:00 |
|
Skia
|
914feffbd8
|
locale: update translations
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-02 02:19:48 +02:00 |
|
Skia
|
8b9c3fb5c6
|
core: improve notification box
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-02 02:19:34 +02:00 |
|
Skia
|
4ca3aebc77
|
core: improve alert and info boxes
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-02 02:06:22 +02:00 |
|
Skia
|
5c709a5416
|
core: great rework of the header bar
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-01 18:31:48 +02:00 |
|
Skia
|
22151ef3b3
|
core: display news page in place of index for logged in users
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-01 12:33:23 +02:00 |
|
Skia
|
4edb9a78c6
|
com: add agenda on news page
Signed-off-by: Skia <skia@libskia.so>
|
2017-09-01 12:22:38 +02:00 |
|
Skia
|
0532f7337a
|
Merge branch 'jewels_subscription' into 'master'
Jewels subscription
See merge request !98
|
2017-08-31 17:45:54 +02:00 |
|
|
|
3be64d6a8f
|
New subscription type for jewels
New condition to consider floats in subscriptions
|
2017-08-31 16:37:03 +02:00 |
|
|
|
94582a2d96
|
Free subscription for jewels
|
2017-08-31 16:18:28 +02:00 |
|
Skia
|
02b317eee8
|
locale: fix translations
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-31 15:37:05 +02:00 |
|
|
|
bb40d48b62
|
Merge branch 'nintendo_switch' into 'master'
New Sponsors page
See merge request !104
|
2017-08-31 14:19:05 +02:00 |
|
|
|
2bd1927e39
|
New Sponsors page
|
2017-08-31 14:11:18 +02:00 |
|
Skia
|
7ec9d7f8c6
|
gitignore: ignore coverage artifacts
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-29 16:45:18 +02:00 |
|
Skia
|
0232953260
|
CI: add coverage report
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-29 16:01:01 +02:00 |
|
Skia
|
9ee5c387c5
|
subscription: add tests
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-29 15:07:03 +02:00 |
|
|
|
5e8ae83cf2
|
Merge branch 'mailing' into 'master'
mailing: Oups, forgot some \n in mailing format that I couldn't see at the first time
See merge request !103
|
2017-08-25 16:23:01 +02:00 |
|
|
|
1f8b035558
|
mailing: Oups, forgot some \n in mailing format that I couldn't see at the first time
|
2017-08-25 16:14:02 +02:00 |
|
Skia
|
5504142efa
|
core, templates: fix logo link
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-25 14:28:17 +02:00 |
|
Skia
|
0d5595c683
|
core: add test for Markdown syntax
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-24 16:30:46 +02:00 |
|
Skia
|
30f650ecce
|
core: use more AJAX forms in admin UI
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-24 15:35:17 +02:00 |
|
|
|
c0b3024cc2
|
Merge branch 'mailing' into 'master'
Fix permission for club in user profile
See merge request !102
|
2017-08-24 14:49:04 +02:00 |
|
|
|
b0ce8b1b83
|
Fix permission for club in user profile
|
2017-08-24 14:42:57 +02:00 |
|
Skia
|
b5e7a0d747
|
Merge branch 'mailing' into 'master'
Fix error when deleting user from mailing when only email provided
See merge request !101
|
2017-08-24 00:26:38 +02:00 |
|
Skia
|
6c66ae6b39
|
Merge branch 'disable_CB' into 'master'
Allow disabling CB in crisis time
See merge request !100
|
2017-08-24 00:22:29 +02:00 |
|
|
|
f65f261cfd
|
mailing: Fix error when deleting user from mailing when only email provided
|
2017-08-24 00:20:20 +02:00 |
|
|
|
6f6ad123af
|
Allow disabling CB in crisis time
|
2017-08-24 00:14:36 +02:00 |
|
|
|
8e166b75e4
|
Merge branch 'nintendo_switch' into 'master'
Changing urls
See merge request !99
|
2017-08-22 23:53:56 +02:00 |
|
|
|
b74600b3f3
|
Changing urls
|
2017-08-22 23:47:55 +02:00 |
|
Skia
|
4ad923ff06
|
Merge branch 'mailing' into 'master'
Mailing list system
See merge request !96
|
2017-08-22 23:02:46 +02:00 |
|
|
|
4f6109e27c
|
Refactor mailings email
|
2017-08-22 22:39:12 +02:00 |
|
|
|
c83a990165
|
Wtf migration blocking me
|
2017-08-22 16:03:24 +02:00 |
|
|
|
62b59f92fd
|
Translations
|
2017-08-22 15:51:09 +02:00 |
|
|
|
d179a0a6d0
|
Fix typo and merge migrations
|
2017-08-22 15:36:39 +02:00 |
|
|
|
470680e760
|
Add moderation for mailing lists
|
2017-08-22 15:36:39 +02:00 |
|
|
|
fe187dae38
|
Only begining of the mail is now needed
|
2017-08-22 15:36:39 +02:00 |
|
|
|
ce9e17ea24
|
Some mailing list fixs
|
2017-08-22 15:36:39 +02:00 |
|
|
|
9e5159152a
|
Little right fix
|
2017-08-22 15:36:39 +02:00 |
|
|
|
cc8991a938
|
Fix migration for mailing
|
2017-08-22 15:36:39 +02:00 |
|
|
|
51992e1c30
|
Mailing migration
|
2017-08-22 15:36:39 +02:00 |
|
|
|
72d968e9a5
|
Mailing migrations
|
2017-08-22 15:36:39 +02:00 |
|
|
|
76efb91e40
|
Move mailing list admin to com
|
2017-08-22 15:36:39 +02:00 |
|
|
|
69e997d587
|
Refactoring mailings
|
2017-08-22 15:36:39 +02:00 |
|
|
|
3a6f7009fd
|
Fix display rights in user profile for mailing
|
2017-08-22 15:36:39 +02:00 |
|
