|
|
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 |
|
|
|
e82e338e76
|
Fix mailing settings position
|
2017-08-22 15:36:39 +02:00 |
|
|
|
8c9f02a142
|
Add fetch function for DSI
|
2017-08-22 15:36:39 +02:00 |
|
|
|
9cb88a878d
|
Even better mailing
|
2017-08-22 15:36:39 +02:00 |
|
|
|
feaf6b73b7
|
Begin mailing list system
|
2017-08-22 15:36:39 +02:00 |
|
|
|
df42617cda
|
Merge branch 'krophil' into 'master'
Add a new subscription for the Welcome Week
See merge request !97
|
2017-08-21 21:34:20 +02:00 |
|
|
|
e785ad985f
|
Add a new subscription for the Welcome Week
|
2017-08-21 21:06:05 +02:00 |
|
Skia
|
d511bdef03
|
Merge branch 'consignes' into 'master'
Wtf forgot this little guy
See merge request !95
|
2017-08-17 11:51:43 +02:00 |
|
|
|
6cfdcb093f
|
Wtf forgot this little guy
|
2017-08-17 00:10:12 +02:00 |
|
Skia
|
83b00450eb
|
com: improve news admin view
Signed-off-by: Skia <skia@libskia.so>
|
2017-08-16 15:37:35 +02:00 |
|
|
|
d864c00472
|
Merge branch 'matmatronch' into 'master'
Translations fix for matmatronch
See merge request !94
|
2017-08-15 19:11:12 +02:00 |
|
|
|
f49f889d5b
|
Translations fix
|
2017-08-15 18:57:50 +02:00 |
|
Skia
|
b5599db9bf
|
Merge branch 'matmatronch' into 'master'
Nouveau matmatronch
See merge request !92
|
2017-08-15 18:13:11 +02:00 |
|
|
|
0f408d9d89
|
Translations
|
2017-08-15 18:08:32 +02:00 |
|
|
|
a9e23920ee
|
Matmat renames
|
2017-08-15 18:05:07 +02:00 |
|
|
|
dc571836ae
|
Fixed issues with department and sex form
|
2017-08-15 18:05:07 +02:00 |
|
|
|
86d62f12e7
|
Fully functionnal Matmatronch
|
2017-08-15 18:05:07 +02:00 |
|
|
|
349475cd37
|
Functionnal search engine
|
2017-08-15 18:05:07 +02:00 |
|
|
|
39616874a8
|
Fix broken pagination by remembering last search
|
2017-08-15 18:05:07 +02:00 |
|
|
|
9ff8f02a45
|
Form remember last entered values
|
2017-08-15 18:05:07 +02:00 |
|
|
|
b7c382a1a8
|
Basic search structure
|
2017-08-15 18:05:07 +02:00 |
|
Skia
|
0ffd7485e3
|
Merge branch 'consignes' into 'master'
Add limit for ecocup recording
See merge request !90
|
2017-08-15 18:03:51 +02:00 |
|
|
|
3e950e1dd1
|
Migration fix
|
2017-08-15 17:37:25 +02:00 |
|
|
|
de4521c192
|
Ecocup limit comments
|
2017-08-15 14:03:56 +02:00 |
|
|
|
748e3ae326
|
Refactor and migration corrections
|
2017-08-15 13:57:49 +02:00 |
|
|
|
240b68f98d
|
Allow negative amount for customer
|
2017-08-15 13:57:49 +02:00 |
|
|
|
d60e14a303
|
Migration from old database
|
2017-08-15 13:57:49 +02:00 |
|
|
|
7588cc8f73
|
Hardcoding ecocup values
|
2017-08-15 13:57:49 +02:00 |
|
