Commit Graph

89 Commits

Author SHA1 Message Date
fram
931f309b45 // removed superfluous mail files 2013-11-21 10:26:02 +01:00
djfm
1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
djfm
f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
djfm
71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm
5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Rémi Gaillard
190c14ed9d // delete src mails -> go mailsrc branch 2013-10-30 10:25:51 +01:00
djfm
4f8d153469 // fixed links in new English mails 2013-10-28 08:57:59 +00:00
djfm
3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
djfm
dd009f133f // fixes in php mail templates 2013-10-25 09:13:24 +00:00
djfm
c8e75eec03 // fixed indentation in e-mail html templates 2013-10-24 14:25:17 +00:00
djfm
0603c54756 [*] LO : New English E-Mail templates by SuperSarah 2013-10-24 14:15:19 +00:00
djfm
572f7c725d // small html fix 2013-10-24 14:04:50 +00:00
djfm
3e8330dcb3 // small fixes on php email templates 2013-10-24 13:58:14 +00:00
djfm
baed28f1a7 // use automatic path for css in mail template header 2013-10-24 08:37:08 +00:00
Sarah Lorenzini
d9382a0a5b // update mail template 2013-10-24 09:28:04 +02:00
Sarah Lorenzini
45bd281504 // update mail templates 2013-10-23 17:53:54 +02:00
Sarah Lorenzini
9a7af80943 // update mail templates 2013-10-23 10:13:57 +02:00
Sarah Lorenzini
cc1dd2510a // mail template src 2013-10-22 16:24:16 +02:00
Damien Metzger
c5f635f967 // Updated some meta and translations 2013-08-20 10:31:03 +02:00
jeromenadaud
d8f5caee7b [-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation 2013-08-01 19:09:34 +02:00
gRoussac
236aaa9354 [*] MAILS : add {order_name} & {attached_file} , manaul merge from e9f9631744 2013-07-18 18:38:12 +02:00
Vincent Augagneur
56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information 2013-06-26 18:01:26 +02:00
Damien Metzger
6222974430 // W3C 2013-06-06 15:48:46 +02:00
Vincent Augagneur
5ec36dac88 [-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color} 2013-06-04 16:14:34 +02:00
Grégoire Bélorgey
83088a1905 [*] Mails : delete a hard-coded pink background 2013-04-29 10:21:53 +02:00
Grégoire Bélorgey
4b52f6da2e Replacing the default pinkish background with a grey one, and put the text in {color} 2013-04-28 11:13:46 +02:00
Rémi Gaillard
f3dfbda02a [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
Marco Cervellin
1fb06bc07d [-] FO : fixed smarty curly bracket
Signed-off-by: Marco Cervellin <marco@macodev.com>
2013-01-22 11:53:29 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
321eaa191b //added translation 2012-12-28 09:27:12 +01:00
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
sLorenzini
ae2c41286f [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 2012-12-10 15:17:23 +01:00
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
Sarah Lorenzini
d2023a5105 [-] FO : fixed bug #PSCFV-5779 - order_conf still not fixed propertly 2012-11-22 17:12:58 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
vAugagneur
0d0cc3f7c1 [-] CORE : fixed bug #PSCFV-4595 2012-10-12 14:59:26 +00:00
lLefevre
74946295fe [-] BO : fix #PSCFV-4662 2012-10-03 09:37:38 +00:00
lLefevre
c4297e990b [-] BO : fix #PSCFV-4596 2012-10-01 15:58:02 +00:00
lLefevre
76e9c0ba12 [-] BO : fix #PSCFV-4582 2012-10-01 14:14:49 +00:00
lLefevre
b9274f4d81 [-] TR : fix #PSCFV-4282 : updated of some bad link on mail template 2012-09-25 13:33:07 +00:00
lLefevre
fecf7ef1ac [-] BO : fix #PSCFV-4204 2012-09-19 11:45:07 +00:00
lLefevre
b250b25c98 [*] TR : add Italian translations 2012-09-13 08:50:32 +00:00
lLefevre
4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
lLefevre
7c3df4f783 [-] TR : #PSCFV-3972 : change "%7Bshop_url%7D" by "{shop_url}" in Deutsch emails 2012-09-10 09:25:41 +00:00
lLefevre
5b33b79a3a [*] TR : add spanish object for confirmation order email 2012-09-10 08:44:17 +00:00
lLefevre
27acf4c0e0 [-] TR : fix #PSCFV-3932 2012-09-06 09:48:14 +00:00