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

2407 commits

This branch
This branch
All branches
Author SHA1 Message Date
chirac
bd079b2756 Doc in english dormitory views.py 2019-02-20 20:46:28 +01:00
detraz
c346ca531a Display residence if residence>1 2019-02-19 00:54:11 +01:00
detraz
87730a3ad2 Fix room_name problem with building 2019-02-18 22:13:34 +01:00
detraz
8d799ed92d Create dormitory with buildings 2019-02-18 21:11:51 +01:00
grizzly
565f57967c Merge branch 'update_translation_files' into 'dev' 
Update translation files

See merge request federez/re2o!409
 2019-02-12 09:42:36 +01:00
Alexandre Iooss
56ec7a2df5 Update translation files 2019-02-12 09:12:45 +01:00
Hugo LEVY-FALK
ca1005d58c Merge branch 'master' into dev 2019-02-07 19:09:51 +01:00
Hugo LEVY-FALK
a8dbe4621f Release : 2.7 2019-02-07 18:48:46 +01:00
klafyvel
833d7177e9 Merge branch 'radius_asci' into '2.7' 
Fix : All message in asci...

See merge request federez/re2o!404
 2019-02-07 18:30:55 +01:00
Gabriel Detraz
824fd0c51e Fix : All message in asci... 2019-02-07 15:17:35 +01:00
grizzly
02dba09972 Merge branch 'frontend_various_fixes' into 'dev' 
Frontend various fixes

See merge request federez/re2o!395
 2019-01-28 11:27:31 +01:00
Alexandre Iooss
0d4b86f5c1 Make alternatives for favicon 
Make alternatives for favicon to support a wider range of device.
It includes favicon for iOS, Android, MacOS touchbar.
It also fixes the favicon on Chromium/Chrome variants.
 2019-01-28 11:12:05 +01:00
Alexandre Iooss
6780b91fe2 Make 'Manage the club' panel hover like other panels 2019-01-28 11:12:05 +01:00
klafyvel
522b5be317 Merge branch 'mac_vendor' into 'dev' 
Mac vendor

See merge request federez/re2o!403
 2019-01-27 12:16:22 +01:00
Grizzly
e024560729 Meilleur gestion d'erreur 2019-01-27 10:38:43 +00:00
Grizzly
e1fa749039 Determine et affiche le vendeur de la mac (wip sur le except) 2019-01-27 09:39:18 +00:00
klafyvel
eacad3bdb9 Merge branch 'active_machine' into 'dev' 
Texte et couleur pour les machines désactivées

See merge request federez/re2o!402
 2019-01-26 13:24:52 +01:00
klafyvel
ee7c1272b1 Translation for deactivated 2019-01-26 13:08:59 +01:00
Grizzly
9b05f8fa98 Texte et couleur pour les machines désactivées 2019-01-24 18:00:20 +00:00
chirac
6e20c134f9 Merge branch 'hotfix_radius' into '2.7' 
Hotfix radius

See merge request federez/re2o!399
 2019-01-23 21:37:15 +01:00
chirac
b6465f2e89 Merge branch 'hotfix_radius' into 'dev' 
Hotfix radius

See merge request federez/re2o!400
 2019-01-23 21:37:06 +01:00
Hugo LEVY-FALK
0e79ab4e01 Fix vlan id 2019-01-23 21:30:17 +01:00
Hugo LEVY-FALK
d26bf4dc97 fix encoding 2019-01-23 21:02:35 +01:00
klafyvel
beae8ee83e Merge branch 'dev' into '2.7' 
Dev

See merge request federez/re2o!398
 2019-01-23 00:08:39 +01:00
klafyvel
4f9e0f8a8c Merge branch 'mac_uniq' into 'dev' 
Mac_address is now uniq in one ip range

See merge request federez/re2o!397
 2019-01-23 00:01:18 +01:00
detraz
67b702f171 Mac_address is now uniq in one ip range 2019-01-22 23:41:06 +01:00
chirac
411467a520 Merge branch 'feature_document_templates' into 'dev' 
Feature document templates

See merge request federez/re2o!391
 2019-01-21 21:03:38 +01:00
Hugo LEVY-FALK
31ba9a271f Fix get_subscription of invoice. 2019-01-21 20:52:28 +01:00
Hugo LEVY-FALK
bc758a6bcb Retire le lien vers les templates dans la sidebar de cotisations 2019-01-21 09:12:06 +01:00
Hugo LEVY-FALK
4fef4a6057 Déplace les templates dans préférences. 2019-01-21 00:54:02 +01:00
Hugo LEVY-FALK
f4b6f10d1e attribut name unique 2019-01-21 00:08:53 +01:00
Hugo LEVY-FALK
ddc2c6e380 Suppression des anciens templates lors de la mise à jour 2019-01-20 19:32:29 +01:00
Hugo LEVY-FALK
985a2f4a52 Choix de l'envoi du reçu par mail 2019-01-20 19:08:11 +01:00
Hugo LEVY-FALK
f43b985966 Meilleure gestion des default pour les templates invoice et voucher 2019-01-20 18:53:25 +01:00
Hugo LEVY-FALK
1fcf90b698 fix migrations 2019-01-20 17:47:01 +01:00
detraz
d323ed5937 Start date set au moment de la validation de la facture 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
124421e011 Fix migrations 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
ebdb45507a CHANGELOG 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
b83bfc0da9 Fix #123 Subscription voucher 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
713b4b5c66 Fix queryset for HostMacIpView 2019-01-20 16:41:11 +01:00
Hugo LEVY-FALK
48d8d7921d subscripbtion voucher 2019-01-20 16:41:11 +01:00
Hugo LEVY-FALK
0a8335c375 Enable template selection for invoices. 2019-01-20 16:41:11 +01:00
Hugo LEVY-FALK
6fdf8a0406 Add Document templates to re2o 2019-01-20 16:41:11 +01:00
chirac
1cc5d7bba0 Merge branch 'translation' into 'dev' 
Translation

See merge request federez/re2o!396
 2019-01-20 15:03:46 +01:00
Laouen Fernet
1c28c2d1bc add translations for users/ 2019-01-12 16:56:18 +01:00
Laouen Fernet
69d80fcdb0 add translations for topologie/ 2019-01-12 16:56:17 +01:00
Laouen Fernet
4a8c161edc add translations for templates/ 2019-01-12 16:56:17 +01:00
Laouen Fernet
cd2e39c480 add translations for search/ 2019-01-12 16:56:17 +01:00
Laouen Fernet
3f601d74d1 add translations for re2o/ 2019-01-12 16:56:16 +01:00
Laouen Fernet
77e62df3b8 add translations for preferences/ 2019-01-12 16:56:16 +01:00