8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-30 00:22:25 +00:00
Commit graph

3847 commits

Author SHA1 Message Date
b2661ec7de Merge branch 'fix_rezometz_website' into 'dev'
fix: Error on rezometz website

See merge request re2o/re2o!599
2021-01-24 15:31:20 +01:00
chirac
a118f430a2 fix: Error on rezometz website 2021-01-24 15:21:10 +01:00
5b992e929d Merge branch 'fix_ap_shortcut' into 'dev'
Fix : the function all_ap_in doesn't crash anymore on dormitory use

See merge request re2o/re2o!597
2021-01-24 15:19:39 +01:00
chirac
5ea8e3d6d1 fix: the function all_ap_in doesn't crash anymore on dormitory use 2021-01-24 15:10:31 +01:00
klafyvel
175a7e1baf Merge branch 'local-bootstrap' into 'dev'
Fix: Local bootstrap files

See merge request re2o/re2o!598
2021-01-24 14:47:47 +01:00
Yohann D'ANELLO
8be1765d42 Fix: Use local bootstrap static files 2021-01-24 14:41:29 +01:00
chirac
ef8465adad Merge branch 'release_2.9_translation' into 'dev'
Add missing translations for release 2.9

See merge request re2o/re2o!596
2021-01-24 12:11:20 +01:00
8ea598fede feat(trans): Translate remaining fuzzy translations 2021-01-24 12:02:59 +01:00
c485f3a8fb chore(trans): Regenerate all django.po file 2021-01-24 12:02:44 +01:00
chirac
c53be08058 Merge branch 'fix-permission-does-not-exist-for-base-invoice' into 'dev'
fix: Permission DoesNotExist when accessing BaseInvoice history

See merge request re2o/re2o!595
2021-01-24 11:13:05 +01:00
Hugo Levy-Falk
da927754e0 fix: Permission DoesNotExist when accessing BaseInvoice history
See the issue for details.

Closes #317 .
2021-01-24 11:07:19 +01:00
chirac
6ccd120ff0 Merge branch 'minor_ui_fixes' into 'dev'
Fix: Minor UI issues

See merge request re2o/re2o!594
2021-01-17 16:40:05 +01:00
3d748e9e42 fix: Use bootstrap class for fa-check and fa-times color instead of hardcoded value 2021-01-15 19:51:11 +01:00
42ded799e4 fix: Whitelist and ticket list responsiveness 2021-01-15 19:46:35 +01:00
7afa15bff1 fix: Subtable alternating color in subscription list 2021-01-15 19:46:35 +01:00
Hugo Levy-Falk
d5bdc7fe41 Fix: Forgotten legacy ldap_sync calls in machines and cotisations. 2021-01-12 19:11:49 +01:00
Hugo Levy-Falk
4fc51b761f I forgot Esum. 2021-01-11 23:30:53 +01:00
Hugo Levy-Falk
e215c63abb Thanks to our contributors 2021-01-11 23:17:48 +01:00
klafyvel
50d0bab8b7 Merge branch 'changelog_2.9_fix' into 'dev'
Add missing update step details in CHANGELOG.md

See merge request re2o/re2o!591
2021-01-11 22:17:52 +01:00
fda4c481b0 Add missing update step details in CHANGELOG.md 2021-01-11 22:14:08 +01:00
Hugo Levy-Falk
96f3149b59 BuG fixes :) 2021-01-11 22:02:35 +01:00
klafyvel
4407d92a0c Merge branch 'feature-move-ldap-to-separate-app' into 'dev'
Feature: move ldap to separate app

See merge request re2o/re2o!589
2021-01-11 21:54:02 +01:00
Hugo Levy-Falk
af70a7893b feat: Integrate the removal of LDAP to migration squash. 2021-01-11 21:53:49 +01:00
Hugo Levy-Falk
697d1ef7aa feat: Move LDAP to an optional app.
The Entire LDAP infrastructures now relies on signals rather than direct function calls and is in its own app. This means it can be deactivated, but also that we can easily plug new services in addition to LDAP, such as OAuth.

Closes issue #270
2021-01-11 21:53:49 +01:00
klafyvel
64da368b34 Merge branch 'changelog_2.9' into 'dev'
docs: Create changelog for Re2o 2.9

See merge request re2o/re2o!590
2021-01-11 21:53:37 +01:00
904bf42f39 Fix link in CHANGELOG.md 2021-01-11 21:22:29 +01:00
ab24979ea8 Reformat changelog for version 2.9 2021-01-11 21:20:49 +01:00
Hugo Levy-Falk
b864fb1385 fix: Minor change on changelog todo-list 2021-01-10 20:30:57 +01:00
Hugo Levy-Falk
fd331cbad7 Merge branch 'changelog_2.9' of gitlab.federez.net:re2o/re2o into changelog_2.9 2021-01-10 20:30:04 +01:00
Hugo Levy-Falk
e260bce811 docs: Create changelog for Re2o 2.9
We made it this far folks.

Closes #307
Co-authored-by: Jean-Romain Garnier <jean-romain.garnier@supelec.fr>
Co-authored-by: Hugo Levy-Falk <hugo@klafyvel.me>
2021-01-10 20:21:30 +01:00
Hugo Levy-Falk
cd231a65db docs: Create changelog for Re2o 2.9
We made it this far folks.

Closes #307
Co-authored-by: Jean-Romain Garnier <jean-romain.garnier@supelec.fr>
Co-authored-by: Hugo Levy-Falk <hugo@klafyvel.me>
2021-01-10 20:18:33 +01:00
chirac
dd23c42ec5 Merge branch 'squash-migrations' into 'dev'
Squash migrations

See merge request re2o/re2o!578
2021-01-10 16:26:24 +01:00
Hugo Levy-Falk
d4dd5d89c9 Fix migration conflict with reversion. 2021-01-10 16:22:13 +01:00
Hugo Levy-Falk
a11a57dc7d removed dead code. 2021-01-10 16:22:13 +01:00
Hugo Levy-Falk
ac7c86fd21 Clean migration 2021-01-10 16:22:13 +01:00
Hugo Levy-Falk
5e81bf0ccd LDAP 2021-01-10 16:22:13 +01:00
Hugo Levy-Falk
083af31db2 Fix #273 API import side-effect. 2021-01-10 16:22:13 +01:00
Hugo Levy-Falk
64f7a53ec1 multi_op 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
f1e27f6066 Tickets 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
cf9f9d811f Foreign keys 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
33497893d8 Fix miscellanous model creation mistakes. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
7792be978d Fix dependecies graph creation. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
18db73f2bc fix dependencies names 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
93c2d369f0 Topologie models creation. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
d25dc2fd0a Users models creation. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
ad7b07dd9a Machines models creation. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
d03ae4f52d Cotisations models definition. 2021-01-10 16:22:12 +01:00
Hugo Levy-Falk
585b168c1c Preferences model creation 2021-01-10 16:22:12 +01:00
klafyvel
bea0a787fc Merge branch 'nabvar_right_again' into 'dev'
fix: 🚸 Move user menu back to the right side of the screen (Fix #306)

See merge request re2o/re2o!588
2021-01-10 12:25:05 +01:00
fb9ef863e4
fix: 🚸 Move user menu back to the right side of the screen (Fix #306) 2021-01-09 19:53:37 +01:00