klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2026-07-21 14:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,246 Commits 19 Branches 0 Tags
0581c667de6131e0810badad66852e2e573911a9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
klmp200 0581c667de Club: blackify view file 2018-10-05 21:51:54 +02:00
klmp200 88d6f8dc8a CI: introduce black 2018-10-05 21:48:26 +02:00
klmp200 5a6c7aaadf clubs: un champ plus joli pour la short_description, crack vas être content 2018-10-04 00:15:47 +02:00
klmp200 bef10c0fe3 Merge branch 'sli' into 'master' 
Add subscription for 2018 Euroks

See merge request ae/Sith!155
 2018-07-07 00:19:22 +02:00
klmp200 e3cb6d41f9 Add subscription for 2018 Euroks 2018-07-07 00:13:31 +02:00
klmp200 b2abc78694 Merge branch 'new_django' into 'master' 
Fix subscription bug for old subscribers on subscription page

See merge request ae/Sith!153
 2018-06-12 15:07:09 +02:00
klmp200 f1e8d55b41 Fix subscription bug for old subscribers on subscription page 2018-06-12 15:00:51 +02:00
klmp200 7322882002 Merge branch 'new_django' into 'master' 
Fix user pictures display

See merge request ae/Sith!152
 2018-06-10 18:49:44 +02:00
klmp200 5c4a16d14c Fix user pictures display 2018-06-10 18:43:39 +02:00
klmp200 1cfc4f8092 Merge branch 'new_django' into 'master' 
Migration to django 1.11

See merge request ae/Sith!146
 2018-06-10 16:37:57 +02:00
klmp200 08de5dfe6a Migration to django 1.11 2018-06-10 16:31:58 +02:00
klmp200 39119f586a Merge branch 'sli' into 'master' 
Image promo 19 et demande du bdf

See merge request ae/Sith!151
 2018-06-10 16:16:37 +02:00
klmp200 a0a86ef8e1 Allow BDF's members to see subscriptions on users 2018-06-10 16:09:21 +02:00
klmp200 90e1e7c1bb Add promo logo 2018-06-10 16:09:04 +02:00
klmp200 c5be9b5597 Add promo 19's logo 2018-06-10 15:49:53 +02:00
klmp200 01240ce75e Merge branch 'bugfix' into 'master' 
Small modification in hope to fix communication screen deformations

See merge request ae/Sith!150
 2018-04-29 14:12:22 +02:00
klmp200 83f38e617b Forum Form optimisation 2018-04-26 19:38:39 +02:00
klmp200 443616a762 Forum permission fix and form display 2018-04-26 15:20:45 +02:00
klmp200 afa9bd8735 Fix Poster form 2018-04-26 14:48:29 +02:00
klmp200 41c83b17df Merge branch 'nabos' into 'master' 
Changed default display time for posters and permissions on it

See merge request ae/Sith!142
 2018-03-18 22:45:11 +01:00
klmp200 cbd333eb47 Changed default display time for posters and permissions on it 2018-03-18 22:28:25 +01:00
klmp200 80bffd00d1 Merge branch 'bugfix' into 'master' 
Bugfix for mailing list and posters

See merge request ae/Sith!141
 2017-12-22 12:59:51 +01:00
klmp200 43b4579a98 Fix datetime forms for posters 2017-12-22 12:53:43 +01:00
klmp200 c014a6e379 Fix translations 2017-12-22 12:22:37 +01:00
klmp200 b7483513be Fix for mailing lists 2017-12-22 12:06:23 +01:00
klmp200 72d2862e3e Posters now working + notifications for com admin 2017-12-16 20:48:36 +01:00
klmp200 5132eb49e4 Merge branch 'elections' into 'master' 
It's better to delete an object in delete

See merge request ae/Sith!140
 2017-12-12 14:58:02 +01:00
klmp200 5915de9603 It's better to delete an object in delete 2017-12-12 14:52:08 +01:00
klmp200 6335d60ad6 Merge branch 'quickux' into 'master' 
Better ui for group selection on election and wiki

See merge request ae/Sith!137
 2017-12-10 21:43:54 +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
klmp200 c8fae39ff0 Merge branch 'elections' into 'master' 
Avoid moving role order in election by reloading page

See merge request ae/Sith!136
 2017-12-05 14:30:52 +01:00
klmp200 4217b92941 Avoid moving role order in election by reloading page 2017-12-05 14:22:59 +01:00
klmp200 bc7cfc2dba Merge branch 'elections' into 'master' 
Election improvements

See merge request ae/Sith!135
 2017-12-04 13:36:25 +01:00
