klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-30 04:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,528 Commits 24 Branches 0 Tags 106 MiB
9b7b96a310
Commit Graph

1528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skia
47bace2057 Merge branch 'Tresorerie' into 'master' 
Enhanced display in journals

See merge request ae/Sith!123
 2017-10-09 17:21:37 +02:00
Skia
7c2e562c1e locale: fix translation 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-09 17:15:46 +02:00
Krophil
3104270675 Few changes in accounting design 2017-10-09 16:24:34 +02:00
Skia
43f51813e0 sas: fix album preview 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-06 17:57:54 +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
87abdf7e68 trombi: update export page again 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-06 17:29:23 +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
8a58055d06 trombi: update export page 
Signed-off-by: Skia <skia@libskia.so>
 2017-10-06 16:38:36 +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
Skia
e0517c5f4f Merge branch 'facebook-button' into 'master' 
Small fix for logo in news

See merge request ae/Sith!121
 2017-10-06 15:09:50 +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
Skia
0bef8d33d3 Merge branch 'clubs' into 'master' 
Club tools enhacement

See merge request ae/Sith!108
 2017-10-06 11:48:02 +02:00
klmp200
cec3ec8164
Club tools translations 2017-10-06 11:24:48 +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
4800db3c2c
Add auto generation for mailing lists 2017-10-06 11:09:31 +02:00
klmp200
4310441269
Redirect directly on member page when adding a new member. Still has a bug : an user already member always show when success 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
f4bc1b140c
Fix is_active migration 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
e2078a8c15
Sync club pages with club tree 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
Skia
13620de754 Merge branch 'facebook-button' into 'master' 
Enhanced news

See merge request ae/Sith!117
 2017-10-05 19:29:36 +02:00
Krophil
3089b484d3 Enhanced news 2017-10-02 14:29:36 +02:00
Sli
aab589b5d1 Merge branch 'fontawesome' into 'master' 
add font-awesome

See merge request ae/Sith!118
 2017-09-29 14:55:25 +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
7b48156259 locale: update translation 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-26 12:13:36 +02:00
Skia
cda89d66cd com: improve news page 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-26 12:13:23 +02:00
Skia
a2dc00f4e5 club: add club logo 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 20:13:35 +02:00
Skia
49b77480e6 sas: clean up old notif trigger 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 12:50:02 +02:00
Skia
144a56570b locale: update translations 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 12:40:39 +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
469304585c sas: update models managers 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 12:34:05 +02:00
Skia
3a16c7aab4 trombi: change comments format in export 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-25 11:08:20 +02:00
Skia
c7f5203122 trombi: add dpt/option to export 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-24 19:39:20 +02:00
Skia
d2fccdb09b Merge branch 'bugfix' into 'master' 
Small fix on news deletion

See merge request !115
 2017-09-18 19:46:54 +02:00
Krophil
56b5fa733b Small fixes on news 2017-09-18 16:28:11 +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
Krophil
a89109b4e8 Add translations and small fix 2017-09-17 15:04:30 +02:00
Sli
9318292ed8 Merge branch 'sli' into 'master' 
Logo for 18

See merge request !114
 2017-09-13 18:34:22 +02:00