8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Commit graph

2345 commits

Author SHA1 Message Date
chirac
3443965e37 Merge branch 'fix_aesfield_error' into 'dev'
Fix error message when failing to decode an aes_key.

See merge request federez/re2o!393
2019-01-11 16:08:21 +01:00
Hugo LEVY-FALK
2ea0d77eb2 Fix error message when failing to decode an aes_key. 2019-01-11 16:08:00 +01:00
chirac
88416a28b4 Merge branch 'fix_invoiceedit_page' into 'dev'
Fix invoice edit page, discount title is only displayed when needed.

See merge request federez/re2o!394
2019-01-11 15:22:18 +01:00
Hugo LEVY-FALK
4721d8763c Fix invoice edit page, discount title is only displayed when needed. 2019-01-11 14:10:34 +01:00
klafyvel
79864180ab Merge branch 'pseudo_insensitive' into 'dev'
Case insensitive search

See merge request federez/re2o!390
2019-01-10 17:57:20 +01:00
Gabriel Detraz
dc83766b5c Case insensitive search 2019-01-10 16:11:06 +01:00
chirac
7da4021a7b Merge branch 'machine_anonymize' into 'dev'
Machine anonymize

See merge request federez/re2o!389
2019-01-09 19:29:03 +01:00
Grizzly
cbd85ff0eb Suppression de l'historique 2019-01-09 18:14:06 +00:00
Grizzly
2524c09e8e Exclusion d'users, anonymisation machine et domaines 2019-01-09 17:46:21 +00:00
klafyvel
3ce8815c0d Merge branch 'fix_197' into 'dev'
Avoid crash when 'email' field is not here

See merge request federez/re2o!388
2019-01-05 23:23:09 +01:00
Gabriel Detraz
84889388c9 Avoid crash when 'email' field is not here 2019-01-05 23:13:28 +01:00
klafyvel
6bf29f0c74 Merge branch 'fix_194' into 'dev'
Fix 194

See merge request federez/re2o!387
2019-01-05 23:13:07 +01:00
Gabriel Detraz
0b1c35900f Ajoute un reglage pour set tous les comptes actifs à l'initialisation 2019-01-05 18:33:26 +01:00
Gabriel Detraz
20e1ee3bb4 A granted user can set active at creation 2019-01-05 16:20:15 +01:00
chirac
4f2c1dcbb4 Merge branch 'hotfix_serializer' into 'dev'
Fix crash of optionaltopologie serializer

See merge request federez/re2o!386
2019-01-04 12:38:25 +01:00
detraz
edf89dac98 Fix crash of optionaltopologie serializer 2019-01-04 12:31:10 +01:00
klafyvel
05cdb751e4 Merge branch 'fix_sw_conf' into 'dev'
Fix sw conf

See merge request federez/re2o!379
2019-01-03 01:09:27 +01:00
Hugo LEVY-FALK
af714a7f33 typo 2019-01-03 01:02:02 +01:00
Hugo LEVY-FALK
2e3be7ad56 migrations for recursive dns 2019-01-03 00:54:54 +01:00
Hugo LEVY-FALK
80b8779c55 dns-recursif-server -> dns-recursive-server 2019-01-03 00:54:13 +01:00
klafyvel
80e20d0f91 English is a beautiful language 2019-01-03 00:23:11 +01:00
Gabriel Detraz
64301bda9f Export list_modules + return [] if no models for modules 2019-01-03 00:23:11 +01:00
Gabriel Detraz
82802de477 More clear front of all switchs modular 2019-01-03 00:23:11 +01:00
Gabriel Detraz
683cf229e9 Edition fine des modules pour chaque switchs avec le slot 2019-01-03 00:23:11 +01:00
Gabriel Detraz
4dbbb00cf7 Export of modules of a switch 2019-01-03 00:23:11 +01:00
Gabriel Detraz
2c9ff4ea8e Module switch, model et fonctions basiques de modification 2019-01-03 00:23:11 +01:00
Gabriel Detraz
02229983a0 Exporte la liste des récursifs 2019-01-03 00:23:11 +01:00
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