Commit Graph
2887 Commits
Author SHA1 Message Date
Vincent Augagneur 64cfe559f1 //loyalty retro compat 1.5 when using helper form in module configuration 2013-11-20 17:56:11 +01:00
Damien Metzger 4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger 2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Priyank Bolia 0ff7163cba Adding a position order by clause.
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
2013-11-20 20:56:35 +05:30
Quentin Montant 0410378bd3 "---<br />" string is now removed correctly from the end of customization data text 2013-11-20 13:30:47 +01:00
Damien Metzger 61b1dd338e // Update blockbestsellers 2013-11-20 10:28:39 +01:00
Jerome Nadaud 60be5a7989 // themeconfigurator fix 2013-11-18 23:56:19 +01:00
Lucas CERDAN e99332c012 // Pics 2013-11-18 22:55:17 +01:00
Jerome Nadaud b2c656e51a // small font fix 2013-11-18 22:32:33 +01:00
Jerome Nadaud 639a56421a // Themeconfigurator 2013-11-18 22:16:26 +01:00
Jérôme Nadaud fb0118e456 Merge pull request #996 from TMMeilleur/bootstrap
replace new css files location to modules/themeconfigurator/css
2013-11-18 11:53:22 -08:00
Jerome Nadaud f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Damien Metzger f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Damien Metzger a2e1d5ad90 // Fix blockcategory install with new fixtures 2013-11-18 19:29:13 +01:00
Jerome Nadaud 4f2ef4a638 // Update fixture in blockcms 2013-11-18 19:26:30 +01:00
Damien Metzger a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Alexander Grosul b6c5cd7c63 replace new css files location to modules/themeconfigurator/css 2013-11-18 20:07:24 +02:00
rGaillard 7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:20 +01:00
Jerome Nadaud 57b329ca74 // Remove other fonts 2013-11-18 17:46:05 +01:00
rGaillard 9197498c3c // delete useless module 2013-11-18 17:45:53 +01:00
Jerome Nadaud c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 17:21:41 +01:00
Jerome Nadaud 938ef4fe39 // small fix 2013-11-18 17:12:35 +01:00
Damien Metzger 43a54b10bf // Reverted revert 2013-11-18 17:00:23 +01:00
rGaillard 5d0b188eed // small fix 2013-11-18 16:19:02 +01:00
Jerome Nadaud 522e95223f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:35:17 +01:00
Jerome Nadaud 89c9f182b3 // Small fix in live configurator toolbox 2013-11-18 15:35:03 +01:00
Rémi Gaillard 618aa24f74 Merge pull request #945 from Javsmile/patch-2
// Update productcomments.php
2013-11-18 06:30:59 -08:00
Rémi Gaillard 4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap
// fixed add to wishlist/compare buttons and added product review
2013-11-18 06:22:43 -08:00
Jerome Nadaud 40204ba458 // Live configurator toolbox part 2 2013-11-18 15:04:10 +01:00
gRoussac 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
TMMeilleur 95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud 867eef79cc // Add live configurator toolbox - Part 1 2013-11-18 14:39:46 +01:00
gRoussac dbc08d779c // typo, sorry about this 2013-11-18 14:35:39 +01:00
gRoussac 22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template 2013-11-18 14:32:34 +01:00
Jerome Nadaud ebad56a800 // Fix small error 2013-11-18 14:29:32 +01:00
rGaillard 68c8e9da57 // move to themeconfigurator 2013-11-16 19:24:03 +01:00
Damien Metzger b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
TMMeilleur a5d9daff13 added responsive rich menu and small fix in blockbanner 2013-11-15 18:40:17 +02:00
Jerome Nadaud 8cd1d623e5 // Fix error if default blockbanner image is missing 2013-11-15 17:13:50 +01:00
Jerome Nadaud 19cfa443d2 // fix dashgoals configuration fields size 2013-11-15 17:04:55 +01:00
Jerome Nadaud ece4331622 //Fix addsharethis error 2013-11-15 15:38:51 +01:00
Jerome Nadaud 3af7a59caa // Add version number to addsharethis 2013-11-15 15:32:52 +01:00
Jerome Nadaud b5d84a72e0 // AddShareThis fix 2013-11-15 15:31:01 +01:00
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +01:00
Gregory Roussac 448a4c9994 Merge pull request #980 from djfm/development
// no line breaks in $this->l()
2013-11-15 02:23:39 -08:00
fram ba15d975bc // no line breaks in $this->l() 2013-11-15 10:44:01 +01:00
Jerome Nadaud a66d2e1ab6 // Fix form name 2013-11-15 09:18:41 +01:00
Jerome Nadaud c2d956ec7d // Modif after specs change 2013-11-15 08:58:30 +01:00
Jerome Nadaud 29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00