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

3135 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Laouen Fernet
62d09760b3 add translations for machines/ 2019-01-12 16:56:15 +01:00
Laouen Fernet
9683e0d688 add translations for logs/ 2019-01-12 16:56:15 +01:00
Laouen Fernet
2012f20352 add translations for cotisations/ 2019-01-12 16:56:14 +01:00
Laouen Fernet
950272dc18 add translations for api/ 2019-01-12 15:03:55 +01:00
chirac
54a5dca858 Merge branch 'fix_radius_option_validation' into 'dev' 
Fix radius options, force to set a vlan when adding a policy which requires it.

See merge request federez/re2o!392
 2019-01-11 16:11:11 +01:00
Hugo LEVY-FALK
c92b68872e Fix radius options, force to set a vlan when adding a policy which requires it. 2019-01-11 16:08:30 +01:00
chirac
3443965e37 Merge branch 'fix_aesfield_error' into 'dev' 
Fix error message when failing to decode an aes_key.

See merge request federez/re2o!393
 2019-01-11 16:08:21 +01:00
Hugo LEVY-FALK
2ea0d77eb2 Fix error message when failing to decode an aes_key. 2019-01-11 16:08:00 +01:00
chirac
88416a28b4 Merge branch 'fix_invoiceedit_page' into 'dev' 
Fix invoice edit page, discount title is only displayed when needed.

See merge request federez/re2o!394
 2019-01-11 15:22:18 +01:00
Hugo LEVY-FALK
4721d8763c Fix invoice edit page, discount title is only displayed when needed. 2019-01-11 14:10:34 +01:00
klafyvel
79864180ab Merge branch 'pseudo_insensitive' into 'dev' 
Case insensitive search

See merge request federez/re2o!390
 2019-01-10 17:57:20 +01:00
Gabriel Detraz
dc83766b5c Case insensitive search 2019-01-10 16:11:06 +01:00
chirac
7da4021a7b Merge branch 'machine_anonymize' into 'dev' 
Machine anonymize

See merge request federez/re2o!389
 2019-01-09 19:29:03 +01:00
Grizzly
cbd85ff0eb Suppression de l'historique 2019-01-09 18:14:06 +00:00
Grizzly
2524c09e8e Exclusion d'users, anonymisation machine et domaines 2019-01-09 17:46:21 +00:00
klafyvel
3ce8815c0d Merge branch 'fix_197' into 'dev' 
Avoid crash when 'email' field is not here

See merge request federez/re2o!388
 2019-01-05 23:23:09 +01:00
Gabriel Detraz
84889388c9 Avoid crash when 'email' field is not here 2019-01-05 23:13:28 +01:00
klafyvel
6bf29f0c74 Merge branch 'fix_194' into 'dev' 
Fix 194

See merge request federez/re2o!387
 2019-01-05 23:13:07 +01:00
Gabriel Detraz
0b1c35900f Ajoute un reglage pour set tous les comptes actifs à l'initialisation 2019-01-05 18:33:26 +01:00
Gabriel Detraz
20e1ee3bb4 A granted user can set active at creation 2019-01-05 16:20:15 +01:00
chirac
4f2c1dcbb4 Merge branch 'hotfix_serializer' into 'dev' 
Fix crash of optionaltopologie serializer

See merge request federez/re2o!386
 2019-01-04 12:38:25 +01:00
detraz
edf89dac98 Fix crash of optionaltopologie serializer 2019-01-04 12:31:10 +01:00