dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,656 Commits 9 Branches 19 Tags
37d4d4bd5f08f53537d886feccde308d0dfd02ec
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
Vincent Augagneur
a3282025cf //referralprogram retro compat 1.5 when using helper form in module configuration 2013-11-20 18:05:56 +01:00
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Vincent Augagneur
8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
Vincent Augagneur
38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Vincent Augagneur
dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
gRoussac
a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from 1d5df338c4 2013-07-18 18:18:57 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
gRoussac
e385e2d19c [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
DamienMetzger
33ef60652f [-] MO : fixed referralprogram uninstall #PSCFV-5680 2012-11-21 19:44:14 +01:00
dMetzger
dea775261c [-] MO : fixed link in referral program #PNM-532 2012-10-03 12:17:40 +00:00
lLefevre
c52c1fa171 // Fix small bug 2012-09-19 09:02:25 +00:00
dMetzger
69d5329cb7 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 2012-08-29 09:55:39 +00:00
lLefevre
f36f1c03d1 [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
fSerny
ee4541a341 [-] MO : Fix hook name on differents modules - #PSCFV-2784 2012-07-02 08:51:05 +00:00
lLefevre
53504c37a3 [-] FO : #PSCFV-2150 : Translations of modules are connected width sprintf() 2012-05-15 08:54:24 +00:00
lLefevre
9642598b6f [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations 2012-05-09 10:06:23 +00:00
dMetzger
32745f4ba3 [-] MO : retro compatibility fixed with Referral program #PSCFV-1531 2012-05-03 08:34:18 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
443092c811 // Normalize + use $this->smarty instead of $this->context->smarty in modules 2011-12-30 14:59:57 +00:00
lLefevre
0900e2eb1a [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail() 2011-12-05 17:22:47 +00:00
dMetzger
4fbb25168e // Retro compatibility and updater improved for Discount/CartRules 2011-11-02 14:23:44 +00:00
rMalie
9510337b1d // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 2011-10-10 12:18:56 +00:00
rMalie
bbc6c6bdc4 // Merge -> revision 9061 2011-10-05 15:21:55 +00:00
rMalie
91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
tDidierjean
a7ad178f28 //// Merge -> revision 8290 2011-09-01 09:53:43 +00:00
rMalie
74843c4060 2011-08-24 15:57:10 +00:00
rMalie
d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
tDidierjean
55c1a0afeb // Context part 28 2011-07-29 15:06:20 +00:00
rMalie
02a738dce1 // Context part 15 2011-07-19 16:17:14 +00:00
rMalie
ff81f71449 // Context in modules + Shop::sql* methods 2011-07-19 09:23:10 +00:00
rGaillard
8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete
05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00