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

50 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 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
gRoussac aefa821d7f [*] MO : TM - Blockcart added Layer 2013-10-21 16:55:47 +02:00
vAugagneur c7ebf5ba5d //blockcart is now using bootstrap design 2013-09-20 11:24:16 +02:00
Damien Metzger 62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
Rémi Gaillard 7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
Rémi Gaillard 9a231ac737 [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 2013-02-05 18:25:40 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
mDeflotte 54f68e6e98 [-] MO : #PSCFV-3274 - Blockcart, fix bug with gift products 2012-07-20 13:37:01 +00:00
dMetzger 2c30a0e3f3 [*] FO : cart summary is adapted to cart rules with a special "friendly" display 2012-05-19 13:26:21 +00:00
vChabot 67c108ddd3 // delete confirm message when updating module configuration 2012-05-09 08:29:07 +00:00
tDidierjean 180a0eb37c // FO : more optimizations with unnecessary instantiations 2012-03-14 14:51:49 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
dMetzger b55bf82af6 [-] FO : ajax cart now display cart rules correctly #PSTEST-724 
// Small addition to the controller override
 2012-02-22 11:02:49 +00:00
mMarinetti 677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
dMetzger de6be9b69a // Deprecated code removed 2012-02-09 15:39:14 +00:00
rMalie c280253f23 // Normalize 2012-01-26 14:44:24 +00:00
mDeflotte 21d5fa969b [-] MO : #PSFV-236 - Fixed little problem with form vars named "ajax" 2012-01-05 14:09:51 +00:00
mDeflotte aceac79994 // Fix blockcart removing products 2011-12-21 18:09:48 +00:00
rMalie 1699ae2f34 // Remove Module->templateAssign() from modules (use $this->smarty->assign() instead) 2011-12-05 14:04:35 +00:00
mMarinetti 301d26fbce // fix new theme / old php in modules 2011-12-02 16:41:22 +00:00
mMarinetti 6522914106 [+] Project : default theme added 2011-12-02 15:24:40 +00:00
mDeflotte a0809d91da // BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc 2011-11-22 09:28:22 +00:00
aFolletete a45cd52f13 // Module changes for new native template 2011-11-14 10:56:15 +00:00
dMetzger 554783594e [+] Project : Vouchers are now replaced by cart rules 2011-11-01 18:50:42 +00:00
rMalie 91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
rMalie dc957d3d3a // Rename Module->smartyAssign to Module->templateAssign 
[+] Front: Add module controller + url dispatch for modules
 2011-09-23 13:50:33 +00:00
rMalie 668a8d333c [+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates 2011-09-22 12:05:49 +00:00
aFolletete a6a2df97ef // revert 2011-09-12 15:25:21 +00:00
aFolletete 230bebc7c7 [+] Project : adding Features detachables in order to improve performance 
// clean code
 2011-09-03 17:21:32 +00:00
lCherifi bf9a25fd59 integration new theme standard 2011-08-23 14:25:09 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
rMalie 2bb147128b // Revert normalization 2011-08-11 10:20:59 +00:00
rMalie 7fec565167 // Normalization 2011-08-11 09:58:20 +00:00
tDidierjean 9213581a03 // Context part 27 2011-07-29 14:29:57 +00:00
rMalie 8bb4c75411 // Fix #PSFV-21 2011-07-27 08:15:21 +00:00
tDidierjean 52339502b6 // Context part 12 2011-07-19 09:28:11 +00:00
tDidierjean 6551a3ece7 // Context part 11 2011-07-18 15:50:58 +00:00
tDidierjean 139bb84f87 // Context - first commit 2011-07-11 14:32:05 +00:00
tDidierjean 9b288cecf5 // revert previous commit 2011-07-08 16:12:27 +00:00
tDidierjean af4c7605de // cancel commit 2011-07-08 15:43:24 +00:00
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard d1a13007b9 2011-07-06 10:10:43 +00:00
fBrignoli ff49083fb6 // merge 1.4 (5397) 2011-04-22 16:00:58 +00:00
aFolletete 05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00