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

2117 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Maël Kervella
001728ca70 Add python3-git as dependency in isntall script 2018-04-11 11:41:00 +00:00
Maël Kervella
7d54c10c29 Add many information on about page 2018-04-11 11:41:00 +00:00
moamoak
16162ff9bb Merge branch 'fix_cotis' into 'master' 
Fix bug sur cotisation

See merge request federez/re2o!122
 2018-04-11 11:35:37 +02:00
Gabriel Detraz
25cd61ddca Fix bug sur cotisation 2018-04-11 09:31:51 +00:00
moamoak
5a6acb5941 Merge branch 'service_user_del' into 'master' 
Fix del/edit serviceuser

See merge request federez/re2o!119
 2018-04-10 19:50:48 +02:00
Gabriel Detraz
529fbe6c95 Fix del/edit serviceuser 2018-04-10 17:47:26 +00:00
chirac
e80c50ffe3 Merge branch '92_Stats_models_broken' into 'master' 
Fix 92: broken stats on models

See merge request federez/re2o!118
 2018-04-10 18:41:32 +02:00
chirac
dad5887e5e Merge branch 'moamoak/91_search_broken' into 'master' 
Fix #91: Search broken

Closes #91

See merge request federez/re2o!117
 2018-04-10 18:41:10 +02:00
chirac
304ca82eca Merge branch 'moamoak/89_move_building_and_switchbay_info' into 'master' 
Fix #89 : Move building and switchbay info

Closes #89

See merge request federez/re2o!116
 2018-04-10 18:40:55 +02:00
Maël Kervella
91faad5806 Replace Object.PRETTY_NAME with Object._meta.verbose_name.title() 
This is cleaner and closer to the way Django recommends to define names
for the objects.
 2018-04-10 13:47:38 +00:00
Maël Kervella
4d9f707c58 Search in switch.location replaced by switch.switchbay.building.name 2018-04-10 12:58:52 +00:00
Maël Kervella
b805ca94d7 Rename index_stack into index_physical_grouping 2018-04-10 12:11:59 +00:00
Maël Kervella
e924e91964 Move Building and SwitchBay infos on the Stack info page 2018-04-10 12:11:59 +00:00
klafyvel
33a75494e4 Merge branch 'maj_crans' into 'master' 
Maj crans

See merge request federez/re2o!115
 2018-04-09 23:31:51 +02:00
Gabriel Detraz
f95f6b812a Merge branch 'foreign_origin' into 'master' 
Foreign origin

See merge request nounous/re2o!24
 2018-04-09 22:51:29 +02:00
Gabriel Detraz
566649ab45 Origin devient une foreignkey 2018-04-09 22:50:03 +02:00
chirac
a38e56cde4 Merge branch 'translation' into 'master' 
Translation of cotisation app

See merge request federez/re2o!114
 2018-04-09 20:13:31 +02:00
Maël Kervella
f2f4336e87 Translation : translate docstrings of cotisations 2018-04-09 17:40:46 +00:00
Maël Kervella
8da337c549 Translation: translate cotisation templates in French 2018-04-08 21:00:37 +00:00
Maël Kervella
433ee298dc Translation: Mark all strings in templates of cotisation 2018-04-08 21:00:31 +00:00
Maël Kervella
ccab7ff718 Translation: Fix some lazy translations 2018-04-08 21:00:22 +00:00
Maël Kervella
aa02016c3a Translation: Setup re2o to use locale and add French 2018-04-08 21:00:12 +00:00
Maël Kervella
a7d47b972d Translation: Marking of strings in cotisations app 2018-04-08 20:55:51 +00:00