klmp200 2f3b481037 Improve deletion and add ordering on roles 2017-12-02 19:05:48 +01:00
klmp200 625b5132c4 Election list deletion and ux improvements 2017-12-01 19:45:28 +01:00
klmp200 42f8ee3518 Merge branch 'teeshirt' into 'master' 
Fix translations error for gifts

See merge request ae/Sith!131
 2017-11-14 10:23:32 +01:00
klmp200 eb485215d9 Fix translations error for gifts 2017-11-13 18:30:05 +01:00
klmp200 c6847ebc47 Translations for gifts 2017-11-06 00:44:18 +01:00
klmp200 e3fd3b81ab Add gift function 2017-11-06 00:30:37 +01:00
klmp200 9ab7cb98dc Merge branch 'bugfix' into 'master' 
Fix external ressources

See merge request ae/Sith!128
 2017-11-05 23:31:29 +01:00
klmp200 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
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
klmp200 aab589b5d1 Merge branch 'fontawesome' into 'master' 
add font-awesome

See merge request ae/Sith!118
 2017-09-29 14:55:25 +02:00
klmp200 9318292ed8 Merge branch 'sli' into 'master' 
Logo for 18

See merge request !114
 2017-09-13 18:34:22 +02:00
klmp200 b1c3ea9e2c Logo for 18 2017-09-13 18:28:18 +02:00
klmp200 6d09a9e9b0 Merge branch 'krophil' into 'master' 
Oups, I did it again...

See merge request !106
 2017-09-02 15:39:01 +02:00
klmp200 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
klmp200 bb40d48b62 Merge branch 'nintendo_switch' into 'master' 
New Sponsors page

See merge request !104
 2017-08-31 14:19:05 +02:00
klmp200 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
klmp200 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
klmp200 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
klmp200 f65f261cfd mailing: Fix error when deleting user from mailing when only email provided 2017-08-24 00:20:20 +02:00
klmp200 6f6ad123af Allow disabling CB in crisis time 2017-08-24 00:14:36 +02:00
klmp200 8e166b75e4 Merge branch 'nintendo_switch' into 'master' 
Changing urls

See merge request !99
 2017-08-22 23:53:56 +02:00
klmp200 4f6109e27c Refactor mailings email 2017-08-22 22:39:12 +02:00
klmp200 c83a990165 Wtf migration blocking me 2017-08-22 16:03:24 +02:00
klmp200 62b59f92fd Translations 2017-08-22 15:51:09 +02:00
klmp200 d179a0a6d0 Fix typo and merge migrations 2017-08-22 15:36:39 +02:00
klmp200 470680e760 Add moderation for mailing lists 2017-08-22 15:36:39 +02:00
klmp200 fe187dae38 Only begining of the mail is now needed 2017-08-22 15:36:39 +02:00
klmp200 ce9e17ea24 Some mailing list fixs 2017-08-22 15:36:39 +02:00
klmp200 9e5159152a Little right fix 2017-08-22 15:36:39 +02:00
klmp200 cc8991a938 Fix migration for mailing 2017-08-22 15:36:39 +02:00
klmp200 51992e1c30 Mailing migration 2017-08-22 15:36:39 +02:00
klmp200 72d968e9a5 Mailing migrations 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 69e997d587 Refactoring mailings 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 e82e338e76 Fix mailing settings position 2017-08-22 15:36:39 +02:00
klmp200 8c9f02a142 Add fetch function for DSI 2017-08-22 15:36:39 +02:00
klmp200 9cb88a878d Even better mailing 2017-08-22 15:36:39 +02:00
klmp200 feaf6b73b7 Begin mailing list system 2017-08-22 15:36:39 +02:00
klmp200 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
klmp200 6cfdcb093f Wtf forgot this little guy 2017-08-17 00:10:12 +02:00
klmp200 d864c00472 Merge branch 'matmatronch' into 'master' 
Translations fix for matmatronch

See merge request !94
 2017-08-15 19:11:12 +02:00
klmp200 f49f889d5b Translations fix 2017-08-15 18:57:50 +02:00
klmp200 0f408d9d89 Translations 2017-08-15 18:08:32 +02:00
klmp200 a9e23920ee Matmat renames 2017-08-15 18:05:07 +02:00
klmp200 dc571836ae Fixed issues with department and sex form 2017-08-15 18:05:07 +02:00
klmp200 86d62f12e7 Fully functionnal Matmatronch 2017-08-15 18:05:07 +02:00
klmp200 349475cd37 Functionnal search engine 2017-08-15 18:05:07 +02:00
klmp200 39616874a8 Fix broken pagination by remembering last search 2017-08-15 18:05:07 +02:00