klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2026-07-21 05:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,417 Commits 18 Branches 0 Tags
1f3220246a87ec2d75a2834d173830056ce21771
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
klmp200 1f3220246a counter: fix a bug where you can't register UID card with only number inside 2019-05-24 08:38:15 +02:00
klmp200 0f832a2774 Merge branch 'nfc_card' into 'master' 
Can identify user on counter with student card UID

See merge request ae/Sith!172
 2019-05-23 19:49:45 +02:00
klmp200 b4c24ee997 Merge branch 'bugfix' into 'master' 
counter: fix SellingFormBase import

See merge request ae/Sith!205
 2019-05-21 11:08:07 +02:00
klmp200 275b89cdf0 club: fix SellingFormBase import 2019-05-21 10:53:18 +02:00
klmp200 3bddf176d8 Fix typo for NFC cards 2019-05-20 19:12:53 +02:00
klmp200 19e353970d Enforce uid with uppercase for Studentcard and test more edge cases 2019-05-20 17:56:14 +02:00
klmp200 5ae7d10e84 Add unit tests for student cards and fix edge cases 2019-05-20 17:56:09 +02:00
klmp200 e1ffdbe3f9 Translations on student card feature 2019-05-20 17:55:58 +02:00
klmp200 0ba0df0f29 Better handling of user rights for studentcards 2019-05-20 17:52:44 +02:00
klmp200 616b7ccfc8 Nice user interface and permission rework 2019-05-20 17:52:39 +02:00
klmp200 4669e5a4e9 Gui for studentcards in counters 2019-05-20 17:52:36 +02:00
klmp200 14d9fc04d1 Stronger bdd validation for studentcards 2019-05-20 17:52:33 +02:00
klmp200 577ad07a2b Can identify user on counter with student card UID 2019-05-20 17:52:29 +02:00
klmp200 9f2a0deeb9 Merge branch 'mailing' into 'master' 
Enhance mailing list edition for clubs with brand new form

See merge request ae/Sith!200
 2019-05-20 17:39:43 +02:00
klmp200 c26d1c423e Merge branch 'markdown-editor' into 'master' 
Remove external resources once for all

See merge request ae/Sith!204
 2019-05-18 03:41:35 +02:00
klmp200 e8f742b9f9 core: remove external resources once for all 2019-05-18 03:00:19 +02:00
klmp200 8ebf5af3d6 Merge branch 'markdown-editor' into 'master' 
core: replace simplemde with easymde

See merge request ae/Sith!202
 2019-05-18 02:49:36 +02:00
klmp200 827ec63ab3 Merge branch 'search' into 'master' 
core: fix error 500 on user and forum search

See merge request ae/Sith!201
 2019-05-10 11:06:13 +02:00
klmp200 81d470b977 clubs: add tests for MalingForm 2019-05-09 20:32:48 +02:00
klmp200 654099067e clubs: tests for adding mailings 2019-05-09 20:32:26 +02:00
klmp200 d1fb9cc4c3 clubs: remove moderator and club from mailing form + display not moderated mailings 2019-05-09 17:43:47 +02:00
klmp200 1d07195881 clubs: add bulk deletion on mailing lists 2019-05-01 22:54:18 +02:00
klmp200 24fb714c5e clubs: set club_id and user_id as mandatory arguments for MailingForm 2019-05-01 18:59:41 +02:00
klmp200 da25480993 clubs: use standard rights for ClubMailingView 2019-05-01 15:50:03 +02:00
klmp200 a0e39b8904 clubs: rewrite MailingForm to include everything in one place 
Everything is handled on the same view, no more redirection hacks

Remove get_context_data in DetailFormView since it's already done by django
 2019-05-01 15:49:30 +02:00
klmp200 cfd4955672 clubs: clean up imports and move forms to external file 2019-05-01 03:32:55 +02:00
klmp200 a12edcda15 Merge branch 'navbar' into 'master' 
Fix footer block

See merge request ae/Sith!199
 2019-04-30 19:40:50 +02:00
klmp200 9e8f633037 core: fix footer block 2019-04-30 18:47:59 +02:00
klmp200 de680f032c Merge branch 'navbar' into 'master' 
Update navbar with new links, remove old ones and fix translations

See merge request ae/Sith!198
 2019-04-29 12:16:38 +02:00
klmp200 7bd44159de core: update navbar and fix some translations 2019-04-28 16:21:00 +02:00
klmp200 142299c0cd Merge branch 'clubs' into 'master' 
Améliore la gestion de membres de clubs

See merge request ae/Sith!196
 2019-04-26 18:19:05 +02:00
