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

2042 commits

This branch
This branch
All branches
Author SHA1 Message Date
Charlie Jacomme
623be9ac83 Specify range for autocapture 2018-09-01 02:30:50 +02:00
detraz
cd8a23da31 Fix import de users.User 2018-09-01 00:55:18 +02:00
klafyvel
5af66b400b Merge branch 'user_adh_pas_encore' into 'dev' 
User adh pas encore

See merge request federez/re2o!279
 2018-08-31 23:27:32 +02:00
Hugo LEVY-FALK
ded8f89ba8 Fix couleurs du texte pour l'état 'actif' 2018-08-31 22:25:38 +02:00
chirac
ea78da87e0 Que en anglais docstring models.py 2018-08-31 13:37:08 +02:00
Gabriel Detraz
48773668d1 No harcoded var 2018-08-31 13:35:33 +02:00
Gabriel Detraz
0ffdde5a6a Cree une fonction pour set active les utilisateurs cotisant 2018-08-31 13:29:01 +02:00
grisel-davy
5ab8bb4f0e Empeche la syncronisation ldap pour les users_not_yet_member 2018-08-31 12:06:32 +02:00
grisel-davy
fa3aca906f Les nouveau users ne sont pas adhérents et n'ont pas de home 2018-08-31 12:06:32 +02:00
chirac
3e679757af Merge branch 'web_register_mac' into 'dev' 
Web register mac

See merge request federez/re2o!278
 2018-08-29 11:54:09 +02:00
Laouen Fernet
1de72714d0 translation for commit f355175b + typos 2018-08-29 11:27:10 +02:00
Gabriel Detraz
5d30e95aa4 Ebauche, interface de capture de mac et d'enregistrement de chambre 2018-08-29 11:27:10 +02:00
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