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 |
|
Hugo LEVY-FALK
|
19bd78bc8d
|
Fix des traductions et de détails de front.
|
2018-08-16 00:08:29 +02:00 |
|
Hugo LEVY-FALK
|
1284d9ffec
|
Migration des permissions
|
2018-08-16 00:08:29 +02:00 |
|
Hugo LEVY-FALK
|
bad89ea7c2
|
Réfléchir avant de pusher le klafyvel doit se rappeler. fix les traductions
|
2018-08-16 00:08:29 +02:00 |
|
Hugo LEVY-FALK
|
37dbf3d82a
|
i18n pour cotisations
|
2018-08-16 00:08:29 +02:00 |
|
Hugo LEVY-FALK
|
822ca101ac
|
CHANGELOG avec les commandes à lancer pour postgre.
|
2018-08-16 00:07:33 +02:00 |
|
Hugo LEVY-FALK
|
e38ae33c6e
|
Utilise le filter tick pour afficher les booléens de custom invoice
|
2018-08-16 00:06:36 +02:00 |
|
Hugo LEVY-FALK
|
5236b659b6
|
Fix l'historique
|
2018-08-16 00:06:35 +02:00 |
|
Hugo LEVY-FALK
|
d6091d117c
|
Custom invoices.
|
2018-08-16 00:06:35 +02:00 |
|
klafyvel
|
0527206eb4
|
Merge branch 'fix_141_send_invoice' into 'dev'
Fix 141 send invoice
See merge request federez/re2o!198
|
2018-08-16 00:00:53 +02:00 |
|
Hugo LEVY-FALK
|
4ab0dad146
|
Documentation propre de render_tex et create_pdf
|
2018-08-15 23:56:49 +02:00 |
|
Delphine SALVY
|
9dd54a99a5
|
Fix 141 : envoi des factures par mail
|
2018-08-15 23:56:49 +02:00 |
|
Delphine SALVY
|
904c7b279b
|
POC de l'envoi de facture par mail.
|
2018-08-15 23:56:49 +02:00 |
|
klafyvel
|
a02db1547a
|
Merge branch 'change_self_shell' into 'dev'
users can change their shell
See merge request federez/re2o!255
|
2018-08-15 23:42:25 +02:00 |
|
Hugo LEVY-FALK
|
1e47fa16a0
|
Rend can_change_shell de User cast-proof
|
2018-08-15 23:14:30 +02:00 |
|
Gabriel Detraz
|
ba31a94c20
|
users can change their shell
|
2018-08-15 22:11:18 +02:00 |
|