1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-30 04:13:01 +00:00
Commit Graph

236 Commits

Author SHA1 Message Date
Alexandre Iooss
e8dcf295ad Make outline button have a background 2020-09-01 09:46:33 +02:00
Yohann D'ANELLO
5642c268e9 Move transfer type selector in credit/debit mode 2020-08-31 23:06:21 +02:00
Yohann D'ANELLO
e74f92cf8d Set current page as active button 2020-08-31 22:11:46 +02:00
Yohann D'ANELLO
5e65e2d74a Add "Lock note" feature 2020-08-31 20:15:48 +02:00
Yohann D'ANELLO
a9258c332a Order note research results: match first aliases then normalized names 2020-08-30 22:33:59 +02:00
Yohann D'ANELLO
b454ad8dad Hide note selector when the user clicks elsewhere 2020-08-30 16:56:16 +02:00
Yohann D'ANELLO
227cb2a801 Add light background to "Gift/Transfer" buttons 2020-08-30 15:49:06 +02:00
Yohann D'ANELLO
ef1e805538 Clear note selector once a consumption is performed 2020-08-30 15:18:34 +02:00
erdnaxe
93e5e4c8cd Merge branch 'morefront' into 'beta'
Do not list alias on profile page

See merge request bde/nk20!99
2020-08-25 16:44:55 +02:00
Alexandre Iooss
2e659c63cd Member templates inherit from member/base.html 2020-08-25 15:39:57 +02:00
Yohann D'ANELLO
b25935e579 When data is imported from the NK15, prevent users whenever some aliases are deleted 2020-08-24 12:41:51 +02:00
Alexandre Iooss
c64de202a6 Remove title from error pages 2020-08-23 14:21:13 +02:00
Alexandre Iooss
e3898d0b1e Cards on error pages 2020-08-23 09:51:03 +02:00
Alexandre Iooss
196f796570 Move alias.js to local static 2020-08-22 23:54:58 +02:00
Alexandre Iooss
8691421ce3 Change cursor on select 2020-08-22 23:23:44 +02:00
Alexandre Iooss
8063354e0f He's stupid Tim\! 2020-08-22 09:39:07 +02:00
Alexandre Iooss
2272cf5294 Update URL when searching 2020-08-22 09:35:55 +02:00
Alexandre Iooss
aa98c4848d Create base template for search page 2020-08-21 23:11:25 +02:00
erdnaxe
00b07147f6 Merge branch 'color_front' into 'beta'
Color front

