rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 15:33:45 +00:00
Code Issues Releases Wiki Activity
2202 commits 211 branches 14 tags 12 MiB
Commit graph

2202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxime Bombar
8f23bada4b [Users] Archive and Disabled accounts can't reset their passords 2018-10-31 12:45:04 +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
klafyvel
fd12561761 Merge branch 'fix_cleanaccounts' into 'dev' 
Fix suppression machines + factures

See merge request federez/re2o!333
 2018-10-14 16:45:31 +02:00
detraz
355e5d5a5e Fix suppression machines + factures 2018-10-13 15:32:27 +02:00
chirac
d93dccb9f8 Merge branch 'Hotfix_API_Delete_Old_Fields_Serializers' into 'dev' 
[API/serializers.py] Get rid of Old Fields that doesn't exist anymore

See merge request federez/re2o!331
 2018-10-13 13:18:58 +02:00
Maxime Bombar
e4cd4e3c0a [API/serializers] Get rid of old fields in OptionalUserSerializer 2018-10-13 13:18:32 +02:00
Maxime Bombar
23351a501d [API/serializers] Get rid of old 'type_paiement' field in PaiementSerializer 2018-10-13 13:18:31 +02:00
Maxime Bombar
16170ef024 [API/serializers.py] Get rid of Old Fields that doesn't exist anymore 2018-10-13 13:18:31 +02:00
chirac
e631624d79 Merge branch 'sw_commercial_name' into 'dev' 
Add commercial name to switchs.

See merge request federez/re2o!330
 2018-10-13 13:18:21 +02:00
Antoine Vintache
e8a767c331 Add commercial name to switchs. 2018-10-11 19:53:23 +02:00
klafyvel
7a28d1e225 Merge branch 'delete_notyetactive' into 'dev' 
Commande manage pour supprimer les users pas encore actifs

See merge request federez/re2o!329
 2018-10-11 15:33:49 +02:00
detraz
40eb6f146c Commande manage pour supprimer les users pas encore actifs 2018-10-11 15:15:00 +02:00
chirac
3c14729cc0 Merge branch 'hotfix_purchase_post_save' into 'dev' 
Hotfix : recupération de l'user lors d'une cotisation en post_save de Vente

See merge request federez/re2o!327
 2018-10-11 15:14:20 +02:00
Hugo LEVY-FALK
5431e20629 Hotfix : recupération de l'user lors d'une cotisation en post_save de Vente 2018-10-11 15:13:49 +02:00
chirac
da91394163 Merge branch 'Hotfix_API' into 'dev' 
Add base_name to distinguish users/user and users/homecreation API endpoints

See merge request federez/re2o!328
 2018-10-11 13:22:47 +02:00
Maxime Bombar
579763131a Add base_name to distinguish users/user and users/homecreation API endpoints 2018-10-11 13:16:55 +02:00
klafyvel
17d186f56d Merge branch 'js_delete_handlebars' into 'dev' 
Delete handlebars JavaScript library

See merge request federez/re2o!307
 2018-10-06 11:35:13 +02:00
Alexandre Iooss
6faa1931c7 Delete handlebars JavaScript library 
It seems this library is useless and might even interfere with Django
templates during debug if something isn't rendered properly.
 2018-10-06 11:31:35 +02:00
klafyvel
69d1515aab Merge branch 'cleanup_api' into 'dev' 
Clean up of API code

See merge request federez/re2o!309
 2018-10-06 11:10:57 +02:00
Alexandre Iooss
d673e4d54d Clean up of API code 
Automatic clean up that checks Python 2.7 compatibility, switch some
methods to static and rearrange code.
 2018-10-06 11:07:45 +02:00
klafyvel
ee2ee0ad12 Merge branch 'cleanup_machines' into 'dev' 
Clean up of machines

See merge request federez/re2o!310
 2018-10-06 11:04:01 +02:00
Alexandre Iooss
48d5ab108c Autoformat code 2018-10-06 11:00:37 +02:00
Alexandre Iooss
1e9a4b3d32 Autoformat templates 2018-10-06 11:00:37 +02:00
Fardale
92e66bb18f Merge branch 'fix_trad_and_autocapture' into 'dev' 
Traductions, style et fixe de bugs sur la page d'enregistrement mac/room

See merge request federez/re2o!322
 2018-10-05 22:00:03 +02:00
Fardale
52818dab63 Correct typo with get_port_profile 2018-10-05 21:48:06 +02:00
Gabriel Detraz
a933cda18f Traductions, style et fixe de bugs sur la page d'enregistrement mac/room 2018-10-05 21:29:48 +02:00
chirac
152b0a6421 Merge branch 'hotfix_typo_get_port_profile' into 'dev' 
Hotfix typo get port profile

See merge request federez/re2o!324
 2018-10-05 21:20:21 +02:00
Hugo LEVY-FALK
f8ba60087e Hotfix : Typo dans le hotfix de la typo 2018-10-05 21:19:20 +02:00