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

275 Commits

Author SHA1 Message Date
Jerome Nadaud
5e31511117 // BlockLayered hook template backward compatibility 2013-12-10 16:18:59 +01:00
Jerome Nadaud
d511828a91 // BlockLayered removing missing template var 2013-12-10 11:49:55 +01:00
Jerome Nadaud
d4de6342b4 [-] MO : BlockLayered - Fix missing attribute anchor separator 2013-12-09 18:37:55 +01:00
Jerome Nadaud
fcf568b9ea // BlockLayered 1.5 backward compatibility 2013-12-09 18:21:31 +01:00
Jerome Nadaud
e448ac8de5 // Blocklayered message small fix 2013-12-09 09:09:38 +01:00
Jerome Nadaud
c5ff838fca // Blocklayered starting code refacto 2013-12-06 18:12:04 +01:00
Peter Schaeffer
7ea1d73d67 MO:blocklayered 
Added an extra typecheck to fix a bug http://forge.prestashop.com/browse/PNM-1573
 2013-11-30 19:54:42 +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
5afde2163b [+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb 2013-11-25 11:10:42 +01:00
Jerome Nadaud
d1c9ec8e09 // Changing Typo preserving backward compatibility 2013-11-25 11:02:40 +01:00
Jerome Nadaud
bc083ece83 // Manual merge from development branch 2013-11-25 10:25:32 +01:00
gRoussac
ee98947e6b // manual merg of 0bc1d21432 and 2013-11-21 18:59:28 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +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
gRoussac
472dc8c27d [-] MO : Blocklayered follow up a6e67b078e (commitcomment-4538556) 2013-11-07 17:59:04 +01:00
Gregory Roussac
f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted 
[*] MO : Blocklayered filter feature blocks sorted
 2013-11-05 01:50:48 -08:00
Daniele Giachino
99e98a5164 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 10:45:23 +01:00
Gregory Roussac
c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop 
[-] MO : Missing context shop for categories
 2013-11-05 01:10:39 -08:00
Daniele Giachino
02c04a9884 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 09:40:53 +01:00
Daniele Giachino
cf65877f3f layered filters involving features are now natural sorted 2013-11-05 09:32:36 +01:00
Daniele Giachino
f0abdca08f layered filters involving features are now natural sorted 2013-11-05 09:30:13 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Damien Metzger
cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Julien
0bc1d21432 [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php 
These files not exists :
 - /js/jquery/jquery-ui-1.8.10.custom.min.js
 - /css/jquery-ui-1.8.10.custom.css
 2013-10-26 15:08:07 +02: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
Gregory Roussac
f3e36b896b Merge pull request #746 from Mainmich/patch-1 
[-] MO : Blocklayered Fix pagination incompatibility
 2013-09-26 14:16:51 +02:00
Mainmich
a6e67b078e Fix pagination incompatibility 
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
 2013-09-25 18:33:58 +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
Prestaspirit
a37033e478 [-] MO : Fixed a bug when displaying textures 
Corrections links texture image in the blocklayered
 2013-09-12 07:01:55 +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
Damien Metzger
4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00