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

3090 commits

This branch
This branch
All branches
Author SHA1 Message Date
chirac
6c6422aff3 Merge branch 'fix_upload_img' into 'master' 
Fix #106

Closes #106

See merge request federez/re2o!132
 2018-04-15 19:29:34 +02:00
Maël Kervella
98eae95632 Avoid duplicate settings and keeps comments 2018-04-15 17:26:28 +00:00
Gabriel Detraz
2337a24997 Fix #106 2018-04-15 19:09:37 +02:00
chirac
d911452ae0 Merge branch 'moamoak/pep8_and_pylint' into 'master' 
Pep8 and Pylint cleaning

See merge request federez/re2o!127
 2018-04-15 17:52:45 +02:00
Maël Kervella
f7f8f7493b Fix : various little things 2018-04-15 13:34:51 +00:00
Maël Kervella
6c30c36943 Fix : missing migrations 2018-04-15 10:54:53 +00:00
Maël Kervella
915d5e8931 Fix: user.models.User.auto_uid can't be static 2018-04-15 10:52:27 +00:00
Maël Kervella
0065e2e0f5 Fix unused variables in kwargs 2018-04-15 10:52:27 +00:00
Maël Kervella
1469c7d6a6 Pylint compliance on users 2018-04-15 10:52:27 +00:00
Maël Kervella
4a1b97bbe3 Pylint compliance on topologie 2018-04-15 10:52:27 +00:00
Maël Kervella
595c6b99fa Pylint compliance on search 2018-04-15 10:52:27 +00:00
Maël Kervella
2ca271bf82 Pylint compliance on re2o 2018-04-15 10:52:27 +00:00
Maël Kervella
332e8a3413 Pylint compliance on preferences 2018-04-15 10:52:27 +00:00
Maël Kervella
e88141db56 Pylint compliance on machines 2018-04-15 10:52:27 +00:00
Maël Kervella
2114a6ebba Pylint compliance on logs 2018-04-15 10:52:26 +00:00
Maël Kervella
f2c91199d1 Pylint compliance on cotisations 2018-04-15 10:52:26 +00:00
Maël Kervella
cc4401ff20 Pylint compliance on api 2018-04-15 10:52:26 +00:00
Maël Kervella
955bf42b02 Missing Fixes 2018-04-15 10:52:26 +00:00
Maël Kervella
7b0b5c2af4 Pep8 compliance on users 2018-04-15 10:52:26 +00:00
Maël Kervella
8afc8e4304 Pep8 compliance on topologie 2018-04-15 10:52:26 +00:00
Maël Kervella
48d904b6de Pep8 compliance on re2o 2018-04-15 10:52:26 +00:00
Maël Kervella
287ce23d1c Pep8 compliance on machines 2018-04-15 10:52:26 +00:00
Maël Kervella
0c8bb61574 Pep8 compliance on logs 2018-04-15 10:52:26 +00:00
Maël Kervella
9d7a7fa1f5 Pep8 compliance on freeradius 2018-04-15 10:52:26 +00:00
Maël Kervella
0dace45c5e Pep8 compliance on api 2018-04-15 10:52:25 +00:00
Maël Kervella
b25137acf4 Pep8 compliance on cotisations 2018-04-15 10:52:25 +00:00
chirac
e56c80b747 Merge branch 'Fix_migrations_cotis' into 'master' 
Fix: missing migrations due to translation of cotisation

See merge request federez/re2o!130
 2018-04-14 21:01:00 +02:00
Maël Kervella
12a8f2ede6 Fix: missing migrations due to translation of cotisation 2018-04-14 18:57:48 +00:00
moamoak
08dbd2615f Merge branch 'rm_stuff_settings' into 'master' 
Fix #97 Update settings.py

Closes #97

See merge request federez/re2o!129
 2018-04-14 17:38:46 +02:00
chirac
a4f66ca1b4 Merge branch 'Fix_regression_mailing' into 'master' 
Fix regression mailing

See merge request federez/re2o!128
 2018-04-14 17:36:45 +02:00
chirac
a99ee1a29c Update models.py 2018-04-14 17:35:07 +02:00
chirac
f2929baaef Update settings.py 2018-04-14 17:14:32 +02:00
chirac
02b7ab826b Merge branch 'Fix_95' into 'master' 
Fix #95 : Remove duplicates classes and functions

Closes #95

See merge request federez/re2o!126
 2018-04-14 17:11:15 +02:00
Maël Kervella
4a67ee8556 Fix the display of mailing info on clubs 2018-04-14 11:57:26 +00:00
Maël Kervella
4f1831d5f9 Little fix in cotis 2018-04-14 01:43:00 +00:00
grisel-davy
0dc5d56250 Création et affichage du graph des switchs 2018-04-13 20:31:51 +02:00
Maël Kervella
aa7ded9f20 Fix #95 by removing duplicates classes and functions 2018-04-13 17:33:01 +00:00
klafyvel
badad16376 Merge branch 'Fix_cotis_err_500' into 'master' 
Fix: Use string and not variables in %-notation fornat

See merge request federez/re2o!125
 2018-04-13 18:58:56 +02:00
Maël Kervella
34c5af62f4 Fix: Error rename 2018-04-13 12:32:39 +00:00
Mael Kervella
8fb8e14a30 Fix Use string and not variables in %-notation fornat 2018-04-13 11:40:02 +00:00
moamoak
0f35bfe7e0 Merge branch 'switch_port_color' into 'master' 
un peu de couleurs sur l'affichage des switchs

See merge request federez/re2o!124
 2018-04-11 23:40:43 +02:00
Gabriel Detraz
eb1567a9b7 un peu de couleurs sur l'affichage des switchs 2018-04-11 23:37:27 +02:00
chirac
aa8129a4ad Merge branch 'Fix_81_Create_custom_invoice' into 'master' 
Fix #81 and improve the selection of articles in custom invoices

Closes #81

See merge request federez/re2o!123
 2018-04-11 23:00:43 +02:00
Maël Kervella
1447d7b173 Added choice for multiple articles in new PDF invoice 2018-04-11 19:53:54 +00:00
Maël Kervella
11ed8b6afe Fix trailing 'e' 2018-04-11 18:40:59 +00:00
Maël Kervella
9232282cdf Align PDF invoice info and better hline for tables 2018-04-11 18:38:07 +00:00
Maël Kervella
d9c42e89db Fix 81 and Strip out facture.tex for readability 2018-04-11 17:22:56 +00:00
chirac
cd0e11815c Merge branch 'moamoak/improve_about' into 'master' 
Add many information on about page

See merge request federez/re2o!120
 2018-04-11 18:40:48 +02:00
Maël Kervella
9067582118 Remove multiple try/except for getting git info 2018-04-11 13:29:14 +00:00
Maël Kervella
ce8fa57747 Add cache for about view 2018-04-11 11:41:00 +00:00