ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
691 Commits 19 Branches 3 Tags 24 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
Alexandre Iooss 64499b65bb
Better tooltips and icons 2020-04-10 22:22:07 +02:00
Alexandre Iooss 57226a0733
Custom style for tooltips 2020-04-10 21:36:04 +02:00
Yohann D'ANELLO f10497bac3 List pending users 2020-04-05 06:40:03 +02:00
Yohann D'ANELLO 49807d33d9 Use a separate app for registration 2020-04-05 05:17:28 +02:00
Yohann D'ANELLO 0f77b9df9a Unvalidate e-mail when the user changes it, but the user still active 2020-04-05 04:37:29 +02:00
Yohann D'ANELLO 3f5faa0b05 Add tab for user list 2020-04-01 20:56:24 +02:00
Yohann D'ANELLO dadd840645 Merge remote-tracking branch 'origin/master' into activity 2020-03-27 14:16:10 +01:00
Pierre-antoine Comby 09fb0e1470 Merge branch 'master' into front_club 2020-03-27 14:07:22 +01:00
Yohann D'ANELLO 841d56d5b3 Merge remote-tracking branch 'origin/master' into activity 
# Conflicts:
#	note_kfet/urls.py
#	templates/base.html
 2020-03-27 00:32:22 +01:00
Pierre-antoine Comby 7568abb681 some minor cleaning 2020-03-26 17:41:11 +01:00
ynerant 57a01c48a8 Merge branch 'master' into 'tresorerie' 
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
 2020-03-25 00:30:14 +01:00
Pierre-antoine Comby 1ce7dc0118 reorganize tabs of nav bar 2020-03-23 15:53:18 +01:00
Yohann D'ANELLO 5fd472d408 Create, view and update remittances 2020-03-22 18:27:22 +01:00
Yohann D'ANELLO 4f343fc99f Billing -> Invoice 2020-03-22 01:22:27 +01:00
Yohann D'ANELLO 18f6daf2ac Merge remote-tracking branch 'origin/master' into tresorerie 
# Conflicts:
#	locale/de/LC_MESSAGES/django.po
#	locale/fr/LC_MESSAGES/django.po
#	note_kfet/settings/base.py
#	templates/base.html
 2020-03-22 01:04:03 +01:00
Yohann D'ANELLO 71346476df Starting treasury app 2020-03-21 00:30:49 +01:00
Yohann D'ANELLO 730d37c620 Protect views from viewing if the user has no right to view an object 2020-03-19 02:26:06 +01:00
Yohann D'ANELLO a1f37f0eea Validation/devalidation of a transaction on profile page 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO a1f8ef721a Minor fixes on consumptions page 2020-03-13 09:26:39 +01:00
Yohann D'ANELLO 7b69ffdefe Better transfers 2020-03-12 23:12:49 +01:00
Yohann D'ANELLO f9451da7f1 Better JS 2020-03-12 16:53:35 +01:00
Yohann D'ANELLO b6c3178052 Dynamic page 2020-03-12 10:53:06 +01:00
Yohann D'ANELLO d8a785d309 Replace contact email 2020-03-11 17:51:42 +01:00
Yohann D'ANELLO a128ed4803 Use environment rather than hardcoding strings, closes #36 2020-03-11 13:24:48 +01:00
Yohann D'ANELLO f082f8523a Update translations 2020-03-11 12:05:29 +01:00
Pierre-antoine Comby e1063fcaa2 translation in navbar and transfer tab 2020-03-09 18:35:11 +01:00
Pierre-antoine Comby d5f718fbba start activity view and urls 2020-03-01 17:55:48 +01:00
Pierre-antoine Comby a348178d13 Fix id name 2020-02-27 12:00:02 +01:00
Pierre-antoine Comby 707770a5b4 fix #28 2020-02-25 22:55:27 +01:00
Alexandre Iooss 82355135b0
Remove SmoothNavigation Middleware 2020-02-21 21:15:49 +01:00
Yohann D'ANELLO 3fd99ebac7 Ability to disable cache storage 2020-02-21 18:28:21 +01:00
Yohann D'ANELLO c64347def7 Don't use slim version of jQuery (select2 requires AjaX) 2020-02-21 17:59:20 +01:00
Yohann D'ANELLO 886abd8188 Update django-light-admin, fix conflict between jQuery, select2 and turbolinks 2020-02-21 17:51:00 +01:00
Yohann D'ANELLO 0728ba4a5c Reduce autoloaded libraries 2020-02-21 17:20:42 +01:00
Yohann D'ANELLO 52663d75fa Move scripts location 2020-02-21 17:07:28 +01:00
Yohann D'ANELLO d5bb1ee310 Don't use local static JS file 2020-02-21 15:43:01 +01:00
Yohann D'ANELLO 5977d88ed6 Test turbolinks 2020-02-21 15:24:29 +01:00
Alexandre Iooss 6c017b1993
Remove sidebar and drop shadows 2020-02-21 13:50:35 +01:00
Alexandre Iooss 2e7bf4964b
Upgrade bootstrap and flex footer 2020-02-21 11:02:29 +01:00
Alexandre Iooss d2ec7f6e0d
Do not justify everything 2020-02-21 10:52:07 +01:00
Yohann D'ANELLO 00d560c20e Merge branch 'master' into api 
# Conflicts:
#	apps/note/forms.py
#	apps/note/urls.py
#	apps/note/views.py
 2020-02-16 22:25:00 +01:00
Pierre-antoine Comby 9cc0731ded Merge branch 'consos' into 'master' 
Consos

See merge request bde/nk20!7
 2020-02-09 15:47:19 +01:00
Yohann D'ANELLO 7bafc89713 Add form media to each page 2020-02-08 20:27:22 +01:00
Yohann D'ANELLO c4a60633f8 Consos 2020-02-04 01:18:03 +01:00
Pierre-antoine Comby f13ccf11aa Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-02-03 19:30:15 +01:00
Pierre-antoine Comby af30a4cd16 shift central div to the left 2020-02-03 19:21:14 +01:00
Yohann D'ANELLO f02d1ab41c Better pretty money. Closes #3 2020-02-03 15:20:37 +01:00
Pierre-antoine Comby 075995ce73 fixed footer (again ?) 2019-09-23 12:51:09 +02:00
Alexandre Iooss b76d4d69e0
Remove custom CSS from base.html 2019-08-14 15:17:14 +02:00
Pierre-antoine Comby 4879af3f34 minor changes to base.html 2019-08-13 18:24:25 +02:00