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

39 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
6393746f04 [-] BO : 406 when mod_security follow up 034e6a7e7f 2013-11-14 11:43:05 +01:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //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
6588f9514c // 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
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
rGaillard
79a736c050 [-] BO: Fix PSCFV-2754 keep informations on form validation error 2012-06-28 22:12:31 +00:00
rGaillard
90ade82f11 [-] BO: Fix PSCFV-2754 keep informations on form validation error 2012-06-28 22:12:31 +00:00
rMalie
a0efaf6af7 // Fix critical spelling bug on jquery cookie file name 2012-06-12 13:12:32 +00:00
rMalie
92febdd92d // Fix critical spelling bug on jquery cookie file name 2012-06-12 13:12:32 +00:00
rMalie
6309e8f9d9 // Fix multishop access when option is not enabled #PSCFV-2701 2012-06-07 09:40:48 +00:00
rMalie
209783e059 // Fix multishop access when option is not enabled #PSCFV-2701 2012-06-07 09:40:48 +00:00
fBrignoli
660d472962 // toolbar 2nd part 2012-06-06 09:52:26 +00:00
fBrignoli
458fe57ed5 // toolbar 2nd part 2012-06-06 09:52:26 +00:00
fBrignoli
940c13b132 [-] BO : Bug Fixed #2676 - Missing button in group shop tab 2012-06-06 09:41:13 +00:00
fBrignoli
c20344742d [-] BO : Bug Fixed #2676 - Missing button in group shop tab 2012-06-06 09:41:13 +00:00
rMalie
8922588507 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...) 2012-06-05 13:27:53 +00:00
rMalie
d21cf19be7 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...) 2012-06-05 13:27:53 +00:00
vAugagneur
7661ea3869 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur
85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
rMalie
2cbfd5f0c2 // The capacity of enable / disable shops and shop groups is temporary disabled 2012-05-30 12:30:08 +00:00
rMalie
9c0b51e89f // The capacity of enable / disable shops and shop groups is temporary disabled 2012-05-30 12:30:08 +00:00
rMalie
d7337c4d4f // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie
522d7cc950 // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie
83ae4a31df // Change order of fields in ShopGroup creation #PSTEST-690 2012-04-18 15:19:36 +00:00
rMalie
bd01216657 // Change order of fields in ShopGroup creation #PSTEST-690 2012-04-18 15:19:36 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00