dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph

185 Commits

Author SHA1 Message Date
Jerome Nadaud c5ff838fca // Blocklayered starting code refacto 2013-12-06 18:12:04 +01:00
Kevin Granger 0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:17:15 +01:00
Kevin Granger fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Jerome Nadaud 89f794ae5e // Missing Typo 2013-11-25 17:09:08 +01:00
Jerome Nadaud bc083ece83 // Manual merge from development branch 2013-11-25 10:25:32 +01:00
gRoussac ee98947e6b // manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and 2013-11-21 18:59:28 +01:00
Jerome Nadaud 232309996b // Fix blocklayered bootstrap 2013-11-14 10:35:02 +01:00
Jerome Nadaud 27731f3bb2 // Bootstraping blocklayered backoffice and ajax fix 2013-11-13 20:13:42 +01:00
Jerome Nadaud aa81e2607f // First boostraping pass on blocklayered module 2013-11-13 15:31:30 +01:00
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Rémi Gaillard 3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Jerome Nadaud 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
Jerome Nadaud 3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00
Jerome Nadaud 6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00
Vincent Augagneur dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
Jerome Nadaud cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud 32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00
Rémi Gaillard 9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 2013-09-04 15:05:55 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard b7a03bdffa // sometimes image was not the cover one for blocklayered 2013-08-26 10:37:59 +02:00
Damien Metzger eb0d2d47e4 // The blunder wasn't mine :) 2013-08-09 17:31:00 +02:00
Damien Metzger 971b45e630 // fixed variable that does not exists 2013-08-09 17:21:24 +02:00
Rémi Gaillard 1183b14ea9 [-] MO: no more 1.4 support for blocklayered 2013-08-09 11:24:21 +02:00
Damien Metzger cac7b267e6 [-] MO : fixed category link on blocklayered #PNM-1427 2013-08-09 10:37:23 +02:00
Damien Metzger eed7ceb37a [-] MO : blocklayered also try to find the translations in the translations directory 2013-08-09 10:21:37 +02:00
Damien Metzger 0fc1c9184c [-] MO : added visibility IN ("both", "catalog") in blocklayered 2013-08-09 10:11:01 +02:00
Gregory Roussac bb45c93d4f Merge pull request #563 from Prestaworks/patch-12 
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
 2013-08-08 02:00:57 -07:00
gRoussac c31c2ca0e9 [-] MO: cover image issue with layered block on multishop, thanks @theginie 2013-08-08 10:46:22 +02:00
gRoussac 0f4562eb44 [*] MO : added manufactureres order by name, thanks@Jacky75 2013-08-08 10:24:05 +02:00
gRoussac d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 2013-07-25 18:15:06 +02:00
Daniel 876c49b690 PNM-1241 Issue with backbutton 
This will solve the issue with url indexing not working for all languages.
 2013-07-12 18:24:18 +08:00
Damien Metzger a4e6ddf29c [*] MO : blocklayered optimization 2013-06-13 09:42:34 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
Damien Metzger 5b6af42c0d [-] MO : fixed double entities of meta titles in blocklayered #PSCFV-7986 #PSCFV-7985 2013-03-01 17:03:43 +01:00
Rémi Gaillard 9fd52c56e2 [-] MO: Fix #PSCFV-7416 product name in blocklayered listing with multishop 2013-01-24 17:29:53 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur 7edd3555eb [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module 2012-11-29 18:51:22 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur 1415f86566 //fix for 1.5.2.0 2012-10-22 12:41:28 +00:00
vAugagneur a5134136e7 [-] MO : fixed bug #PSCFV-4897 2012-10-12 08:08:38 +00:00
sLorenzini 4896b787f3 // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
mDeflotte 93de3576ea // Blocklayered - Fix bug with ajax call on the BO 2012-08-01 07:30:07 +00:00
mDeflotte e20e21a82a // Blocklayered: Fix bug with noindex 2012-07-19 10:07:29 +00:00
mDeflotte f2a816abed // Blocklayered: Add option no-index to filter category 2012-07-18 13:54:13 +00:00
mDeflotte 17b7202954 // Blocklayered: Fix bug with product order select on 1.5 
// Theme 1.5: Fix bug on change product order with the select on the bottom of the page
 2012-07-09 12:41:38 +00:00
mDeflotte 8575552091 [-] MO : #PSCFI-5957 - Blocklayered - Fix bug with price ordering 2012-06-28 07:15:51 +00:00
mDeflotte df9b9c95ae // Blocklayered - Fix bug with price ordering 2012-06-27 14:23:14 +00:00