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

6077 Commits

Author SHA1 Message Date
Jerome Nadaud c8d9b9bf3a [+] BO : Page header toolbar 2013-08-28 14:07:50 +02:00
Jerome Nadaud a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Rémi Gaillard c72fd867fe // git checkout controllers/ 2013-08-28 12:24:10 +02:00
Rémi Gaillard 63d9005a10 // liveedit 2013-08-28 12:21:01 +02:00
Jerome Nadaud 9d991f3474 [+] BO : Page header toolbar 2013-08-28 11:16:36 +02:00
Jerome Nadaud bfe6c07053 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:17:25 +02:00
Jerome Nadaud e204cbf24e [+] BO : Page header toolbar 2013-08-28 10:17:07 +02:00
Vincent Augagneur 0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Vincent Augagneur 0a2d8175a7 //small fix 2013-08-28 10:03:50 +02:00
Jerome Nadaud 967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
Jerome Nadaud 068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +02:00
Rémi Gaillard 6a4680b4f0 [-] WS: Bad xlink for tax_rules_group in product 2013-08-27 18:58:21 +02:00
Kevin Granger 9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Jerome Nadaud 62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +02:00
Jerome Nadaud 083eba3431 // Small title fix 2013-08-27 18:25:06 +02:00
Jerome Nadaud 4f022c48f8 [+] BO : Products page header toolbar 2013-08-27 18:23:38 +02:00
Jerome Nadaud f60fe74336 [+] BO : Tracking page header toolbar 2013-08-27 18:22:54 +02:00
Vincent Augagneur 901c08cac8 [-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed 2013-08-27 18:13:22 +02:00
Vincent Augagneur 4bb0e16509 [-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed 2013-08-27 16:43:14 +02:00
Rémi Gaillard 30a914b148 // typo 2013-08-27 15:41:00 +02:00
Rémi Gaillard 598469e41e // typo debug 2013-08-27 15:38:29 +02:00
Jerome Nadaud de200e1c5e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-27 09:50:35 +02:00
Rémi Gaillard 6fd7f0114e // small fix 2013-08-27 09:52:05 +02:00
Rémi Gaillard 1a5b9de372 // small fix 2013-08-27 09:51:56 +02:00
Jerome Nadaud 5a685537a4 // Small Fix 2013-08-27 09:49:59 +02:00
Rémi Gaillard 2435edc98c // small fix 2013-08-26 17:17:26 +02:00
Rémi Gaillard 1b26cfffd9 // small fix 2013-08-26 17:13:29 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Jerome Nadaud 9f2423c2c5 [-] BO : FixBug Url rewrite preview when user have a different language from shop 2013-08-26 08:52:22 +02:00
Vincent Augagneur 8412192822 [-] BO : fixed bug with multistore context on carrier wizard 2013-08-23 10:34:30 +02:00
Vincent Augagneur d48df48a03 //small fux on live edit URL 2013-08-23 09:44:47 +02:00
Rémi Gaillard 8ff8ea416d // fix weird bug 2013-08-22 17:37:46 +02:00
Jerome Nadaud 94133bf734 [-] FO : FixBug duplicate fields for delivery address in OPC mode 2013-08-22 16:45:52 +02:00
djfm 47827a1a1b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-22 12:31:28 +00:00
Rémi Gaillard f476b34139 [-] BO: Fix multishop association for tax rules group - #PSCFV-9967 2013-08-22 11:13:11 +02:00
Rémi Gaillard 9d261b8f1f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-22 10:54:07 +02:00
Rémi Gaillard 907d81c32e // duplication of tax_rules_group on adminproducts with multishop 2013-08-22 10:53:50 +02:00
Vincent Augagneur ba95c9a63a [-] BO : fixed bug #PSCFV-10073 - now you can upload carrier logo on windows 2013-08-22 10:09:49 +02:00
Rémi Gaillard dd9aa9fdb5 // disable log deletion 2013-08-21 17:43:34 +02:00
djfm 5faaef9f21 // fixed a few untranslatable strings in CarrierWizard 2013-08-21 14:33:22 +00:00
Rémi Gaillard 600b027efd // fix root categories addition 2013-08-21 14:37:39 +02:00
Damien Metzger 65c6d86e6e // Fixed simple multistore process 2013-08-21 10:23:53 +02:00
Damien Metzger 3287e1664c // Added target blank in a transverse link 2013-08-21 10:18:46 +02:00
Damien Metzger 65becc8550 // Fixed typo 2013-08-21 10:10:52 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Kevin Granger 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud 57d8d9c232 [-] BO : FixBug Preview product url 2013-08-20 15:34:00 +02:00
Damien Metzger 496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +02:00
Jerome Nadaud 787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +02:00