klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-25 19:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,874 Commits 23 Branches 0 Tags
43207455b83411e1b498def2822717b873e4c06f
Commit Graph

1247 Commits

Author SHA1 Message Date
klmp200
72d2862e3e Posters now working + notifications for com admin 2017-12-16 20:48:36 +01:00
Krophil
d2c278ba0e Revert "Merge branch 'pere200' into 'master'" 
This reverts merge request !138
 2017-12-12 13:01:09 +01:00
Krophil
93f430ac38 PERE 200 2017-12-11 05:11:23 +01:00
klmp200
d49f7858d3 Better ui for group selection on election and wiki 2017-12-10 21:37:50 +01:00
klmp200
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
klmp200
625b5132c4 Election list deletion and ux improvements 2017-12-01 19:45:28 +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
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
64c479a02e Merge branch 'bugfix' into 'master' 
Bugfix

See merge request ae/Sith!132
 2017-11-16 15:43:54 +01:00
Krophil
33964e0bab Better way to check if a user is subscriber 2017-11-16 13:50:34 +01:00
klmp200
eb485215d9 Fix translations error for gifts 2017-11-13 18:30:05 +01:00
Krophil
0ba69da3b6 Fix AGAIN subscription display 2017-11-09 14:49:07 +01:00
klmp200
e3fd3b81ab Add gift function 2017-11-06 00:30:37 +01:00
Krophil
f1a9344524 Fix external ressources 2017-11-05 13:27:58 +01:00
Krophil
2bb510932b Fix date displaying in user_detail 2017-10-24 13:08:18 +02:00
Krophil
6c957e3ce4 Integrate external_res variable 2017-10-18 14:44:47 +02:00
Skia
d5c6695f80 core: improve notification callback system 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-15 12:00:33 +02:00
Skia
9b0b381fa3 core: make populate command more predictable (should fix the random failing test) 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-14 13:51:50 +02:00
Skia
69c7036089 Merge branch 'krophil' into 'master' 
Add search form in admin

See merge request ae/Sith!124
 2017-10-12 09:29:02 +02:00
Skia
7879b6dd6b core: add family graphs 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-11 12:30:33 +02:00
Krophil
3994a58a2f Add search form in admin 2017-10-11 00:01:24 +02:00
Krophil
3104270675 Few changes in accounting design 2017-10-09 16:24:34 +02:00
Sli
8492903a39 Merge branch 'clubs' into 'master' 
Found a way to avoid strange error for club page

See merge request ae/Sith!122
 2017-10-06 17:50:59 +02:00
klmp200
4369d9f593 Found a way to avoid strange error for club page 2017-10-06 17:44:41 +02:00
Skia
a09c634ac6 core: add phonenumber template filter 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-06 17:28:51 +02:00
Skia
fae2a572b1 Merge branch 'fontawesome' into 'master' 
Few changes in design

See merge request ae/Sith!119
 2017-10-06 15:30:30 +02:00
Krophil
be958bca7e Small fix for logo in news 2017-10-06 12:00:12 +02:00
Krophil
c8c60b8b7d Few changes in design 2017-10-06 11:58:51 +02:00
klmp200
30f7835cef Operations documentation 2017-10-06 11:09:31 +02:00
klmp200
8146186447 Fix some bugs in mailings with new club tools 2017-10-06 11:09:31 +02:00
klmp200
baa7be69e4 Better integration of wiki pages on clubs 2017-10-06 11:09:31 +02:00
klmp200
2c1cf2d7af Fix for club tools 2017-10-06 11:09:31 +02:00
klmp200
4026d076b3 Forgoten migration from skia and fixed migration 2017-10-06 11:09:30 +02:00
klmp200
db509bf060 Nice club presentation 2017-10-06 11:09:30 +02:00
klmp200
790d723d08 Fix page creation method for clubs 2017-10-06 11:09:30 +02:00
klmp200
12c49b285a Fix page permissions and fix migration when on sqlite backend 2017-10-06 11:09:30 +02:00
klmp200
aa49b2d4ce Fix regex for pages 2017-10-06 11:09:30 +02:00
klmp200
939146bddd Sync pages with club unix_name 2017-10-06 11:09:29 +02:00
klmp200
fe69cbcee1 Add page for clubs and inactive clubs 2017-10-06 11:09:29 +02:00
Krophil
3089b484d3 Enhanced news 2017-10-02 14:29:36 +02:00
Krophil
acbeb3d3c8 add font-awesome 2017-09-29 14:35:06 +02:00
Skia
13a2cc22dd core: fix some CSS 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-26 14:05:19 +02:00
Skia
b87990e3db com: add birthdays block 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-26 13:45:40 +02:00
Skia
cda89d66cd com: improve news page 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-26 12:13:23 +02:00
Skia
f0c34fe70c sas: add permanent notification for SAS moderation 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 12:35:56 +02:00
Skia
3e769195e3 Merge branch 'facebook-button' into 'master' 
Add facebook button

See merge request !112
 2017-09-17 15:18:07 +02:00
klmp200
b1c3ea9e2c Logo for 18 2017-09-13 18:28:18 +02:00