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

88 Commits

Author SHA1 Message Date
gRoussac
81481d6105 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48 2013-12-03 19:24:31 +01:00
gRoussac
68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 2013-11-29 17:06:59 +01:00
gRoussac
2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 2013-11-27 16:20:20 +01:00
Kevin Granger
5976a471a7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 17:43:59 +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
Damien Metzger
8bdc6c9a51 [*] FO : Added getCategory getter in ProductController #PSCFV-8408 2013-11-21 16:01:50 +01:00
gRoussac
a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
Jonathan Danse
9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +01:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Vincent Augagneur
8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
gRoussac
7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski 2013-08-12 16:23:54 +02:00
gRoussac
6449437f58 // norms 2013-08-06 11:38:34 +02:00
gRoussac
3483706951 [-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM 2013-07-20 19:07:10 +02:00
gRoussac
5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
Rémi Gaillard
c025024b40 // fix php warning if no image is associated to the producr 2013-06-27 18:14:07 +02:00
Vincent Augagneur
cc4c8bfbe7 [-] CORE : fixed bug #PSCFV-9460 2013-06-25 15:25:08 +02:00
Rémi Gaillard
ab700a6285 [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
gRoussac
585cd016b0 [-] FO : Fix bug #PSCFV-7743 and #PSCFV-8286, bigpic source change 2013-04-04 12:20:14 +02:00
Rémi Gaillard
313f2a5392 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 14:28:38 +01:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
vAugagneur
eb4e0946bb [-] FO : fixed bug #PSCFV-5744 - Using attribute values with decimal points numbers and its ten multiple, have the same url 2013-03-11 16:29:33 +01:00
Rémi Gaillard
789f6ee19c [-] FO: Fix ecotax displayed on the quantity discounts tab with a change of base_price on the product page 2013-03-06 18:02:13 +01:00
Damien Metzger
28e8653e9c [-] FO : Fixed regexp for images embbed in description 2013-02-18 16:17:05 +01:00
Rémi Gaillard
f137de9613 [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00
gRoussac
d9fbe89270 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
Rémi Gaillard
adecde6ee1 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard
9dc31dd415 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
Rémi Gaillard
40a81674ba [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer 2013-02-07 16:57:56 +01:00
Rémi Gaillard
f6d9771de8 [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page 2013-02-07 16:06:32 +01:00
gRoussac
ad59853347 [-] FO : Fix bug #PSCFV-7504 last category for parent and not always default one 2013-01-31 12:03:16 +01:00
vAugagneur
857b8c2009 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur
2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard
deb5adb6f4 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop 2012-11-29 18:01:39 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
vAugagneur
f11c978575 [-] FO : fixed bug #PSCFV-4336 2012-09-24 14:27:16 +00:00
sLorenzini
93aae4afaa // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
dMetzger
6f50937a38 [+] FO : mobile theme re-included in the trunk 2012-08-28 15:47:12 +00:00
rGaillard
e7f77ae903 [-] FO: Fix PSCFV-2911 2012-08-28 12:43:09 +00:00
dMetzger
18ec9230e3 // Old code cleaning & #PSCFV-3144 2012-07-11 12:37:12 +00:00
rGaillard
371a319c35 [-] FO : fix PSCFV-2948 display of specific prices on the product for combinations 2012-07-10 09:57:47 +00:00
rGaillard
d364eca848 [-] FO: fix display of quantity discount prices 2012-07-10 09:09:15 +00:00
rGaillard
b583b84b61 [-] BO: Update product specific price rules on update 2012-06-19 09:59:14 +00:00
rGaillard
54675df666 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
vAugagneur
d18746402a //remove mobile theme 2012-05-09 20:57:15 +00:00
nPellicari
29bbc7049c [*] MO : updated controllers for mobile theme 2012-03-13 17:34:18 +00:00