See merge request bde/nk20!94
2020-08-21 21:07:24 +02:00
Yohann D'ANELLO
26775aa561 Clear and hide tooltips when the conso/transfer page is cleared 2020-08-21 21:00:46 +02:00
Alexandre Iooss
83d2c18d1e Debounce user search 2020-08-21 19:12:28 +02:00
Alexandre Iooss
5ea1eed76d Password reset use cards 2020-08-21 18:34:20 +02:00
Alexandre Iooss
b7d4a17ffd Better footer on mobile phone 2020-08-21 18:08:32 +02:00
Alexandre Iooss
5c3451bda7 Use cards for registration templates 2020-08-21 17:52:48 +02:00
Alexandre Iooss
8c46321c95 Make page title always white 2020-08-21 17:52:30 +02:00
Alexandre Iooss
501d02d05c Fix back to top btn 2020-08-21 15:25:39 +02:00
Alexandre Iooss
310f55a28e Light background on login box 2020-08-21 14:43:25 +02:00
Alexandre Iooss
197bd28ceb Use a fluid-container for navbar 2020-08-21 14:38:07 +02:00
Alexandre Iooss
e03a3f7fd2 Do not show login and register on these pages 2020-08-21 14:33:43 +02:00
Alexandre Iooss
51230e029d Better navbar buttons and less shadow 2020-08-21 14:21:26 +02:00
Alexandre Iooss
bd49a36bcc Dark background and custom navbar color 2020-08-21 13:24:04 +02:00
Pierre-antoine Comby
448d379315 no need to disable turbolinks if we don't use select2 2020-08-18 11:45:30 +02:00
Yohann D'ANELLO
9c061d9837 Free the transfer lock in case of transfer error 2020-08-16 00:04:35 +02:00
Yohann D'ANELLO
5abb155287 Free the transfer lock in case of transfer error 2020-08-16 00:02:09 +02:00
Yohann D'ANELLO
482a04d37c Consumptions didn't get removed properly 2020-08-15 19:33:30 +02:00
Yohann D'ANELLO
fe2af5ac2b Pass resourcetype argument correctly when invalidating a transaction 2020-08-15 19:10:15 +02:00
Yohann D'ANELLO
dfe4bf2175 Register external apps in Django Admin, fix Django Admin Docs 2020-08-13 19:13:19 +02:00
Yohann D'ANELLO
bb2704323a Spam click on invalidity button is no longer possible 2020-08-13 17:04:10 +02:00
Yohann D'ANELLO
3a52af33a2 🍻 Make coffee, closes #54 2020-08-10 15:36:41 +02:00
Alexandre Iooss
7719ff41ad Make tables responsive 2020-08-10 15:10:02 +02:00
Alexandre Iooss
8933fddaf3 Add comment on custom CSS 2020-08-10 15:05:00 +02:00
Alexandre Iooss
eadc8fa193 Fix autocompletion not showing up in rare cases 2020-08-10 14:45:44 +02:00
Alexandre Iooss
f74b19b2af Fix autocompletion popup flipping direction 2020-08-10 14:45:17 +02:00
Alexandre Iooss
c3081d9cc3 Add missing space in menu 2020-08-10 13:59:29 +02:00
Alexandre Iooss
8e886f1431 Remove debug banner as it does not work 2020-08-10 13:56:06 +02:00
Alexandre Iooss
bf7c253607 Set HTML lang depending on user locale 2020-08-10 13:50:23 +02:00
Alexandre Iooss
027ae5b97f Color reauth warning on login page 2020-08-10 13:49:53 +02:00
Alexandre Iooss
beff848796 Use a fixed-width container by default for lisibility 2020-08-10 12:08:47 +02:00
Alexandre Iooss
e78ba49252 Override Django Registration templates 2020-08-10 12:08:21 +02:00
Alexandre Iooss
ce35e8f7e8 Make the container customizable 2020-08-10 11:40:51 +02:00
Alexandre Iooss
d73f7c31a1 Define BASE_DIR in development.py 2020-08-09 19:36:11 +02:00
Alexandre Iooss
e9ae8531b8 Fix date-picker.html import 2020-08-09 19:16:11 +02:00
Alexandre Iooss
7b40ee1ca4 Reorder templates 2020-08-09 19:06:57 +02:00
Alexandre Iooss
53b496546d Add django-bootstrap-datepicker-plus and django-colorfield, move statics 2020-08-09 18:54:20 +02:00
Alexandre Iooss
8c1cf754ed Revert to NOTE_URL 2020-08-09 18:39:17 +02:00
Alexandre Iooss
efe833cec3 Merge production settings in base settings 2020-08-09 18:34:51 +02:00
Alexandre Iooss
ccfc37d226 Reorder base Django settings and read env vars 2020-08-09 17:52:19 +02:00
Yohann D'ANELLO
acf7ecc4ae Use phone number validator 2020-08-05 14:14:51 +02:00
Yohann D'ANELLO
ba067f050e Mails to be sent are added in a queue thanks to Django Mailer (todo: configure cron) 2020-08-03 20:09:16 +02:00
Yohann D'ANELLO
985a5ca876 Add "search transactions page" 2020-08-03 18:49:15 +02:00
Yohann D'ANELLO
fb775de923 Add backdoor to login as other users (in debug mode only) 2020-07-30 12:50:48 +02:00
Yohann D'ANELLO
b8a88eeda4 Only staff with good permission mask can visit Django Admin 2020-07-29 11:38:59 +02:00
Yohann D'ANELLO
76a6260b18 SMTP user and password are None by default, add From Email tag 2020-07-28 18:59:34 +02:00
Yohann D'ANELLO
0b6cb4ef19 Production is not debug 2020-07-25 19:14:27 +02:00
Yohann D'ANELLO
2eb601bd66 💥 Improve performances 2020-07-25 17:25:57 +02:00
Yohann D'ANELLO
b46854e479 Rework on Docker image 2020-06-21 20:27:42 +02:00
Yohann D'ANELLO
f7b68678d8 Prepare production, we will send mails 2020-05-08 15:59:31 +02:00
Yohann D'ANELLO
a83ab4bf85 Add a public rights page to view which permissions are granted to which role, update Font Awesome to 5.13 2020-04-26 01:20:46 +02:00
Yohann D'ANELLO
957344922b Custom error pages 2020-04-25 19:29:18 +02:00
Yohann D'ANELLO
e42680997f Translate all fields, remove old CAS client configuration, remove packaged templates in source 2020-04-25 15:54:29 +02:00
Yohann D'ANELLO
69ac5cd291 Revert changes on some comments 2020-04-19 20:45:59 +02:00
Yohann D'ANELLO
8113c5cd61 WEI Survey (work in progress) 2020-04-19 20:35:49 +02:00
Yohann D'ANELLO
840376a4f5 Add teams 2020-04-13 06:01:27 +02:00
Yohann D'ANELLO
154ea64b9f Launching WEI app, add models 2020-04-11 03:37:06 +02:00
Yohann D'ANELLO
fbc25240e6 Validate registrations, closes #14, #18, #19 2020-04-05 09:09:21 +02:00
Yohann D'ANELLO
49807d33d9 Use a separate app for registration 2020-04-05 05:17:28 +02:00
Yohann D'ANELLO
d5b010980b Full membership support 2020-04-01 03:42:19 +02:00
Yohann D'ANELLO
bf9789bd9e Restructurate memberships, closes #16 2020-03-31 23:54:14 +02:00
Yohann D'ANELLO
fb5796d35e Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. 2020-03-30 00:42:32 +02:00
Yohann D'ANELLO
ceb5690838 Invite people 2020-03-27 18:02:22 +01:00
Yohann D'ANELLO
f09364d3d8 Custom auto-complete fields, remove DAL requirement 2020-03-27 16:19:33 +01:00
Yohann D'ANELLO
f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +01:00
Yohann D'ANELLO
213e5a8369 Fix CI 2020-03-27 00:40:35 +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
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
da63bd75f1 this is not the place for cas config 2020-03-22 22:22:51 +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
Pierre-antoine Comby
6445acedc7 Merge branch 'master' into rights 2020-03-22 00:00:18 +01:00
Yohann D'ANELLO
71346476df Starting treasury app 2020-03-21 00:30:49 +01:00
Pierre-antoine Comby
fa5334a741 use the OPTIONALS_APPS from secrets.py 2020-03-20 20:40:26 +01:00
Yohann D'ANELLO
24ea4c0a52 Comment code 2020-03-20 15:58:14 +01:00
Yohann D'ANELLO
091c427707 Restructurate code 2020-03-20 14:43:35 +01:00
Yohann D'ANELLO
7794210cc8 Being superuser is not enough (must have the correct mask), add some initial fixtures 2020-03-19 18:53:06 +01:00
Yohann D'ANELLO
95315cdbe2 Implements permission masks 2020-03-19 16:12:52 +01:00
Yohann D'ANELLO
057f42fdb6 Handle permissions (and it seems working!) 2020-03-18 14:42:35 +01:00
Yohann D'ANELLO
112d4b6c5a Merge branch 'consos' into rights
# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
2020-03-17 21:11:14 +01:00
Yohann D'ANELLO
daef806507 More envs 2020-03-11 15:54:12 +01:00
Yohann D'ANELLO
58ea6abce4 Fix template tags to make tox happy 2020-03-11 15:13:34 +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
417cd5da04 Improve REST API with filters 2020-03-11 11:15:03 +01:00