klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-26 08:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,395 Commits 22 Branches 0 Tags 111 MiB
c26d1c423e
Commit Graph

1395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sli
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
Bartuccio Antoine
e8f742b9f9
core: remove external resources once for all 2019-05-18 03:00:19 +02:00
Sli
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
Cyl
a4ed535b34 core: optimisation and take off the auto-download of Font Awesome 2019-05-10 15:49:20 +02:00
Sli
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
Cyl
355a51d2ce core: fix special caracter in user and forum search 2019-05-09 19:51:55 +02:00
Cyl
3548c3e7c4 change fontAwesome from extra to intra reading 2019-05-09 19:06:35 +02:00
Cyl
ad6f17d309 core: replace simplemde with easymde 2019-05-06 20:42:35 +02:00
Cyl
bf06aea680 core: fix whitespaces in user and forum search 2019-05-06 20:11:49 +02:00
Sli
a12edcda15 Merge branch 'navbar' into 'master' 
Fix footer block

See merge request ae/Sith!199
 2019-04-30 19:40:50 +02:00
Bartuccio Antoine
9e8f633037
core: fix footer block 2019-04-30 18:47:59 +02:00
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
Bartuccio Antoine
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
Bartuccio Antoine
01803c8cf0
clubs: remove useless self.request_user into ClubMemberView 2019-04-25 19:51:30 +02:00
Bartuccio Antoine
f72f0639ee
clubs: display a message instead of a table when no member in a club 2019-04-25 17:38:17 +02:00
Bartuccio Antoine
68f61a432a
clubs: adapt tests to new display and fix form validation issue for start_date 2019-04-25 17:31:42 +02:00
Bartuccio Antoine
3eb3565a63
clubs: nice display of bulk mark as old 2019-04-25 16:36:20 +02:00
Bartuccio Antoine
75328de5ca
clubs: fix membership form and add bulk mark as old tests 2019-04-25 15:40:49 +02:00
Bartuccio Antoine
6964692556
clubs: basic bulk mark as old 2019-04-24 18:17:03 +02:00
Bartuccio Antoine
80f1f9699c
clubs: move Membership form validation outside of model and fix and add tests 2019-04-24 17:12:20 +02:00
Bartuccio Antoine
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
Bartuccio Antoine
cf5fc1fecf
Group: fix typo 2019-04-23 20:47:19 +02:00
Bartuccio Antoine
2ae10ee2fb
core: add macro that selects/unselect all checkbox 2019-04-22 22:55:55 +02:00
Bartuccio Antoine
96e33815f5
Group: simplify GroupTemplateView and better group display 2019-04-22 22:55:55 +02:00
Bartuccio Antoine
c3b88aaeb4
Group: fix typo 2019-04-22 22:55:55 +02:00
Bartuccio Antoine
3d344b483d
Group: improve group list display 2019-04-22 22:55:55 +02:00
Bartuccio Antoine
ee89327742
Group: add translations 2019-04-22 22:55:55 +02:00
Bartuccio Antoine
b693ee32f2
Group: add a label on users to delete 2019-04-22 22:55:54 +02:00
Bartuccio Antoine
08d03087a4
core: create a DetailFormView 2019-04-22 22:55:54 +02:00
Bartuccio Antoine
34459f83ec
Group: Groups: allow bulk removing of users from a group 2019-04-22 22:55:54 +02:00
Bartuccio Antoine
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
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
Bartuccio Antoine
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
Bartuccio Antoine
6943d29857
README: fix typo in CONTRIBUTING and move dependencies before Get started instructions 2019-04-06 20:12:47 +02:00
Bartuccio Antoine
46db8b391a
rootplace: make code clearer and fix typos 2019-03-19 17:23:02 +01:00
Bartuccio Antoine
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
Bartuccio Antoine
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
Bartuccio Antoine
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
Krophil
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
Bartuccio Antoine
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