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 |
|
klafyvel
|
c2f867ce31
|
Merge branch 'archive_accounts' into 'dev'
Archive accounts
See merge request federez/re2o!346
|
2018-10-31 18:50:11 +01:00 |
|
Maxime Bombar
|
94a30cd234
|
[Users] Archive an account disables email account and redirection
|
2018-10-31 16:30:56 +01:00 |
|
Maxime Bombar
|
e4f877bbea
|
[Users] Archived and Disabled accounts can't reset their passords
|
2018-10-31 16:17:51 +01:00 |
|
chirac
|
a9ec23c260
|
Merge branch 'fix_sw_order' into 'dev'
Fix display switchs order
See merge request federez/re2o!343
|
2018-10-27 23:32:55 +02:00 |
|
Gabriel Detraz
|
dbc15118ec
|
Fix display switchs order
|
2018-10-27 23:31:40 +02:00 |
|
klafyvel
|
006e7d1de4
|
Merge branch 'display_port' into 'dev'
FIX #183 : Display port of user
See merge request federez/re2o!342
|
2018-10-27 23:03:42 +02:00 |
|
Gabriel Detraz
|
f89d15abe0
|
Fix #183 : Display port of user
|
2018-10-27 15:26:50 +02:00 |
|
chirac
|
b024888288
|
Merge branch 'fix_divers' into 'dev'
Fix display facture + room + machine_name
See merge request federez/re2o!341
|
2018-10-15 20:00:57 +02:00 |
|
Gabriel Detraz
|
42d718ae8c
|
Fix display facture + room + machine_name
|
2018-10-15 19:57:56 +02:00 |
|
chirac
|
510d7ab3fd
|
Merge branch 'fix_room_display' into 'dev'
Fix room display, possibilité de desactiver le champ room sur register
See merge request federez/re2o!338
|
2018-10-15 19:20:44 +02:00 |
|
detraz
|
ae82289f6d
|
Fix room display, possibilité de desactiver le champ room sur register
|
2018-10-15 19:20:23 +02:00 |
|
chirac
|
5a86826979
|
Merge branch 'fix_switchs_display' into 'dev'
Affichage de la réference commerciale par default
See merge request federez/re2o!339
|
2018-10-15 19:20:06 +02:00 |
|
detraz
|
843a71be9b
|
Affichage de la réference commerciale par default
|
2018-10-15 19:19:52 +02:00 |
|
chirac
|
abde5cb41c
|
Merge branch 'del_trnoname' into 'dev'
Remplace trnoname par de meilleurs affichages
See merge request federez/re2o!340
|
2018-10-15 01:00:25 +02:00 |
|
detraz
|
c15c01448a
|
Remplace trnoname par de meilleurs affichages
|
2018-10-15 00:58:46 +02:00 |
|
klafyvel
|
3b11d351a7
|
Merge branch 'fix_179' into 'dev'
Fix #179 : permet la recherche qqsoit le format de macaddr
See merge request federez/re2o!337
|
2018-10-14 23:35:58 +02:00 |
|
detraz
|
8335e275b1
|
Fix #179 : permet la recherche qqsoit le format de macaddr
|
2018-10-14 23:31:36 +02:00 |
|
chirac
|
f803326e44
|
Merge branch 'fix_mac_uniq' into 'dev'
Fix bug dans le model mac, renvoie une liste de mac uniques
See merge request federez/re2o!336
|
2018-10-14 22:54:16 +02:00 |
|
detraz
|
63734d4923
|
Fix bug dans le model mac, renvoie une liste de mac uniques
|
2018-10-14 22:52:48 +02:00 |
|
chirac
|
ab06d4354e
|
Merge branch 'Fix_Errors_In_Api' into 'dev'
Fix errors in api
See merge request federez/re2o!332
|
2018-10-14 22:23:39 +02:00 |
|
Maxime Bombar
|
4f174f4df1
|
Fix Internal Server Errors in API
|
2018-10-14 22:13:03 +02:00 |
|
chirac
|
184732a18d
|
Merge branch 'fix_login_and_ap' into 'dev'
Fix login next + display ap
See merge request federez/re2o!335
|
2018-10-14 22:12:47 +02:00 |
|
detraz
|
a743e90d88
|
Fix , next n'est pas bien remplie
|
2018-10-14 21:05:18 +02:00 |
|
Gabriel Detraz
|
cbc2a63c2a
|
Fix login next + display ap
|
2018-10-14 20:18:12 +02:00 |
|
klafyvel
|
f5638ca425
|
Merge branch 'fix_invoice' into 'dev'
Fix name of user after invoice comnpay + acl delete invoice
See merge request federez/re2o!334
|
2018-10-14 16:56:19 +02:00 |
|
detraz
|
634527dc95
|
Fix name of user after invoice comnpay + acl delete invoice
|
2018-10-14 16:48:11 +02:00 |
|