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

2935 commits

Author SHA1 Message Date
chirac
21f95fbc9d Simplify models.py 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk
7db8872bc8 Delete CotisationsOption.pres_name and better migration. 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk
621cdc9659 Try to make mandate edition fool-proof 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk
6dd4e776c1 Make use of mandates everywhere. 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk
75bb3658ac Add Mandate model 2019-10-01 19:30:34 +02:00
chirac
9c82a84c5f Merge branch 'hello-lara' into 'dev'
Hello lara

See merge request federez/re2o!447
2019-10-01 13:40:54 +02:00
Hugo Levy-Falk
a9194b405a Hello Lara :D
Just ran `find /var/www/re2o \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/Goulven/Lara/g'`.
2019-10-01 13:37:56 +02:00
chirac
6e0a99cd50 Merge branch '218-archive-command' into 'dev'
Resolve "Add a command to archive users"

See merge request federez/re2o!448
2019-10-01 13:36:05 +02:00
Hugo Levy-Falk
693c2b5676 Fix #218 2019-10-01 13:35:06 +02:00
Hugo Levy-Falk
e1575c09d4 Fix mass_delete of machine so that AccessPoint deletion is possible. 2019-10-01 13:35:05 +02:00
chirac
1ec299037e Merge branch '233-group-members-display' into 'dev'
233 group members display

See merge request federez/re2o!449
2019-09-30 15:21:26 +02:00
Hugo Levy-Falk
3be0b48c1b Fix #223 2019-09-30 15:21:17 +02:00
chirac
1eed57cf8f Merge branch '191-auto-accept-free-invoice' into 'dev'
Resolve "Faire qu'une facture de 0 euros ait un paiement automatiquement accepté"

See merge request federez/re2o!450
2019-09-30 15:20:45 +02:00
Hugo Levy-Falk
0cb9388cde Fix #191 2019-09-30 15:20:20 +02:00
chirac
b47f094479 Merge branch 'remove-useless-fields-preferences-template' into 'dev'
Remove useless fields preferences template

See merge request federez/re2o!446
2019-09-30 15:19:00 +02:00
Hugo Levy-Falk
eae1d9385d Remove preferences menu related to radius in topologie options, as it is no longer used. 2019-09-30 15:18:51 +02:00
arcas
4dfc752313 Merge branch 'remove-contributor-levy-arcas' into 'dev'
Remove contributor levy arcas

See merge request federez/re2o!445
2019-09-24 00:44:16 +02:00
klafyvel
657ef77bfe Remove contributor levy arcas 2019-09-24 00:44:16 +02:00
klafyvel
b3f08673d6 Merge branch '224-Fix-Changing-Domain' into 'dev'
[machines/views] Domain MUST be saved to get the right extension

See merge request federez/re2o!443
2019-09-23 21:49:46 +02:00
Maxime Bombar
b648078b4e [machines/views] Domain MUST be saved to get the right extension 2019-09-22 00:34:10 +02:00
chirac
e7db840dd5 Merge branch 'fix-can-view-all' into 'dev'
Fix typo in User.can_view_all

See merge request federez/re2o!442
2019-09-20 15:13:05 +02:00
Hugo Levy-Falk
e404fa36ec Fix typo in User.can_view_all 2019-09-20 15:09:57 +02:00
chirac
7bc300c3a6 Merge branch '151-disable-shortcuts' into 'dev'
Fix #151

See merge request federez/re2o!441
2019-09-20 15:00:19 +02:00
Hugo Levy-Falk
b8d8c11cb0 Fix #151 2019-09-20 14:48:37 +02:00
chirac
347cd8bf5d Merge branch '220-do-not-fail-when-no-gtu' into 'dev'
Resolve "Do not fail when no GTU has been uploaded."

See merge request federez/re2o!440
2019-09-20 14:23:18 +02:00
Hugo Levy-Falk
d9f5514b58 Llamas are being oppressed. 2019-09-20 14:20:42 +02:00
Hugo Levy-Falk
19367e57b0 Merge branch '220-do-not-fail-when-no-gtu' of https://gitlab.federez.net/federez/re2o into 220-do-not-fail-when-no-gtu 2019-09-20 14:16:10 +02:00
Hugo Levy-Falk
aee410508d Fix #220 2019-09-20 14:14:37 +02:00
Hugo Levy-Falk
b674025259 Fix #220 2019-09-20 14:13:35 +02:00
chirac
d98eb4e011 Merge branch 'fix-radius-attributes-display' into 'dev'
Fix radius attributes __str__

See merge request federez/re2o!438
2019-09-20 13:03:25 +02:00
Hugo Levy-Falk
86e5c8d322 Fix radius attributes __str__ 2019-09-20 11:04:02 +02:00
klafyvel
9c1ca89b9d Merge branch 'fix_buster' into 'dev'
Fix buster

See merge request federez/re2o!437
2019-09-19 23:16:56 +02:00
klafyvel
4f1102c0c5 Better naming 2019-09-19 23:16:02 +02:00
klafyvel
1c2ce26060 Better naming 2019-09-19 23:15:11 +02:00
klafyvel
6c476f080e Better naming 2019-09-19 23:14:33 +02:00
Gabriel Detraz
17704fce9c Fix can_view extra arg for logs 2019-09-19 23:10:43 +02:00
Gabriel Detraz
d3310866cd Rend l'API fonctionnelle sous buster 2019-09-19 23:10:43 +02:00
Gabriel Detraz
7fb5f786fd Fix list usable machine by rights 2019-09-19 23:10:43 +02:00
chirac
40258bfd76 Merge branch '219-handle-juniper-for-autocapture' into 'dev'
Resolve "Handle Juniper for autocapture"

See merge request federez/re2o!436
2019-09-19 23:07:22 +02:00
Hugo Levy-Falk
f9b7d70314 Fix various bugs in auth.py. 2019-09-19 23:01:30 +02:00
Hugo Levy-Falk
42053ac384 Radius installation. 2019-09-19 23:01:30 +02:00
Hugo Levy-Falk
0b00b42365 Make use of attributes in auth.py 2019-09-19 23:01:30 +02:00
Hugo Levy-Falk
ff058e0cca Add Radius Attributes 2019-09-19 23:01:29 +02:00
chirac
3bb010b9b8 Merge branch '217-better-management-of-desactivated-account' into 'dev'
Resolve "Desactivated account unable to log in"

See merge request federez/re2o!434
2019-09-19 22:59:43 +02:00
Hugo Levy-Falk
8df5a05d89 Do not display unnecessary warnings. 2019-09-19 22:55:16 +02:00
Hugo Levy-Falk
a9ebe331dd Fix #54 2019-09-19 22:55:16 +02:00
Hugo Levy-Falk
3f9d613c3d Fix #217 2019-09-19 22:55:16 +02:00
Gabriel Detraz
55b2ff076a NEVER user _ for var; conflicts with _( from trad + remove return True 2019-09-17 02:09:19 +02:00
Gabriel Detraz
e9d362db29 Fix Plantage, rajoute la permission view_tickets 2019-09-17 01:45:22 +02:00
klafyvel
92751cb5cf Merge branch '221-Fixes-force-the-move' into 'dev'
Fixes Issue 221

See merge request federez/re2o!435
2019-09-10 17:12:40 +02:00