8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 04:43:10 +00:00
Commit graph

2169 commits

Author SHA1 Message Date
Maxime Bombar
7679975c77 [cotisations] Replace Float by Decimal everywhere 2018-10-02 02:22:04 +02:00
Maxime Bombar
0f1c79cb29 s/teh/the 2018-10-02 02:11:05 +02:00
Maxime Bombar
5ca0b644ea [Printer] Add new Job status 2018-10-02 02:11:05 +02:00
Maxime Bombar
ee9827deda Move printing_path from models to utils 2018-10-02 02:11:05 +02:00
Maxime Bombar
6181c2749b [Printer] Create payment & invoice 2018-10-02 02:11:05 +02:00
Maxime Bombar
752b0ffc4c [Printer] Populate printAs with request.user if None 2018-10-02 02:11:05 +02:00
Maxime Bombar
6de3a13ded set FILE_UPLOAD_MAX_MEMORY_SIZE = 0 for printer app 2018-10-02 02:11:05 +02:00
Maxime Bombar
b108327d3f Printer app needs poppler-utils 2018-10-02 02:11:05 +02:00
Maxime Bombar
f47e1835b3 Compute job price 2018-10-02 02:10:05 +02:00
Maxime Bombar
4d308010d9 Price is a decimal field 2018-10-02 02:10:05 +02:00
Maxime Bombar
0873ad7935 [Printer] Upload file to print and manages options 2018-10-02 02:10:05 +02:00
Maxime Bombar
5f4218f3bf [Printer] Move printer urlpatterns into optional urls 2018-10-02 02:10:05 +02:00
Maxime Bombar
7c1180af7e [printer] Add context_processors in settings.py 2018-10-02 02:10:05 +02:00
Maxime Bombar
56d8d5f3b3 [printer] New migration 2018-10-02 02:10:05 +02:00
Maxime Bombar
2912f9dcf8 Printer app really is optionnal 2018-10-02 02:10:05 +02:00
Maxime Bombar
918721a78c Login is required to use the printer 2018-10-02 02:07:43 +02:00
Maxime Bombar
0a20ee3457 Printer is an optional app 2018-10-02 02:07:43 +02:00
Maxime Bombar
f80b1aa97b [printer] Update settings.py (temporary) 2018-10-02 02:07:43 +02:00
Maxime Bombar
e6c36cb507 [Printer] Minor Fixes 2018-10-02 02:07:43 +02:00
Maxime Bombar
256a974c4c printer/migrations 2018-10-02 02:07:43 +02:00
Maxime Bombar
a7d5686f11 Printer App a beginning. 2018-10-02 02:07:43 +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
Alexandre Iooss
0f7f14c1ea Fix Font Awesome icons
Some icons had their id changed in the Debian version (4.7.0) so their
id need to be updated.

Also the width of an icon in a button was reduced to make it more
compact.
2018-09-27 22:23:45 +02:00
grizzly
8045645502 Merge branch 'switch_conf' into 'dev'
Switch conf

See merge request federez/re2o!308
2018-09-27 16:34:59 +02:00
detraz
42d2f80470 Fix divers 2018-09-27 16:32:21 +02:00
Antoine Vintache
6652e33d8c Modification , utilisation de history button 2018-09-27 16:32:21 +02:00
Antoine Vintache
1ffb481aef Ajout de l'affichage des switchs dans la liste des modèles de switchs. 2018-09-27 16:32:21 +02:00
Gabriel Detraz
eded66beb0 Gestion des switchs à provisioner automatiquement 2018-09-27 16:32:21 +02:00
detraz
b44021a98b Fix bugs et simplifie les migrations de switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
bd58c259ee Et la migration pour sftp 2018-09-27 16:32:21 +02:00
Gabriel Detraz
8a22dc1e02 Mode de provision sftp 2018-09-27 16:32:21 +02:00
Gabriel Detraz
3c22ea4e89 Export de l'ensemble des ip du switch 2018-09-27 16:32:21 +02:00
Gabriel Detraz
ae0f134cc7 Crée spécific role, l'utilise pour get l'ip du serveur des config switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
6c41f90398 N'affiche pas la clef radius en clair dans le menu preferences 2018-09-27 16:32:21 +02:00
Gabriel Detraz
c12b3575dd Bricoles d'affichage 2018-09-27 16:32:21 +02:00
Gabriel Detraz
ca2e0172a1 Serialisation pour export vers re2o-services 2018-09-27 16:32:21 +02:00
Gabriel Detraz
b4af276b14 Stockage des creds d'identification des switchs 2018-09-27 16:32:21 +02:00