chirac
|
f8dbea79a9
|
Merge branch 'hotfix_bootstrap' into 'dev'
Hotfix boostrapform
See merge request federez/re2o!385
|
2019-01-02 15:20:30 +01:00 |
|
Gabriel Detraz
|
4ac403ec29
|
Hotfix boostrapform
|
2019-01-02 15:19:23 +01:00 |
|
chirac
|
67445717ea
|
Merge branch 'fix_ipv6_clean_from_dev_is_better' into 'dev'
Prevents from crashing where there is no defined prefix_v6
See merge request federez/re2o!384
|
2019-01-01 21:15:03 +01:00 |
|
Maxime Bombar
|
c76a5d2376
|
Prevents from crashing where there is no defined prefix_v6
|
2019-01-01 21:09:34 +01:00 |
|
klafyvel
|
de068f6c4c
|
Merge branch 'sw_port_number' into 'dev'
Sw port number
See merge request federez/re2o!375
|
2019-01-01 20:22:45 +01:00 |
|
Hugo LEVY-FALK
|
21f54486b2
|
Fix switch creation
|
2019-01-01 20:17:27 +01:00 |
|
Hugo LEVY-FALK
|
71dc9c9bd1
|
Remove code about radius in OptionalTopology edit form.
|
2019-01-01 19:32:40 +01:00 |
|
klafyvel
|
c238a9a2fa
|
Remove useless variable in create_ports and give explicit name to s_end.
|
2019-01-01 19:10:34 +01:00 |
|
klafyvel
|
7ddb627b6b
|
Do not create an useless list since set can be created from any iterable.
|
2019-01-01 19:10:34 +01:00 |
|
Gabriel Detraz
|
92e6ae45ad
|
Refactor aussi la fonction du views pour la route
|
2019-01-01 19:10:33 +01:00 |
|
Gabriel Detraz
|
e172923578
|
Fix #103
|
2019-01-01 19:10:33 +01:00 |
|
klafyvel
|
f27f952143
|
Merge branch 'collapse_from_url' into 'dev'
Make URL hash control Bootstrap collapse
See merge request federez/re2o!378
|
2019-01-01 19:07:38 +01:00 |
|
Alexandre Iooss
|
3ed137cf31
|
Paginator styling and go to id feature
|
2019-01-01 18:53:11 +01:00 |
|
Alexandre Iooss
|
45cda20c71
|
Rename user profile collapses
|
2019-01-01 18:53:11 +01:00 |
|
Alexandre Iooss
|
4de9c1efd2
|
Make URL hash control Bootstrap collapse
|
2019-01-01 18:53:11 +01:00 |
|
chirac
|
125c4244bc
|
Merge branch 'feature_improve_invoice' into 'dev'
Feature improve invoice
See merge request federez/re2o!382
|
2019-01-01 18:45:52 +01:00 |
|
Hugo LEVY-FALK
|
37dbfd2fbf
|
Add Cost Estimates
|
2019-01-01 18:09:58 +01:00 |
|
Hugo LEVY-FALK
|
b85384b226
|
Do not fail on empty discount
|
2019-01-01 18:09:58 +01:00 |
|
Hugo LEVY-FALK
|
f612e4192f
|
Add remark to custom invoices
|
2019-01-01 18:09:58 +01:00 |
|
Hugo LEVY-FALK
|
fd57a9b925
|
Display payment method on invoices
|
2019-01-01 18:09:58 +01:00 |
|
Hugo LEVY-FALK
|
e7a7e81a2c
|
Add discount for custom invoices.
|
2019-01-01 18:09:58 +01:00 |
|
chirac
|
81b7a7c4af
|
Merge branch 'hotfix_autocreate' into 'dev'
Hotfix autocreate
See merge request federez/re2o!380
|
2018-12-31 00:14:29 +01:00 |
|
detraz
|
58ede00696
|
Hotfix autocreate
|
2018-12-31 00:13:01 +01:00 |
|
chirac
|
2a42a5e4d2
|
Merge branch 'fix_migration_0056' into 'dev'
Split migration 0056
See merge request federez/re2o!376
|
2018-12-30 15:01:51 +01:00 |
|
Gabriel Detraz
|
7318ee4758
|
Rename migration + revert function radiusoption
|
2018-12-30 14:56:48 +01:00 |
|
Alexandre Iooss
|
509390590b
|
Split migration 0056
We can not change structure and migrate data at the same time on some db
engines. So this commit splits the operation.
|
2018-12-30 13:28:19 +01:00 |
|
chirac
|
93215eb0a9
|
Merge branch 'frontend_profile' into 'dev'
Use a detailed list rather than a table on profile
See merge request federez/re2o!377
|
2018-12-30 13:07:51 +01:00 |
|
Alexandre Iooss
|
5ae1a53172
|
Add lines to split profile information
|
2018-12-30 12:35:41 +01:00 |
|
Alexandre Iooss
|
573e6c2ad2
|
Use a detailed list rather than a table on profile
|
2018-12-30 12:06:20 +01:00 |
|
klafyvel
|
a798b81fed
|
Merge branch 'asso_user' into 'dev'
Fix #150 : l'utilisateur asso et ses machines ont toujours accès à internet
See merge request federez/re2o!372
|
2018-12-29 20:42:46 +01:00 |
|
Gabriel Detraz
|
97593920e5
|
Fix #150 : l'utilisateur asso et ses machines ont toujours accès à internet
|
2018-12-29 20:36:08 +01:00 |
|
chirac
|
22c30c2775
|
Merge branch 'fix_custom_invoice' into 'dev'
Fix custom invoice
See merge request federez/re2o!371
|
2018-12-28 23:32:12 +01:00 |
|
Hugo LEVY-FALK
|
70a5996f5d
|
Fix available articles
|
2018-12-28 23:30:39 +01:00 |
|
klafyvel
|
f54cbc1a38
|
Merge branch 'gpg_fp' into 'dev'
Gpg fp
See merge request federez/re2o!370
|
2018-12-28 23:29:49 +01:00 |
|
Gabriel Detraz
|
e076c1da33
|
Re match direct
|
2018-12-28 23:23:22 +01:00 |
|
Gabriel Detraz
|
bfd79d44eb
|
Fix #192 : Gpgfp validation et formatage
|
2018-12-28 20:59:29 +01:00 |
|
Gabriel Detraz
|
e0fc3d3846
|
Menage ordre des fonctions du forms de users
|
2018-12-28 20:33:07 +01:00 |
|
klafyvel
|
201b87f38e
|
Merge branch 'upper_case_pseudo' into 'dev'
No more pseudo with uppercase
See merge request federez/re2o!369
|
2018-12-27 22:00:44 +01:00 |
|
Gabriel Detraz
|
e2845c4690
|
No more pseudo with uppercase
|
2018-12-27 21:43:46 +01:00 |
|
klafyvel
|
a6c590dc90
|
Merge branch 'dnssec_extension' into 'dev'
[machines] Added a dnssec field to Extension
See merge request federez/re2o!368
|
2018-12-27 21:42:10 +01:00 |
|
Benjamin Graillot
|
762091f2a4
|
[machines] Fix extension template
|
2018-12-24 15:13:48 +01:00 |
|
Benjamin Graillot
|
f0c13edf4b
|
[machines] Added a dnssec field to Extension
|
2018-12-24 15:01:19 +01:00 |
|
chirac
|
7b50419a82
|
Merge branch 'fix_ipv6_none' into 'dev'
Ipv6 : Renvoie une liste vide plutot que None (évalué à null quand meme)
See merge request federez/re2o!367
|
2018-12-23 18:50:21 +01:00 |
|
Gabriel Detraz
|
9e67fc5574
|
Ipv6 : Renvoie une liste vide plutot que None (évalué à null quand meme)
|
2018-12-23 18:50:04 +01:00 |
|
klafyvel
|
965ec1ab69
|
Merge branch 'fix_initial_serviceuser' into 'dev'
Fix initial password for serviceuser
See merge request federez/re2o!366
|
2018-12-22 21:46:39 +01:00 |
|
Gabriel Detraz
|
bf4f46ef19
|
Fix initial password for serviceuser
|
2018-12-22 21:30:48 +01:00 |
|
klafyvel
|
dfc2eecae6
|
Merge branch 'search_function' into 'dev'
Add start date recherche adhérents
See merge request federez/re2o!365
|
2018-12-22 21:24:45 +01:00 |
|
detraz
|
fc18a37fbf
|
Add start date recherche adhérents
|
2018-12-22 00:35:39 +01:00 |
|
grizzly
|
d7c2b2f5e8
|
Merge branch 'hotfix_radius_option_cache' into 'dev'
hotfix : do not fail if vlan policy is not set.
See merge request federez/re2o!364
|
2018-12-12 13:01:17 +01:00 |
|
Hugo LEVY-FALK
|
50bdeefdee
|
hotfix : do not fail if vlan policy is not set.
|
2018-12-12 10:33:10 +01:00 |
|