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

38 Commits

Author SHA1 Message Date
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
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Damien Metzger
9492557284 // Removed administrator account from the installer, replaced by the superadministrator account 2013-10-16 15:40:30 +02:00
Rémi Gaillard
1ed26e2d4e // default perms profiles 2013-10-07 12:13:59 +02:00
Rémi Gaillard
4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 2013-07-08 11:17:12 +02:00
Rémi Gaillard
c01619dfe3 // Change administrator access fixture 2013-06-26 12:05:36 +02:00
Rémi Gaillard
5998face6b // Fix iPod nano fixture specific price 2013-03-12 18:11:20 +01:00
gRoussac
5859ec31cf [-] BO : Bug with genders icons 2013-03-06 18:56:24 +01:00
Rémi Gaillard
f024f14cb7 // Fix fixtures installer 2013-02-22 10:43:54 +01:00
Damien Metzger
78a5387a7e // Added references to demo products 2013-01-31 17:04:59 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +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
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00: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
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rGaillard
07df641b65 // Miss files 2012-09-18 08:35:35 +00:00
rGaillard
80c60a0b83 // Fix apple fixtures language 2012-09-17 13:28:56 +00:00
rGaillard
63a2b6c9f2 [-] BO: Invoices and products order detail are now not empty after deleting a product 2012-08-07 12:20:10 +00:00
mDeflotte
100b210d22 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
rMalie
2b033f6e06 // Fix id_shop in cart fixtures 2012-05-25 09:38:13 +00:00
rMalie
afb79a95c4 // Fix default access for profiles in installer 2012-05-21 18:48:14 +00:00
rMalie
cb461b6cfb // Good positions for category_product in installer 2012-04-19 13:08:18 +00:00
vChabot
d865a55d74 [-] INSTALLER : BugFix : #PSTEST-1179 : iPod Nano specific price was wrong 2012-04-19 09:15:19 +00:00
rMalie
30f96f0d5d // Fix position for category_product in installer 2012-04-17 16:46:26 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
ca1aaaed6f [*] Bo : #PSTEST-1095 : Remove id_address of the table table supplier and add a new fixture in the installer for the table address 2012-03-27 09:20:01 +00:00
tDidierjean
6bd24680fb // John Doe has a new home 2012-03-06 14:22:22 +00:00
rMalie
d2cfa4e8da [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
rMalie
33e3345b42 // Fix tax_rules_group install on carriers and products 2012-02-24 09:41:31 +00:00
rMalie
9f6e96baba // Fix fixtures install 2012-02-24 09:35:08 +00:00
rGaillard
41390e9be5 [+] Core : products and carriers tax rules are associated to shop 2012-02-24 09:26:18 +00:00
bMancone
3e22318114 // Fixed #PSTEST-751 2012-02-20 17:46:11 +00:00
aFolletete
34e63c9d2b [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class 
[~] Deprecated : OrderHistory::getLastOrderState()
 2012-02-01 14:34:17 +00:00
mMarinetti
d67186f592 // install-new renamed to install-dev 2012-01-26 17:35:54 +00:00