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

2080 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chirac be1c0cef22 Merge branch 'typos' into 'dev' 
Typos in README

See merge request federez/re2o!275
 2018-08-29 11:25:19 +02:00
Vincent Le Gallic c73485f7ab Typos in README 2018-08-29 10:32:48 +02:00
chirac 61bd9de8d1 Merge branch 'hotfix_ipv4_field' into 'dev' 
Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4

See merge request federez/re2o!276
 2018-08-28 12:50:51 +02:00
Hugo LEVY-FALK e546a2228a Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4 2018-08-28 12:31:43 +02:00
chirac 9fbf17004a Merge branch 'solde-users' into 'dev' 
Solde users

See merge request federez/re2o!273
 2018-08-27 19:08:52 +02:00
chirac 3331999434 Update forms.py, user_source=None 2018-08-27 19:04:27 +02:00
grisel-davy db198c46ad Déconfusion entre la personne qui fait l'action et le compte concerné. 2018-08-27 19:00:10 +02:00
grisel-davy 25a710395f envoyer le bon user pour les verifications 2018-08-27 18:30:10 +02:00
grisel-davy 39b9c1b3a9 Fix #155 confusion entre request.user et user 2018-08-27 18:30:09 +02:00
klafyvel 175e2170eb Merge branch 'fix_vente' into 'dev' 
Correction du problème de vente d'articles + simplification views et forms

See merge request federez/re2o!271
 2018-08-26 17:32:29 +02:00
Gabriel Detraz 3eda283f64 Correction du problème de vente d'articles + simplification views et forms 2018-08-26 17:24:33 +02:00
chirac 48be064b94 Merge branch 'hotfix_baseinvoice_import_date' into 'dev' 
Donne la bonne date lors de l'import des factures dans BaseInvoice.

See merge request federez/re2o!268
 2018-08-25 13:01:50 +02:00
Hugo LEVY-FALK 74a2e265fa Donne la bonne date lors de l'import des factures dans BaseInvoice. 2018-08-25 11:10:18 +02:00
chirac 5208a9ca82 Merge branch 'hotfix_front' into 'dev' 
Hotfix : users.end_conn + python2 header

See merge request federez/re2o!266
 2018-08-24 17:07:34 +02:00
Gabriel Detraz 9d46031ae1 Hotfix : users.end_conn + python2 header 2018-08-24 17:00:02 +02:00
chirac 04d6be56bc Merge branch 'fix_log_summary' into 'dev' 
Fais la distinction entre un baseinvoice avec et sans objet facture.

See merge request federez/re2o!265
 2018-08-23 23:14:46 +02:00
Hugo LEVY-FALK dfc765f5e5 Fais la distinction entre un baseinvoice avec et sans objet facture. 2018-08-23 23:11:01 +02:00
chirac b137ddc5a4 Merge branch 'hotfix-general-message' into 'dev' 
Fix regression introduced in commit c3b3146f39

See merge request federez/re2o!264
 2018-08-23 19:41:43 +02:00
Maxime Bombar 8e7a1c5094 Fix regression introduced in commit c3b3146f39 2018-08-23 19:33:13 +02:00
chirac 5a959062ba Merge branch 'beta-test' into 'dev' 
Beta test

See merge request federez/re2o!262
 2018-08-23 19:32:17 +02:00
Laouen Fernet d574194ed7 fix bug with shell field for self registration 2018-08-23 15:38:36 +02:00
Laouen Fernet aa2d6365e7 translation 2018-08-23 15:12:16 +02:00
Gabriel Detraz 547e6d0915 Prolongation de connexion avant expiration 2018-08-23 02:54:40 +02:00
Gabriel Detraz 7f021621ad Marquage trad + fix si autoregister disabled 2018-08-23 02:18:44 +02:00
Gabriel Detraz c7f00a1197 More clear welcome page 2018-08-23 02:03:50 +02:00
grisel-davy dd79b86601 Clarification mineur du AdherentForm 2018-08-23 02:03:50 +02:00
grisel-davy 615c20830f jout d'un message sur la page des services 2018-08-23 02:02:15 +02:00
chirac 2747fa463f Merge branch 'mailing' into 'dev' 
get_mail au lieux de user.mail pour génerer la ml

See merge request federez/re2o!261
 2018-08-21 11:52:22 +02:00
grisel-davy 4a9f643339 l au lieux de user.mail pour génerer la ml 2018-08-21 11:21:04 +02:00
klafyvel da3f1f5d59 Merge branch 'translation' into 'dev' 
Translation

See merge request federez/re2o!256
 2018-08-19 20:40:35 +02:00
Hugo LEVY-FALK 6f1ccaf306 Pas de redondance dans les droits hérités sur Club et Adherent 2018-08-19 17:26:11 +02:00
Laouen Fernet f6130c2335 Translation of logs/ (front) 2018-08-18 13:38:17 +02:00
Laouen Fernet 2ecf6b86f1 Translation of topologie/ (front) 2018-08-18 13:38:16 +02:00
Laouen Fernet e27625dd80 Translation of search/ (front) 2018-08-18 13:38:16 +02:00
Laouen Fernet c3b3146f39 Translation of preferences/ (front) 2018-08-18 13:38:16 +02:00
Laouen Fernet 34bf50e7a9 Translation of machines/ (front) 2018-08-18 13:38:15 +02:00
Laouen Fernet af40e3ea4e Translation of users/ (front) 2018-08-18 13:38:15 +02:00
Laouen Fernet a06082c6d4 Translation of cotisations/ (front) 2018-08-18 13:20:22 +02:00
Laouen Fernet 0193f474a0 Translation of re2o/ (front) 2018-08-18 12:16:31 +02:00
Laouen Fernet 0472f913fa Translation of templates/ (front) 2018-08-18 12:16:31 +02:00
chirac 62d86be364 Merge branch 'home' into 'dev' 
Ajout du gid au sérialiser Adherent util pour la création des home

See merge request federez/re2o!217
 2018-08-16 19:59:25 +02:00
grisel-davy ded0aadb9d Ajout du gid au sérialiser Adherent 2018-08-16 19:51:56 +02:00
klafyvel de5b6c903f Merge branch 'fix_153' into 'dev' 
Fix #153, pas de solde par solde

See merge request federez/re2o!258
 2018-08-16 19:44:08 +02:00
Gabriel Detraz 9c065b57e3 Fix #153, pas de solde par solde 2018-08-16 19:37:45 +02:00
chirac 164497b02e Merge branch 'whitelist-cliquable' into 'dev' 
Whitelist cliquable

See merge request federez/re2o!257
 2018-08-16 18:20:11 +02:00
grisel-davy 92cdb3004e nom cliquable dans les bans aussi 2018-08-16 18:15:02 +02:00
grisel-davy c148306eb3 nom cliquable dans la liste des whitelist 2018-08-16 18:15:02 +02:00
klafyvel 3cae0564ef Merge branch 'fix_93_store_custom_invoices' into 'dev' 
Fix 93 store custom invoices

See merge request federez/re2o!203
 2018-08-16 00:39:09 +02:00
Hugo LEVY-FALK 6cc22c376d Adapte les migrations de custom_invoice à la branche dev 2018-08-16 00:22:39 +02:00
Hugo LEVY-FALK 63c80d69a3 Fix de render_tex 2018-08-16 00:22:07 +02:00