8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-21 19:03:11 +00:00
Commit graph

3825 commits

Author SHA1 Message Date
Jean-Romain Garnier
a2bd34297d fix: RegistrationError when accessing mandate history 2021-04-27 19:24:07 +02:00
klafyvel
4fabd68ca3 Merge branch 'fix_318' into 'dev'
fix: 🎨 Better placement for forgetten password button (#318)

See merge request re2o/re2o!608
2021-02-28 09:38:47 +00:00
eb92e4d71a fix: 🎨 Better placement for forgetten password button (#318) 2021-02-28 09:28:24 +00:00
klafyvel
d1435720f4 Merge branch 'quick_fix_about' into 'dev'
fix: 🐛 Quick fix bug with MIDDLEWARE_CLASSES

See merge request re2o/re2o!610
2021-02-28 09:27:58 +00:00
f95babce51 fix: 🐛 Quick fix bug with MIDDLEWARE_CLASSES
Support for django 2.22 introduces the use of MIDDLEWARE instead of MIDDLEWARE_CLASSES. This change was not reflected everywhere, about function for instance.
2021-02-28 09:23:53 +00:00
klafyvel
848b5bb7a1 Merge branch 'docker' into 'dev'
feat: 🎨 Dev docker file in repository (Close #322)

See merge request re2o/re2o!607
2021-02-18 19:02:44 +00:00
e0ca9eb380 fix: ✏️ locale != local 2021-02-18 19:59:03 +01:00
639ff7f9b5 test: 🔥 Remove old test code 2021-02-18 19:59:03 +01:00
ce2e77546e fix: 🐛 Use correct settings in ldap_sync + typo 2021-02-18 19:59:03 +01:00
43b6a2cdf2 feat: Add dev docker support
Dockerfile and docker-compose files are now included in directory. They start a db, migrate, create a superuser if it doesn't already exists and start the server
2021-02-18 19:59:03 +01:00
889f70738b chore: 📌 Update requirements files 2021-02-18 19:59:03 +01:00
faeaeb5491 chore: ✏️ Rename settings for default_gid
Settings for default_gid is now DEFAULT_GID instead of LDAP['default_gid']

Rename settings in configuration file
2021-02-18 19:59:03 +01:00
3b6af9d01a feat: 🎨 Allow the use of CDN and generalise the staticfiles.
A CDN can be used. Other locations than the debian ones can be used for staticfiles. python3 manage.py runserver is now functionnal

Configuration need to be changed to have re2o2.9 behavior
2021-02-18 19:59:03 +01:00
608cbdb634 Merge branch 'fix_316' into 'dev'
fix: 🎨 Update footer (fix #316)

See merge request re2o/re2o!609
2021-02-18 17:33:21 +00:00
e9053ec303
fix: ✏️ Update translation 2021-02-18 18:26:32 +01:00
6b8d9e3806
fix: 🎨 Update footer (fix #316) 2021-02-18 16:05:40 +01:00
chirac
d8d172fe97 Merge branch 'quick_fix_login' into 'dev'
fix: 🚑 Replace decodestring by decodebytes

See merge request re2o/re2o!606
2021-02-15 21:25:48 +00:00
bfedfeb550
fix: 🚑 Replace decodestring by decodebytes
Decodestring is a deprecated alias of decodebytes since version 3.1
2021-02-15 11:15:16 +01:00
nanoy
0e9c361a0e Merge branch 'remove_old_migrations' into 'dev'
Remove old migrations

See merge request re2o/re2o!605
2021-02-14 19:02:14 +00:00
067c4bccf1
fix: 🔥 Remove old migrations for the tickets app
Remove old migrations. Add migration for commit 2f4b2699
2021-02-14 11:59:38 +01:00
Hugo Levy-Falk
d26d912328 fix: Remove old migrations that prevent a fresh install without LDAP.
Fix #329.

BREAKING CHANGE: you need to define the proper router in re2o/settings_locals.py for LDAP to continue working properly. See re2o/settings_locals.example.py.
2021-02-14 10:24:09 +01:00
klafyvel
8c88b6a6c9 Merge branch 'update_django' into 'dev'
feat: ⬆️ Support for django 2.2 (#308)

See merge request re2o/re2o!604
2021-02-14 10:22:50 +01:00
Hugo Levy-Falk
4976b6fb79 fix: correct management of extra dependencies. 2021-02-14 09:29:10 +01:00
2f4b26999e fix: 🐛 Remove clashes in permissions for the ticket app
Permissions clashes of view_* are removed for the ticket app.
2021-02-14 09:29:10 +01:00
7691905b82 chore: 📌 Error in dev-requirements.txt 2021-02-14 09:29:10 +01:00
7c8eabe613 chore: 📌 Use poetry instead of pipenv
Pipenv doesn't seem to support extra dependencies. This commit also add requirements.txt files
2021-02-14 09:29:10 +01:00
378c906720 chore: 📌 Add pipfile 2021-02-14 09:29:10 +01:00
ec2b4afd41 style: 🎨 Apply black and isort 2021-02-14 09:29:10 +01:00
6736caf9f4 feat: ⬆️ Support for django 2.2 (#308)
Support for django 2.2. Rename django.conf.urlresolvers. Change url to path. Add apps to app folder. Edit migrations for on_delete. Edit models for on_delete.

Drop compatibility for django 1.x
2021-02-14 09:29:10 +01:00
klafyvel
37ee9e30b8 Merge branch 'broken_links' into 'dev'
fix: ✏️ Fix links that pointed to gitlab.federez.net/federez/re2o (#309)

See merge request re2o/re2o!603
2021-02-08 18:46:51 +01:00
67a19a171c
fix: ✏️ Fix links that pointed to gitlab.federez.net/federez/re2o (#309)
Replace links that pointed to gitlab.federez.net/federez/re2o to gitlab.federez.net/re2o/re2o. Close #309
2021-02-08 16:50:37 +01:00
Gabriel Detraz
c2a4b7dd66 Merge branch 'master' into dev 2021-01-26 21:17:22 +01:00
0a1dc9edd8 Merge branch 'fix_autocomplete_port' into 'master'
fix: Wrong url path for interface autocomplete on port edition form

See merge request re2o/re2o!601
2021-01-26 20:57:33 +01:00
Gabriel Detraz
367e972ceb fix: Wrong url path for interface autocomplete on port edition form 2021-01-26 20:10:38 +01:00
Gabriel Detraz
8031ed10f2 Merge branch 'master' into dev 2021-01-24 17:20:28 +01:00
klafyvel
7c18f1f5ab Merge branch 'release-2.9' into 'master'
Release 2.9

It is that time of the year again.

See [CHANGELOG.md](https://gitlab.federez.net/re2o/re2o/-/blob/release-2.9/CHANGELOG.md).

Many thanks to the people who made Re2o2.9 possible, thanks to their 575 commits in almost one year of development!

* Jean-Romain Garnier
* Gabriel Detraz
* Hugo Levy-Falk
* Arthur Grisel-Davy
* Corentin Canebier
* Yoann Piétri
* Jean-Marie Mineau
* Leila Bekaddour
* Maxime Bombar

See merge request re2o/re2o!592
2021-01-24 17:11:46 +01:00
0f7c841403 fix: Links in CHANGELOG.md 2021-01-24 16:37:10 +01:00
Jean-Romain Garnier
452acb4a5d fix: typo in french translation of "home" 2021-01-24 16:37:10 +01:00
0287d7aa0c fix: ✏️ Fix typo in navbar 2021-01-24 16:37:10 +01:00
9d33031bb6 fix: Potential information leak in serviceuser history 2021-01-24 16:37:10 +01:00
db929676e2 fix: 🐛 Fix voucher_pdf function (#315)
Replace date_end by date_end_memb in voucher_pdf. Close #315
2021-01-24 16:37:10 +01:00
Jean-Romain Garnier
9abd329e16 fix: Indentation and variable name issues in users/models.py 2021-01-24 16:37:10 +01:00
chirac
59b948f988 fix: Error on rezometz website 2021-01-24 16:37:10 +01:00
chirac
77b599ad34 fix: the function all_ap_in doesn't crash anymore on dormitory use 2021-01-24 16:37:10 +01:00
Yohann D'ANELLO
3d365a4830 Fix: Use local bootstrap static files 2021-01-24 16:37:10 +01:00
ce6f46b2da feat(trans): Translate remaining fuzzy translations 2021-01-24 16:37:10 +01:00
69228f0ae4 chore(trans): Regenerate all django.po file 2021-01-24 16:37:10 +01:00
Hugo Levy-Falk
1a9d3d0824 fix: Permission DoesNotExist when accessing BaseInvoice history
See the issue for details.

Closes #317 .
2021-01-24 16:37:10 +01:00
fdb0b0b10f fix: Use bootstrap class for fa-check and fa-times color instead of hardcoded value 2021-01-24 16:37:10 +01:00
a2c0ab66f0 fix: Whitelist and ticket list responsiveness 2021-01-24 16:37:10 +01:00