Gabriel Detraz
|
6d76d0a5f7
|
Contact view on optional app... is optionnal
|
2019-10-01 22:47:30 +02:00 |
|
Gabriel Detraz
|
8a41a1af60
|
Fix bug affichage
|
2019-10-01 22:47:30 +02:00 |
|
Gabriel Detraz
|
051ec84f6e
|
Multi_opp app optional start
|
2019-10-01 22:47:30 +02:00 |
|
chirac
|
9434da63af
|
Merge branch 'bootstrap-accordion-ios' into 'dev'
Bootstrap accordion ios
See merge request federez/re2o!452
|
2019-10-01 21:59:38 +02:00 |
|
|
e7679193b2
|
Bootstrap accordion ios
|
2019-10-01 21:59:38 +02:00 |
|
chirac
|
80328199c8
|
Merge branch 'better-vouchers' into 'dev'
Better vouchers
See merge request federez/re2o!444
|
2019-10-01 19:35:16 +02:00 |
|
Hugo Levy-Falk
|
6171f42b66
|
Get the right mandate when creating voucher.
|
2019-10-01 19:30:35 +02:00 |
|
Hugo Levy-Falk
|
5c0a4ce748
|
Fix form validation
|
2019-10-01 19:30:35 +02:00 |
|
Gabriel Detraz
|
b38521db69
|
For my klafy : return best mandate possible
|
2019-10-01 19:30:34 +02:00 |
|
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 |
|