klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 22:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,289 Commits 23 Branches 0 Tags 106 MiB
c071ed66bc
Commit Graph

594 Commits

Author SHA1 Message Date
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
Krophil
d888a6b68a Add Twitter button 2017-09-12 19:20:12 +02:00
Krophil
a40c48a792 Add facebook button 2017-09-12 19:04:37 +02:00
Krophil
2f912a197c Allow to subscribe before subscription end 2017-09-06 19:55:14 +02:00
Skia
0184b9c29b core, com: make permanent notifications for news to moderate 
This needs to be made for other stuff, like the SAS or the files...

Signed-off-by: Skia <skia@libskia.so>
 2017-09-06 13:17:23 +02:00
Skia
dd5926b404 core: fix notif ordering 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-06 13:05:51 +02:00
Skia
6456d18fc4 core, com: tool bar and agenda design updates 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-03 19:05:45 +02:00
Krophil
97cdf0e9d8 Link to old site updated 2017-09-03 18:04:05 +02:00
Skia
caa0c2099b core: fix notifications colors 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-03 12:01:52 +02:00
Skia
283e128e93 core: jQuery UI widget theme overrides 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-02 22:33:13 +02:00
Skia
f5abfc3c12 core: still some design improvements 
Signed-off-by: Skia <skia@libskia.so>
 2017-09-02 20:59:45 +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
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
Krophil
2bd1927e39 New Sponsors page 2017-08-31 14:11:18 +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
Sli
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
klmp200
b0ce8b1b83 Fix permission for club in user profile 2017-08-24 14:42:57 +02:00
Sli
8e166b75e4 Merge branch 'nintendo_switch' into 'master' 
Changing urls

See merge request !99
 2017-08-22 23:53:56 +02:00
Krophil
b74600b3f3 Changing urls 2017-08-22 23:47:55 +02:00
klmp200
4f6109e27c Refactor mailings email 2017-08-22 22:39:12 +02:00
klmp200
d179a0a6d0 Fix typo and merge migrations 2017-08-22 15:36:39 +02:00
klmp200
ce9e17ea24 Some mailing list fixs 2017-08-22 15:36:39 +02:00
klmp200
76efb91e40 Move mailing list admin to com 2017-08-22 15:36:39 +02:00
klmp200
3a6f7009fd Fix display rights in user profile for mailing 2017-08-22 15:36:39 +02:00
klmp200
9cb88a878d Even better mailing 2017-08-22 15:36:39 +02:00
klmp200
a9e23920ee Matmat renames 2017-08-15 18:05:07 +02:00
klmp200
9ff8f02a45 Form remember last entered values 2017-08-15 18:05:07 +02:00
klmp200
b7c382a1a8 Basic search structure 2017-08-15 18:05:07 +02:00
klmp200
748e3ae326 Refactor and migration corrections 2017-08-15 13:57:49 +02:00
klmp200
d60e14a303 Migration from old database 2017-08-15 13:57:49 +02:00
klmp200
40927fa13d Add limit for ecocup recording 2017-08-15 13:57:49 +02:00
klmp200
22407e2f85 Bottom links migrations to internal wiki 2017-08-15 03:30:39 +02:00
Skia
6f79c6c590 core: fix paragraph annoying scroll bar 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-09 22:02:41 +02:00
Skia
d3796479ee core: put the AE logo in the CSS 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-09 16:40:03 +02:00
Skia
61d2765510 core: refactor user picture page algorithm 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-02 20:12:41 +02:00
Skia
e4e4eae11b Merge branch 'subscriptions' into 'master' 
Some selected club members can now make people subscribe and fix major security …

Le bdf m'as demandé si c'était possible pour eux de faire des cotisations pour les nouveaux
Je retire WIP quand j'ai la confirmation du bureau que je peux faire ça
Par contre il j'y ai patché une grosse faille de sécurité : se mettre curieux à l'AE suffit à avoir tous les droits de board_member

See merge request !91
 2017-07-26 20:48:01 +02:00
klmp200
c56094eaaf Some selected club members can now make people subscribe and fix major security hole in board_member verification 2017-07-26 20:31:29 +02:00
Skia
b99bbc385a css: fix overflow problem 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-26 18:41:21 +02:00
Krophil
2ae4e36eea Add a nice favicon 2017-07-06 14:04:24 +02:00
Krophil
e7de8b2aec Format core 2017-06-13 10:04:13 +02:00
Skia
f26f2f4229 trombi: add custom club memberships 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 23:52:59 +02:00
Skia
5df9be9188 Move computing of start of semester to core/utils 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 22:53:25 +02:00
Skia
8ca455a398 Epic fix 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 22:35:22 +02:00
Skia
37a5db537b Re-fix AnonymousUser 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 14:01:28 +02:00
Skia
b06f270ea5 Revert "Fix AnonymousUser" 
This reverts commit e7f7c57558.
 2017-06-12 13:57:08 +02:00
Skia
b4be40a3a7 Change the Markdown super and sub texts not to break the Ragots 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-10 21:39:56 +02:00
Skia
58beb551e8 Fix unread messages in topic 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-10 21:05:36 +02:00
Skia
a89fb23d33 That's just a ridiculous little fix 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-10 20:03:37 +02:00