klmp200 01803c8cf0 clubs: remove useless self.request_user into ClubMemberView 2019-04-25 19:51:30 +02:00
klmp200 f72f0639ee clubs: display a message instead of a table when no member in a club 2019-04-25 17:38:17 +02:00
klmp200 68f61a432a clubs: adapt tests to new display and fix form validation issue for start_date 2019-04-25 17:31:42 +02:00
klmp200 3eb3565a63 clubs: nice display of bulk mark as old 2019-04-25 16:36:20 +02:00
klmp200 75328de5ca clubs: fix membership form and add bulk mark as old tests 2019-04-25 15:40:49 +02:00
klmp200 6964692556 clubs: basic bulk mark as old 2019-04-24 18:17:03 +02:00
klmp200 80f1f9699c clubs: move Membership form validation outside of model and fix and add tests 2019-04-24 17:12:20 +02:00
klmp200 d5ad2c5141 clubs: Handle bulk add of users in clubs and refresh of the form handling 2019-04-24 03:10:42 +02:00
klmp200 e8ee9122f9 Merge branch 'admin' into 'master' 
Amélioration de l'administration des groupes

See merge request ae/Sith!148
 2019-04-23 23:06:39 +02:00
klmp200 cf5fc1fecf Group: fix typo 2019-04-23 20:47:19 +02:00
klmp200 2ae10ee2fb core: add macro that selects/unselect all checkbox 2019-04-22 22:55:55 +02:00
klmp200 96e33815f5 Group: simplify GroupTemplateView and better group display 2019-04-22 22:55:55 +02:00
klmp200 c3b88aaeb4 Group: fix typo 2019-04-22 22:55:55 +02:00
klmp200 3d344b483d Group: improve group list display 2019-04-22 22:55:55 +02:00
klmp200 ee89327742 Group: add translations 2019-04-22 22:55:55 +02:00
klmp200 b693ee32f2 Group: add a label on users to delete 2019-04-22 22:55:54 +02:00
klmp200 08d03087a4 core: create a DetailFormView 2019-04-22 22:55:54 +02:00
klmp200 34459f83ec Group: Groups: allow bulk removing of users from a group 2019-04-22 22:55:54 +02:00
klmp200 5cc0760e2c Groups: allow bulk import of users on a group 2019-04-22 22:55:54 +02:00
klmp200 f6553a8f52 Group management enhacement 2019-04-22 22:55:53 +02:00
klmp200 a6f76f5279 Merge branch 'gitattributes' into 'master' 
Configure GitLab to have a correct collor highlighting on jinja files and on po files

See merge request ae/Sith!195
 2019-04-22 18:48:22 +02:00
klmp200 00259a0e31 Add mappings for .po and .jinja files 2019-04-22 18:20:22 +02:00
klmp200 bdd2fda024 Merge branch 'rootplace' into 'master' 
rootplace: create a cli utility to delete user's forum message to avoid connection timeout error

See merge request ae/Sith!194
 2019-04-22 17:36:56 +02:00
klmp200 d1f3fb2a15 Merge branch 'contribution-instructions' into 'master' 
README : update instructions

See merge request ae/Sith!191
 2019-04-20 02:47:57 +02:00
klmp200 6943d29857 README: fix typo in CONTRIBUTING and move dependencies before Get started instructions 2019-04-06 20:12:47 +02:00
klmp200 46db8b391a rootplace: make code clearer and fix typos 2019-03-19 17:23:02 +01:00
klmp200 f9d4f41b7c rootplace: create a cli utility to delete user's forum message to avoid connection timeout error 2019-03-18 20:52:35 +01:00
klmp200 6a586020f1 Merge branch 'rootplace' into 'master' 
rootplace: add tool to delete all forum messages from a specified user

See merge request ae/Sith!193
 2019-03-18 10:21:01 +01:00
klmp200 2ee50c0fbd rootplace: add tool to delete all forum messages from a specified user 2019-03-17 18:07:57 +01:00
klmp200 2480644f1c Merge branch 'eboutic_check_basket_amount' into 'master' 
eboutic: check basket amount upon command validation

See merge request ae/Sith!192
 2019-03-15 12:18:05 +01:00
klmp200 e3432794f5 README : update instructions 2019-03-14 11:07:55 +01:00
klmp200 d56990b91f Merge branch 'fix/better_str_comparison' into 'master' 
small fix to follow python recommendations

See merge request ae/Sith!190
 2019-02-04 00:10:02 +01:00
klmp200 0f7f80e9d3 Merge branch 'makdown-editor' into 'master' 
Workaround for crsf token in production for MarkdownInput

See merge request ae/Sith!189
 2018-12-20 18:36:05 +01:00
