rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 04:43:10 +00:00
Code Issues Releases Wiki Activity
2334 commits 211 branches 14 tags 12 MiB
Commit graph

2334 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Hugo LEVY-FALK
e84c2a4f48 Hotfix : Typo dans le nom de get_port_profile 2018-10-05 21:19:20 +02:00
Hugo LEVY-FALK
6491fb0247 Hotfix : Typo dans le nom de get_port_profile 2018-10-05 21:19:20 +02:00
klafyvel
3db4f837a4 Merge branch 'refill_balance' into 'dev' 
[cotisations] Replace Float by Decimal everywhere

See merge request federez/re2o!323
 2018-10-03 22:36:34 +02:00
Maxime Bombar
5c8e90fde8 [cotisations] Replace Float by Decimal everywhere 2018-10-03 22:01:30 +02:00
chirac
f6dc63aac2 Merge branch 'reminder-display' into 'dev' 
ffichage des reminders dans les preferences

See merge request federez/re2o!321
 2018-09-30 20:36:47 +02:00
grisel-davy
d78c5f30d2 ffichage des reminders dans les preferences 2018-09-30 20:31:07 +02:00
chirac
064ec73cbc Merge branch 'fix_portprofile' into 'dev' 
Frontend fix sur les editions de profils de port

See merge request federez/re2o!320
 2018-09-29 23:35:53 +02:00
detraz
1774bcf82b Frontend fix sur les editions de profils de port 2018-09-29 23:34:38 +02:00
chirac
54273c29ee Merge branch 'fix_divers_front' into 'dev' 
Fix edition des roles + kwargs edition user

See merge request federez/re2o!319
 2018-09-29 22:59:19 +02:00
Gabriel Detraz
7d6ab9f7e7 Fix edition des roles + kwargs edition user 2018-09-29 22:53:17 +02:00
chirac
b6ded7720a Merge branch 'reminder-serializer' into 'dev' 
serialization des rappel de fin de connexion

See merge request federez/re2o!317
 2018-09-29 16:53:27 +02:00
grisel-davy
e723ce018d serialization des rappel de fin de connexion 2018-09-29 16:50:04 +02:00
chirac
7575453126 Merge branch 'fix_typo_ap' into 'dev' 
Fixe une typo sur les bornes wifi -> access_point

See merge request federez/re2o!316
 2018-09-28 18:30:21 +02:00
detraz
8dd4473d15 Fixe une typo sur les bornes wifi -> access_point 2018-09-28 18:15:29 +02:00
chirac
bbf77adda4 Merge branch 'frontend_fix_fa_footer' into 'dev' 
Fix Font Awesome icons and footer

See merge request federez/re2o!315
 2018-09-28 14:20:00 +02:00
Alexandre Iooss
129d22d7c5 Change Glyphicon to Font Awesome on login page 2018-09-28 12:37:49 +02:00
Alexandre Iooss
26e68a0ac0 Fix footer not being on footer 2018-09-28 12:37:23 +02:00
Alexandre Iooss
7f6e300033 Fix right sidebar when user is disconnected 2018-09-27 22:35:04 +02:00