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

202 Commits

Author SHA1 Message Date
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +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
gRoussac
c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +01:00
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Jerome Nadaud
9193a29a44 [+] MO : Blockcart - Add error handler on ajax function 2013-10-31 19:02:43 +01:00
gRoussac
4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
Fabio Chelly
3e999ab591 [-] MO blockcart 
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
 2013-10-23 10:56:48 +02: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
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
gRoussac
008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
gRoussac
89ac0bc439 [-] FO : Fix #PSCFV-10480 again, css fix 2013-09-24 16:34:18 +02:00
gRoussac
1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
gRoussac
d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name 2013-09-23 17:26:36 +02:00
gRoussac
92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
vAugagneur
c7ebf5ba5d //blockcart is now using bootstrap design 2013-09-20 11:24:16 +02:00
Francois Gaillard
63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
gRoussac
a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	modules/blockcart/ajax-cart.js
 2013-09-02 10:00:24 +02:00
sagaradonis
9cd73b411d Update ajax-cart.js 
.size() replaced by .length as .size() is outdated
 2013-08-31 19:05:14 +05:30
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Damien Metzger
ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Jerome Nadaud
f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click 2013-08-19 16:37:48 +02:00
Jerome Nadaud
8be3344e41 // W3C validation error 2013-08-09 18:49:47 +02:00
Jerome Nadaud
bc7d16ede6 [-] FO : FixBug generated_date error 2013-08-09 18:48:26 +02:00
Jerome Nadaud
a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Jerome Nadaud
64698d1590 [-] FO : FixBug generated_date error 2013-08-09 09:10:53 +02:00
Sarah Lorenzini
166d8a69fa [-] FO: fixed bug shopping cart price misplaced - #9971 2013-08-05 10:21:46 +02:00
Vincent Augagneur
fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
gRoussac
f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart 2013-07-15 17:29:08 +02:00
Damien Metzger
62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
gRoussac
8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart 2013-07-04 17:42:35 +02:00
gRoussac
c335115f68 // remove console.log 2013-07-04 16:48:56 +02:00
gRoussac
0bddd17889 // remove console.log 2013-07-04 16:43:17 +02:00
gRoussac
ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart 2013-07-03 15:04:11 +02:00
Damien Metzger
75cddbae99 // Protected smarty variable in JS 2013-06-27 16:41:57 +02:00
Damien Metzger
4c28d49487 [-] FO : fixed remove button for free product in the cart block #PSCFV-8465 2013-06-26 16:51:45 +02:00
Damien Metzger
57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
sLorenzini
06af6bdfb5 [-] FO: some W3C errors corrected 2013-06-07 16:30:45 +02:00
Damien Metzger
ca64179950 // W3C 2013-06-06 15:27:29 +02:00
Grégoire Bélorgey
1652f3575c [*] MO : blockcart - simpler selectors 2013-05-28 09:37:32 +02:00
Vincent Augagneur
a5f8263c9d Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Vincent Augagneur
bbb24c3d1b Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Rémi Gaillard
0ddc7e0e4b // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard
b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
Rémi Gaillard
7d5830af94 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Rémi Gaillard
7f92b45c33 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard
614556ec3d // small fix 2013-05-20 10:58:49 +02:00