8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-02 04:04:06 +00:00
Commit graph

2344 commits

Author SHA1 Message Date
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
grizzly d31a1e6e63 Merge branch 'generate_traduction' into 'dev'
Remove generated locales from git tree

See merge request federez/re2o!362
2018-12-10 17:10:15 +01:00
Alexandre Iooss 29fb5dc848 Remove generated locales from git tree
Now compiled locale files (.mo) are generated on the server side.
This cleans up the git tree and make translation contributions much
easier to merge.

Please note that you will need to generate those files after each pull,
so remember to execute install_re2o.sh.
2018-12-10 13:14:56 +01:00
chirac d9dc5fc7ce Merge branch 'feature_pre_subscribtion_vlan' into 'dev'
VLAN de pré-rézotage.

See merge request federez/re2o!288
2018-12-09 00:11:23 +01:00
Hugo LEVY-FALK a15d50bebe RadiusOption Display 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 789a648bd0 cached values for radius policies 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 7e9de612fa Prettier display of vlan OK 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 0e2f1258d4 Add PreferencesModel as ancestor of RadiusOption 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK b2be55a909 Typo sur la vérification de bannissement. 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 2702d7c116 Radius opers according to policies. 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 6df47b08ec Adapt preferences' display to new model layout 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK b269a5f6ef Allow policies editions through form 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 9506bd4002 Fixing migrations is more a way of life than a way to have fun. 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK f0736ebc39 Allow policies edition 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK a773f5d717 Pre-subscription VLAN 2018-12-09 00:10:59 +01:00
Hugo LEVY-FALK 7a26aadaa9 fix migrations. 2018-12-09 00:10:59 +01:00
chirac ab52279e20 Merge branch 'limit_machine' into 'dev'
machines prise en compte pour l'ajout automatique

See merge request federez/re2o!361
2018-12-09 00:10:42 +01:00
Grizzly c5b3f50955 Suppression de la ligne inutile 2018-12-08 23:56:59 +01:00
Grizzly ae5ef6a3c5 Utilise l'acl pour la vérification de la possibilité de création 2018-12-08 23:56:59 +01:00
Grizzly d17e71c53c machines prise en compte pour l'ajout automatique 2018-12-08 23:56:59 +01:00
klafyvel bcc4b3f0ab Merge branch 'fix_table_scrolling_horizontally' into 'dev'
Fixed tables scrolling when opening menus

See merge request federez/re2o!360
2018-12-08 22:22:11 +01:00
edpibu c984f2acc2 Fixed tables scrolling when opening menus
modifié :         static/css/base.css
2018-12-08 22:17:45 +01:00
chirac 9d3fc3a5c9 Merge branch 'front_pref' into 'dev'
Front pref

See merge request federez/re2o!359
2018-12-06 17:18:27 +01:00
Grizzly 3f63cb4b8f Espacement des boutons 2018-12-05 17:32:24 +00:00
Grizzly dd2421411f Espacement des boutons 2018-12-03 21:31:50 +00:00