1aadb10fb2
// English emails
2013-11-06 16:20:19 +00:00
f742e817da
// updated English emails: now responsive
2013-11-05 18:10:31 +00:00
d27fe93daa
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
71e3a8a937
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 16:58:17 +00:00
5372f31b4c
// updated English emails
2013-11-04 16:57:50 +00:00
5386a4547b
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:57:50 +01:00
889a2006ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
02367e5396
//missing file for blockwishlist module
2013-11-04 10:42:37 +01:00
b9ad576fb0
// -> mailsrc branch
2013-10-30 15:02:06 +01:00
4f8d153469
// fixed links in new English mails
2013-10-28 08:57:59 +00:00
c5c861b59e
[-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande
2013-10-27 13:28:34 +01:00
3a749823bb
// small fixes in English Email php templates
2013-10-25 12:29:39 +00:00
1a7f9e6c11
// new design for blockwishlist mails template
2013-10-24 17:35:37 +02:00
bd95d03e37
//blockwishlist now use boostrap design
2013-10-15 09:30:26 +02:00
ac21fa9808
[-] MO : Missing image in my account for MODULE WishList
2013-08-07 10:56:09 +02:00
7089ce10ef
// remove warnings in blockwishlist
2013-08-06 19:05:08 +02:00
72dc8b943f
[-] FO : FixBug #PSCFV-9961 Remove wishlists icon
2013-07-29 17:58:31 +02:00
a70d3145cd
[-] MO Blockwishlist : images are displayed in wishlist page loaded through a permalink. Add to cart is restored and quantity is correctly calculated for each product with or without combinations
...
#PNM-573
#PNM-663
#PNM-1268
#PNM-1302
#PNM-1303
#PNM-1313
#PNM-1512
#PNM-1541
2013-07-05 17:18:28 +02:00
cab425e819
//remove useless css
2013-07-02 08:41:51 +02:00
ca64179950
// W3C
2013-06-06 15:27:29 +02:00
2d2b9f76e0
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
0786cf617f
//change the default color (#db3484)
2013-04-11 17:51:28 +02:00
36e7eee76b
// delete also module emails
2013-03-25 18:08:34 +01:00
f3dfbda02a
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
3b2b718f84
[-] MO: fix a problem with the wishlist_link
...
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.
Or, we can put this in a {$link->getModuleLink(...)} in TPL
2013-01-22 23:50:52 +01:00
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
a4eb2cc7a9
//Merge branch release
2013-01-02 09:56:20 +01:00
2688e97145
[-] FO: Fix retrocompatibility for modules and old themes
2012-12-31 12:06:28 +01:00
321eaa191b
//added translation
2012-12-28 09:27:12 +01:00
91ba2bfa2e
// fix js arg missing for translations in javascript
2012-12-12 19:07:29 +01:00
35a0c7c94c
[-] MO: Fix Wishlist controller with ssl #PSCFV-5943
2012-12-12 18:01:57 +01:00
4fa7eb6a3d
//revert all config.xml
2012-12-06 11:41:52 +01:00
2a4b7cae75
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
2b10fcd712
// change h4, h5
2012-12-04 17:15:49 +01:00
b8c1783985
[-] MO : use addJS instead of a tpl file
2012-11-23 16:03:17 +01:00
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
6bd4399837
[-] CORE : fixed bug #PSCFV-4759
2012-10-09 13:52:08 +00:00
8f15dab25c
// Small fixed
2012-10-03 14:08:21 +00:00
d27437bb5d
[-] FO : fixed bug #PSCFV-4367
2012-09-27 14:02:57 +00:00
f6d41dea32
[-] BO : #PSCFV-4392 : index.php in modules folder and sub folders
2012-09-26 07:11:37 +00:00
b9274f4d81
[-] TR : fix #PSCFV-4282 : updated of some bad link on mail template
2012-09-25 13:33:07 +00:00
b250b25c98
[*] TR : add Italian translations
2012-09-13 08:50:32 +00:00
f0f223455b
[*] TR : add Spanish translations
2012-09-13 08:38:07 +00:00
4c75f80236
[*] TR : add Deutsch translations
2012-09-13 08:32:36 +00:00
7c3df4f783
[-] TR : #PSCFV-3972 : change "%7Bshop_url%7D" by "{shop_url}" in Deutsch emails
2012-09-10 09:25:41 +00:00
2de487e5cd
[-] BO : fix #PSCFV-3893
2012-09-04 07:57:59 +00:00
f28088bd2f
[+] FO : mobile theme re-included in the trunk
2012-08-28 15:47:12 +00:00
7d55fe9982
// fixed little issue on wishlist
2012-07-20 12:42:53 +00:00
48b42fb398
[*] TR : update English translations key for Modules
2012-07-12 10:08:13 +00:00
2e8ab91a6c
[*] TR : update Spanish translations
2012-07-12 08:27:31 +00:00
djfm