Commit Graph

72 Commits

Author SHA1 Message Date
Michael RICOIS
7ffbdcb98d Merge branch 'ticket-14805-creditexpiration' into develop 2017-11-29 12:42:19 +01:00
Michael RICOIS
cc26558cae Mail language 2017-11-29 12:22:58 +01:00
Michael RICOIS
580621fc43 cli to send reminder mail 2017-11-29 11:12:32 +01:00
Michael RICOIS
eae8fac9ea Prepare mail template 2017-11-28 17:14:55 +01:00
Nolwenn J
9af4d8ef6b Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-28 14:47:55 +01:00
Nolwenn J
cf6ca990ae fixs 2017-11-28 14:47:31 +01:00
Nolwenn J
9f908d09c8 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:34:11 +01:00
Nolwenn J
bfae062c0c mails fixs 2017-11-22 11:33:50 +01:00
Nolwenn J
875605e6ed Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:12:53 +01:00
Nolwenn J
b46cf8580d fix mail es 2017-11-22 11:12:27 +01:00
Nolwenn J
ec31ea2735 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:09:17 +01:00
Nolwenn J
2724d07b5b mails 2017-11-22 11:08:26 +01:00
Nolwenn J
c4301dbac1 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 10:47:06 +01:00
Nolwenn J
bbeef7850d fix 2017-11-22 10:46:35 +01:00
Nolwenn J
178097efb4 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-21 10:31:34 +01:00
Nolwenn J
b9025b2883 chge image pour eviter les caches gmail 2017-11-21 10:31:13 +01:00
Nolwenn J
77206e7393 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-20 18:55:01 +01:00
Nolwenn J
8c420adee9 mails 2017-11-20 18:54:42 +01:00
Nolwenn J
8783fe760d Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-20 16:59:36 +01:00
Nolwenn J
0b6c2a1533 fixs 2017-11-20 16:59:01 +01:00
Nolwenn J
b2f4864624 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-17 14:39:18 +01:00
Nolwenn J
7d96ec78d4 fix alt 2017-11-17 14:36:23 +01:00
Nolwenn J
cd0640d15a Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-17 12:58:56 +01:00
Nolwenn J
ea53eafe93 fixs 2017-11-17 12:58:36 +01:00
Nolwenn J
280480e65c Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-16 10:44:17 +01:00
Nolwenn J
15425cb5de fixs 2017-11-16 10:43:55 +01:00
Nolwenn J
7f09464c0d Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-15 12:10:35 +01:00
Nolwenn J
dfe406f976 welcome 2017-11-15 12:10:14 +01:00
Marion Muszynski
948ed7918d fix url 2017-11-15 11:52:28 +01:00
Nolwenn J
19b5adf9d3 fix conflict 2017-11-15 11:33:32 +01:00
Nolwenn J
ce105d2f1a Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-15 11:32:13 +01:00
Nolwenn J
1dc80b70d0 mail url fixs 2017-11-15 11:31:46 +01:00
Michael RICOIS
f4a99c98b7 Merge branch 'ticket-14273-voucher' into develop
Conflicts:
	mails/es/account.html
2017-11-14 12:18:35 +01:00
Michael RICOIS
455cfeff90 Translate 2017-11-14 12:15:48 +01:00
Michael RICOIS
e246151eed Merge branch 'master' into ticket-14273-voucher 2017-11-14 12:00:45 +01:00
Michael RICOIS
f26fe921ce Fix mails not get from server 2017-11-14 11:48:12 +01:00
Michael RICOIS
b31f7276a3 Email translation 2017-11-14 11:37:29 +01:00
Michael RICOIS
88fbc72f99 FR lang 2017-11-14 11:37:29 +01:00
Michael RICOIS
f1922ec71c Add mail template 2017-11-14 11:37:28 +01:00
Michael RICOIS
c6ecfaa219 Add mail ES 2017-11-14 11:29:09 +01:00
Nolwenn J
2c1241e7ef Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-09 15:28:10 +01:00
Nolwenn J
1daf1744fe modif git ignore 2017-11-09 15:22:42 +01:00
Nolwenn J
0943d97a0f mails 2017-11-09 14:33:57 +01:00
Michael RICOIS
12086ed19b Merge branch 'ticket-14273-voucher' into develop 2017-10-31 14:59:44 +01:00
Michael RICOIS
eed1052304 Email translation 2017-10-31 14:58:54 +01:00
Michael RICOIS
ccbaea306d Merge branch 'ticket-14273-voucher' into develop 2017-10-27 15:46:59 +02:00
Michael RICOIS
3693455509 FR lang 2017-10-27 15:46:29 +02:00
Michael RICOIS
7854985496 Merge branch 'ticket-14273-voucher' into develop 2017-10-27 14:46:36 +02:00
Michael RICOIS
2b9671cfe7 Add mail template 2017-10-27 12:44:41 +02:00
Marion Muszynski
b54fe1d1a0 fix translations 2017-10-11 15:26:13 +02:00