klmp200 d2c5908c89 core: workaround for crsf token in production for MarkdownInput 
See https://docs.djangoproject.com/en/2.0/ref/csrf/#acquiring-the-token-if-csrf-use-sessions-is-true
 2018-12-20 18:19:50 +01:00
klmp200 3dda8eafc4 elections: use MarkdownInput for CandidateForm 2018-12-20 16:43:59 +01:00
klmp200 dc800b59f4 com: use MarkdownInput for alert_msg, info_msg and index_page editing 2018-12-20 15:13:59 +01:00
klmp200 24dd258d0a com: use MarkdownInput on news 2018-12-20 15:09:44 +01:00
klmp200 d2021ecf7e com: use MarkdownInput for weekmail 2018-12-20 15:06:20 +01:00
klmp200 d53d725415 core: fix validation error on generic create view with MarkdownInput 2018-12-20 15:03:41 +01:00
klmp200 f6ab993b8d wiki: remove old markdown preview 2018-12-20 14:32:52 +01:00
klmp200 bae45bcd38 forum: remove old markdown preview 2018-12-20 14:27:55 +01:00
klmp200 fdfe33dedc core: remove old markdown editor 2018-12-20 14:20:58 +01:00
klmp200 8111ae107a core: move centralized custom scripts on top of base.jinja and move getCookie inside 2018-12-20 14:15:57 +01:00
klmp200 97b06b160b core: add delay on live preview for MarkdownInput to avoid making too much request to the API 2018-12-20 14:06:30 +01:00
klmp200 19c1361e47 core: fix heading in MarkdownInput 2018-12-19 14:10:39 +01:00
klmp200 542a2ede32 core: translations for MarkdownInupt 2018-12-19 14:02:45 +01:00
klmp200 ea538dbab3 core: handle all basic editing actions in MarkdownInput 2018-12-19 12:25:59 +01:00
klmp200 d0771f3e2a Merge branch 'contribution-instructions' into 'master' 
Fix contributing and readme

See merge request ae/Sith!186
 2018-12-19 00:03:04 +01:00
klmp200 80248ec8d3 Merge branch 'patch/targets' into 'master' 
Avoid error 500 when target is forgotten

See merge request ae/Sith!187
 2018-12-19 00:02:25 +01:00
klmp200 27500a7820 Fix contributing and readme 2018-12-18 23:16:39 +01:00
klmp200 55ff492ec8 core: edit buttons on MarkdownInupt 2018-12-18 14:39:05 +01:00
klmp200 3b08603635 core: avoid inserting automatic whitespace in MarkdownInput 2018-12-18 14:13:15 +01:00
klmp200 4d866843e1 core: move jquery to header section 2018-12-18 13:54:53 +01:00
klmp200 4afd7a0023 core: avoid blinking in MarkdownInput preview 2018-12-14 18:02:01 +01:00
klmp200 d6f08d3706 core: use pure js to get cookie in markdown input 2018-12-14 17:53:25 +01:00
klmp200 775f456c40 core: introduce new markdown input 
To fix
* Avoid blinking in preview
* Don't insert stupid space on empty textarea
 2018-12-14 16:24:11 +01:00
klmp200andSkia af3e2fb951 forum: use generic macro to display breadcrumb and display it on search result 2018-12-13 20:33:34 +01:00
klmp200andSkia 84811af9f1 forum: fix translation when no search result found 2018-12-13 20:33:34 +01:00
klmp200andSkia 82ffd75372 forum: fix typo in search bar checkbox class name 2018-12-13 20:33:34 +01:00
klmp200andSkia 068a80519c forum: fix order by date 2018-12-13 20:33:34 +01:00
klmp200andSkia fc7e45190d forum: use pure jinja for search bar 2018-12-13 20:33:34 +01:00
klmp200andSkia 6891174935 forum: implement order by date for search 2018-12-13 20:33:34 +01:00
klmp200andSkia 721b22a1e9 forum: improve search bar UX behavior 2018-12-13 20:33:34 +01:00
klmp200andSkia e421a2b4cd forum: increase search speed by optimizing permission filter 2018-12-13 20:33:34 +01:00
klmp200andSkia 57454bffa0 forum: workaround size error while building index, handle malformed utf8 2018-12-13 20:33:34 +01:00
klmp200andSkia 641d564ec6 forum: add trigger to update index on ForumMessage update 2018-12-13 20:33:34 +01:00
klmp200andSkia ee99ec1aed forum: workaround for building index with safety margin 2018-12-13 20:33:34 +01:00
klmp200andSkia 269242601a forum: workaround for error while indexing badly encoded text (legacy) 2018-12-13 20:33:34 +01:00
klmp200andSkia 545671bec3 forum: workaround for building index 2018-12-13 20:33:34 +01:00