rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-03 04:34:06 +00:00
Code Issues Releases Wiki Activity
1554 commits 211 branches 14 tags 12 MiB
Commit graph

1554 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gabriel Detraz f5de618078 Merge branch 'update_crans' into 'master' 
Update crans

See merge request nounous/re2o!23
 2018-04-08 19:00:48 +02:00
Gabriel Detraz 1f2a3364b3 Del trucs inutiles 2018-04-08 18:04:52 +02:00
Gabriel Detraz 80b247b3e5 Path du /media dans apache 2018-04-08 18:02:07 +02:00
Gabriel Detraz a621d378ec Remplace location par bayswitch 2018-04-08 04:13:14 +02:00
Gabriel Detraz bc1267e8f8 Gestion complète de la baie de brassage, menu d'edition des switchs membres 2018-04-08 04:02:12 +02:00
chirac 99928c885b Merge branch 'fix_state' into 'master' 
Fix le changement d'etat de l'user

See merge request federez/re2o!113
 2018-04-07 22:16:05 +02:00
Gabriel Detraz bb6b19f574 Fix le changement d'etat de l'user 2018-04-07 22:14:40 +02:00
Gabriel Detraz 3f05b27f3b Modele pour les baies de switchs 2018-04-07 20:45:45 +02:00
klafyvel b49866d9ee Merge branch 'buttons_amelioration' into 'master' 
modification panel profil

See merge request federez/re2o!109
 2018-04-03 21:10:10 +02:00
chirac 34991c2639 Merge branch 'fix_radius' into 'master' 
Update auth.py

See merge request federez/re2o!112
 2018-04-03 20:15:20 +02:00
chirac cdc012bc47 Update auth.py 2018-04-03 20:11:19 +02:00
guimoz 39a1c4eb86 Merge branch 'profil_frontend' into 'master' 
Profil frontend

See merge request federez/re2o!111
 2018-04-03 18:48:01 +02:00
chirac 2fffa98d46 Merge branch 'master' into 'profil_frontend' 
# Conflicts:
#   users/views.py
 2018-04-03 18:38:28 +02:00