Commit Graph

2684 Commits

Author SHA1 Message Date
Sli
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
7bd44159de
core: update navbar and fix some translations 2019-04-28 16:21:00 +02:00
Sli
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
01803c8cf0
clubs: remove useless self.request_user into ClubMemberView 2019-04-25 19:51:30 +02:00
f72f0639ee
clubs: display a message instead of a table when no member in a club 2019-04-25 17:38:17 +02:00
68f61a432a
clubs: adapt tests to new display and fix form validation issue for start_date 2019-04-25 17:31:42 +02:00
3eb3565a63
clubs: nice display of bulk mark as old 2019-04-25 16:36:20 +02:00
75328de5ca
clubs: fix membership form and add bulk mark as old tests 2019-04-25 15:40:49 +02:00
6964692556
clubs: basic bulk mark as old 2019-04-24 18:17:03 +02:00
80f1f9699c
clubs: move Membership form validation outside of model and fix and add tests 2019-04-24 17:12:20 +02:00
d5ad2c5141
clubs: Handle bulk add of users in clubs and refresh of the form handling 2019-04-24 03:10:42 +02:00
Sli
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
cf5fc1fecf
Group: fix typo 2019-04-23 20:47:19 +02:00
2ae10ee2fb
core: add macro that selects/unselect all checkbox 2019-04-22 22:55:55 +02:00
96e33815f5
Group: simplify GroupTemplateView and better group display 2019-04-22 22:55:55 +02:00
c3b88aaeb4
Group: fix typo 2019-04-22 22:55:55 +02:00
3d344b483d
Group: improve group list display 2019-04-22 22:55:55 +02:00
ee89327742
Group: add translations 2019-04-22 22:55:55 +02:00
b693ee32f2
Group: add a label on users to delete 2019-04-22 22:55:54 +02:00
08d03087a4
core: create a DetailFormView 2019-04-22 22:55:54 +02:00
34459f83ec
Group: Groups: allow bulk removing of users from a group 2019-04-22 22:55:54 +02:00
5cc0760e2c
Groups: allow bulk import of users on a group 2019-04-22 22:55:54 +02:00
f6553a8f52
Group management enhacement 2019-04-22 22:55:53 +02:00
Sli
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
00259a0e31
Add mappings for .po and .jinja files 2019-04-22 18:20:22 +02:00
Sli
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
Sli
d1f3fb2a15 Merge branch 'contribution-instructions' into 'master'
README : update instructions

See merge request ae/Sith!191
2019-04-20 02:47:57 +02:00
6943d29857
README: fix typo in CONTRIBUTING and move dependencies before Get started instructions 2019-04-06 20:12:47 +02:00
46db8b391a
rootplace: make code clearer and fix typos 2019-03-19 17:23:02 +01:00
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
Sli
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
2ee50c0fbd
rootplace: add tool to delete all forum messages from a specified user 2019-03-17 18:07:57 +01:00
Sli
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
Skia
03eeffdea0 eboutic: check basket amount upon command validation 2019-03-15 02:17:36 +01:00
e3432794f5
README : update instructions 2019-03-14 11:07:55 +01:00
Sli
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
18f464a49f small fix to follow python recommendations 2019-02-02 00:32:34 +01:00
Sli
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
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
Skia
3898a13b25 Merge branch 'makdown-editor' into 'master'
Add a nice markdown editor

See merge request ae/Sith!184
2018-12-20 17:11:43 +01:00
3dda8eafc4 elections: use MarkdownInput for CandidateForm 2018-12-20 16:43:59 +01:00
dc800b59f4 com: use MarkdownInput for alert_msg, info_msg and index_page editing 2018-12-20 15:13:59 +01:00
24dd258d0a com: use MarkdownInput on news 2018-12-20 15:09:44 +01:00
d2021ecf7e com: use MarkdownInput for weekmail 2018-12-20 15:06:20 +01:00
d53d725415 core: fix validation error on generic create view with MarkdownInput 2018-12-20 15:03:41 +01:00
f6ab993b8d wiki: remove old markdown preview 2018-12-20 14:32:52 +01:00
bae45bcd38 forum: remove old markdown preview 2018-12-20 14:27:55 +01:00
fdfe33dedc core: remove old markdown editor 2018-12-20 14:20:58 +01:00
8111ae107a core: move centralized custom scripts on top of base.jinja and move getCookie inside 2018-12-20 14:15:57 +01:00
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