rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00
Code Issues Releases Wiki Activity
2460 commits 211 branches 14 tags 12 MiB
Commit graph

2460 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Grizzly
aff96b6541 Ajout du champ mail lors de la création d'un club 2018-11-08 19:56:38 +00:00
Gabriel Detraz
7e0d5fdbce Bug fix, le chiffrement/déchiffrement AES marche en python2 aussi 2018-11-08 02:48:33 +01:00
detraz
de04a7ce40 Remplace raise par un appel aux fonction freeradius 2018-11-05 14:26:46 +01:00
chirac
be2657ea59 Merge branch 'web_redirect_fil' into 'dev' 
Web redirect fil

See merge request federez/re2o!351
 2018-11-05 14:22:41 +01:00
Gabriel Detraz
e829ea609e Python legacy 2018-11-05 14:21:55 +01:00
Gabriel Detraz
84797ff5dd Remonte le reject au niveau du dessus 2018-11-05 14:20:13 +01:00
Gabriel Detraz
30ac32efb7 Activation de la capture de mac en filaire 2018-11-05 14:20:07 +01:00
chirac
08f21fe517 Merge branch 'fix_ip_mac' into 'dev' 
Reparation ip search + formatage exact des macs

See merge request federez/re2o!350
 2018-11-03 19:28:12 +01:00
Gabriel Detraz
d2f80bb39e Reparation ip search + formatage exact des macs 2018-11-03 19:27:54 +01:00
chirac
a0edac376e Merge branch 'typo' into 'dev' 
fix typo in users/locale/fr/LC_MESSAGES/django.po

See merge request federez/re2o!349
 2018-11-03 13:43:05 +01:00
Fardale
faf3b16018 add compile file …... . . . 2018-11-03 13:21:09 +01:00
Fardale
386708c963 fix typo in users/locale/fr/LC_MESSAGES/django.po 2018-11-03 13:10:38 +01:00
chirac
b710e2a56a Merge branch 'Filter_Articles_non_members' into 'dev' 
Filter articles non members

See merge request federez/re2o!348
 2018-11-01 23:45:33 +01:00
Maxime Bombar
baa2369436 Non member can't buy connexion : They need to pay membership 2018-11-01 23:40:11 +01:00
Maxime Bombar
b3dc063c20 Refactor welcome email : You're not a member if you didn't pay for membership 2018-11-01 23:40:11 +01:00
klafyvel
c8867e4b53 Merge branch 'mail_reminder' into 'dev' 
utilisation de get_mail au lieu de email

See merge request federez/re2o!347
 2018-11-01 11:15:09 +01:00
grisel-davy
cb45f40821 utilisation de get_mail au lieu de email 2018-10-31 20:57:55 +01:00