Commit Graph

74 Commits

Author SHA1 Message Date
quark 2e71ce05a9 Merge branch 'main' into food_traceability 2024-08-27 17:11:32 +02:00
korenstin 48a5b04579 Merge branch 'beta' into migration-django-4-2 2024-08-25 16:13:01 +02:00
quark 196df1e775 Remove initial.json (food) mandatory allergen are directly created in migration. Edit tables.py and views.py transformedfoodlist.html to improve/change the view. Edit base.html, urls.py to correct little mistakes. Edit initial.json (permission) to begin permission for food apps and create a new role (Respo Bouffe). 2024-08-13 02:07:32 +02:00
quark 1c5ed2bd3f Edit base.html and few translations 2024-08-06 13:59:30 +02:00
korenstin 48462f2ffc Adding ingredients to a preparation 2024-07-22 15:52:09 +02:00
test 5d30b0e819 charte info 2024-05-26 15:46:50 +02:00
bleizi 546a3a72b1
Remove BDE compaign banner 2024-02-15 10:32:39 +01:00
charliep e367666fe9 Update base.html compromis 2024-02-13 23:27:11 +01:00
charliep d1df8f3eac Update base.html
📢Pour la meilleure liste BDE
2024-02-13 21:24:23 +01:00
mcngnt 7d59cd6cd2 Compaign banner 2024-02-13 14:26:28 +01:00
bleizi e9f18c3ed9
migrate to django 4.2 (LTS), change requirement and tests. remove depreciated ifnotequal 2024-01-24 19:18:02 +01:00
Nicolas Margulies 7afc583282 Made trust adding widget resetable, corrected the unexpected empty field behavior and improved autocomplete's responsiveness 2023-09-01 17:15:24 +02:00
charliep 9c9149b53a Ajout d'un lien vers la FAQ de la note. 2023-03-31 12:34:14 +02:00
Théo Le Moigne 454ea19603
hide Soge during registration 2022-09-04 12:31:08 +02:00
Nicolas Margulies dc69faaf1d
Better user search to add friendships 2022-04-13 12:30:22 +02:00
Yohann D'ANELLO f88eae924c
Use local version of Turbolinks instead of using Cloudfare
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-12-13 21:00:34 +01:00
Pierre-antoine Comby 6b4d18f4b3 fix #97 2021-09-26 23:03:25 +02:00
Yohann D'ANELLO 4c17e2a92b
Fix wrong banner message
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-09-13 23:29:51 +02:00
Yohann D'ANELLO f75dbc4525
OAuth2 implementation documentation
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-09-02 20:59:45 +02:00
Yohann D'ANELLO 9b26207515
Rework templates for OAuth2
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-09-02 20:59:43 +02:00
Yohann D'ANELLO 7ea36a5415
[oauth2] Add view to generate authorization link per application with given scopes
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-09-02 20:59:33 +02:00
Yohann D'ANELLO 898f6d52bf
Better templates for OAuth2 authentication
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-09-02 20:59:20 +02:00
Yohann D'ANELLO 733f145be3
BDE members can now use they note even if they are not in the Kfet club
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2021-08-29 14:39:36 +02:00
Yohann D'ANELLO a6f23df7d5
Load the good translation file, fixes #85
Signed-off-by: Yohann D'ANELLO <yohann.danello@gmail.com>
2021-01-19 11:58:19 +01:00
Yohann D'ANELLO 8434c0062c Merge branch 'beta' into JS_translations
# Conflicts:
#	apps/note/static/note/js/consos.js
#	locale/de/LC_MESSAGES/django.po
#	locale/es/LC_MESSAGES/django.po
#	locale/fr/LC_MESSAGES/django.po
2020-11-16 00:59:26 +01:00
Yohann D'ANELLO b9d49d53f2 Export JS translation files as static files 2020-11-16 00:29:27 +01:00
Yohann D'ANELLO b58a0c43cd Include auto-generated javascript translation file 2020-11-15 22:53:00 +01:00
Yohann D'ANELLO e5e758f9d9 Display banners when a user is no more a BDE or Kfet member 2020-10-07 11:46:43 +02:00
Yohann D'ANELLO 65a2e8c08c Better index page: non-Kfet members will be redirected to their profile page, the account note (when it will be managed) will see the consumption page 2020-10-07 11:29:52 +02:00
Yohann D'ANELLO fb72385773 Warn users that they have to open they Sogé account 2020-10-07 10:59:37 +02:00
Yohann D'ANELLO c3d613947f Pre-registered users can declare that they opened a bank account in the signup form 2020-10-07 10:33:57 +02:00
Alexandre Iooss 70448db8e5
Remove Django CAS server and add oauth toolkit 2020-09-21 10:31:42 +02:00
Yohann D'ANELLO f89234b69a JS was broken, please close your HTML tags 2020-09-13 23:18:00 +02:00
Alexandre Iooss e8005a6c58 Update Django locale selector 2020-09-13 20:17:59 +02:00
Alexandre Iooss 4452d112e3 Navbar should expand only on large screen 2020-09-06 21:50:06 +02:00
Alexandre Iooss c06354211b Translate login page 2020-09-06 20:21:31 +02:00
Alexandre Iooss cc5996121b Change HTML localization 2020-09-06 20:04:10 +02:00
Yohann D'ANELLO 0f47412c38 Fix Ansible script for production 2020-09-04 22:37:18 +02:00
Alexandre Iooss cc7ebd2d8a Sometimes the nk20 is too laggy 2020-09-03 00:35:25 +02:00
Alexandre Iooss 5feb23ad51 Use Debian font awesome 2020-09-01 14:33:38 +02:00
Alexandre Iooss b4ef4b8089 Use local javascript and css libs 2020-09-01 14:28:11 +02:00
Alexandre Iooss dd9ca315fa Clean up templates header 2020-09-01 10:20:16 +02:00
Alexandre Iooss d9e003a8f4 Remove contenttitle 2020-09-01 10:13:05 +02:00
Yohann D'ANELLO e74f92cf8d Set current page as active button 2020-08-31 22:11:46 +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