8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-05-16 23:56:12 +00:00
Commit graph

2271 commits

Author SHA1 Message Date
Maxime Bombar 6d1828cbe5 Fix issue #182 2018-12-22 00:54:49 +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
Grizzly bb57aa3bd0 Icones et heading cliquables 2018-12-03 20:32:18 +00:00
Grizzly 42bbdb67c7 Accordéon complet et suppression de la sidebar 2018-12-01 16:11:17 +00:00
Grizzly 58006000fe Premier changement en accordéon 2018-12-01 14:42:38 +00:00
Grizzly 817e965937 Navigation dans les préférences 2018-12-01 11:59:17 +00:00
grizzly 57a14afe0b Merge branch 'users_base_serialize' into 'dev'
Export users basic et critical

See merge request federez/re2o!357
2018-11-17 20:22:12 +01:00
detraz 93e2424da7 Export users basic et critical 2018-11-17 19:51:37 +01:00
grizzly f6ac6e4c85 Merge branch 'fix_bugs_divers' into 'dev'
Fix bugs divers

See merge request federez/re2o!356
2018-11-16 17:36:00 +01:00
Gabriel Detraz 108f454c51 Boostrapform pour les alias et les ouvertures de ports 2018-11-15 19:55:24 +01:00
Gabriel Detraz 6c6330dd4d Séparation entre utils et base (dossier re2o) 2018-11-15 18:59:06 +01:00
Gabriel Detraz 4317c39e0c Archive users have no longer services access and ldap sync 2018-11-15 17:15:45 +01:00
Gabriel Detraz caedb09d8f Fonction de check de l'alias via smtp 2018-11-15 17:15:19 +01:00
Gabriel Detraz 6e08d3f415 Récupération correcte du sel dans le mot de passe encodé 2018-11-15 16:44:50 +01:00
Gabriel Detraz bb952c0ba0 Email field pour clubs 2018-11-15 16:44:41 +01:00
Gabriel Detraz a0dc4a15a9 Remove code mort 2018-11-15 16:23:19 +01:00
Gabriel Detraz c93cbb1b59 Serialize dname export 2018-11-15 16:13:36 +01:00
Gabriel Detraz dd9090a14b Docstrings adaptées views 2018-11-15 15:48:33 +01:00
grizzly 00fb5edce1 Merge branch 'reminder_var' into 'dev'
Variable globale pour le reminder

See merge request federez/re2o!355
2018-11-15 14:54:39 +01:00
Gabriel Detraz 0f4c7fa7e9 Variable globale pour le reminder 2018-11-15 14:37:17 +01:00
chirac 650ca56c2f Merge branch 'anonymisation' into 'dev'
Anonymisation

See merge request federez/re2o!352
2018-11-09 20:06:14 +01:00
Grizzly dd4143dbe2 Anonymisation des clubs 2018-11-09 20:05:21 +01:00
Grizzly 5bd3a929df Unification du mot de passe 2018-11-09 20:05:21 +01:00
Grizzly 0a4a0d5dd1 Anonymisation des donnée de l'utilisateur 2018-11-09 20:05:21 +01:00
chirac 5e4e9e3f76 Merge branch 'fix_mail_club' into 'dev'
Ajout du champ mail lors de la création d'un club

See merge request federez/re2o!353
2018-11-08 22:31:11 +01:00