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

117 Commits

Author SHA1 Message Date
Jerome Nadaud 99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +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
Jerome Nadaud 0247550a0a // Fix accordion for bootsrap and better bulk action for warehouse 2013-09-24 17:18:37 +02:00
Jerome Nadaud c9eb5b5be6 // Products multistore design 2013-09-24 12:29:12 +02:00
Rémi Gaillard c6222c51c8 // commit 6b47f5713e is missing 2013-09-23 11:36:15 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +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
Jerome Nadaud 41190a66d4 [+] BO : Product tab fieldset and accordion fix 2013-08-19 18:45:57 +02:00
Jerome Nadaud 0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud c6d3545b8b [-] BO :FixBug Suppliers and Warehouses accordion 2013-08-13 17:14:57 +02:00
Jérôme Nadaud 95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
Jérôme Nadaud 07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
Jérôme Nadaud ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
Jérôme Nadaud cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Jérôme Nadaud 794475a9cc [-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier 2013-07-22 14:33:16 +02:00
Kevin Granger 0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Kevin Granger 02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
Rémi Gaillard e34289b0b7 // fix product warehouses 2013-07-12 18:53:22 +02:00
Kevin Granger 1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Vincent Augagneur c8a67fbc40 [+] CORE : new jquery UI version (1.10.3) 2013-06-25 11:16:04 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Rémi Gaillard 655ab84d07 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard f33a0d2f9f [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form 2013-01-02 16:48:30 +01:00
Rémi Gaillard d42172e6f8 [-] BO: Fix #PSCFV-5706 save of product availability on global context 2012-12-03 17:53:47 +01:00
vAugagneur c6d5d6a95b //small js fix 2012-12-03 15:55:46 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur 06fca34bd6 [-] BO : fixed bug #PSCFV-5141 - Product Url being rewritten when a product is edited 2012-11-16 13:21:53 +00:00
vAugagneur 1415f86566 //fix for 1.5.2.0 2012-10-22 12:41:28 +00:00
vAugagneur 7f34960895 [-] BO : fixed bug #PSCFV-4319 2012-09-24 13:07:32 +00:00
rGaillard 70ada6b4c4 // reset id_product_attribute after cancel to editing a combination 2012-09-19 17:06:36 +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
mDeflotte 202728403c [-] BO : #PSCFV-3366 - Not possible to create customizable fields on multishop context 2012-08-01 08:15:35 +00:00
tDidierjean 4faf469eb1 [-] BO : fix bug #PSCFV-2897 - JS error on combination page 2012-06-25 14:29:39 +00:00
vAugagneur 2f25b8849b [-] BO : fixed bug #PSCFV-2665 2012-06-04 09:08:37 +00:00
tDidierjean 565ce7a2c1 [-] BO : fix bug #PSCFV-2522 - Unable to switch a product from virtual to normal 2012-05-22 13:23:35 +00:00
fBrignoli bf66f03fd7 [-] BO : Bug fixed related to #PSCFV-1354 - Specific price with multishop, groups/currencies/countries should vary in function of the selected shop 2012-05-16 15:51:22 +00:00
tDidierjean 5647c0b4a6 [-] BO : fix bug #PSCFV-2307 - multishop: product modification applied to the wrong shop caused by race condition with ajax calls 2012-05-15 08:34:07 +00:00
tDidierjean cd54f3f8df // small js fixes 2012-05-11 13:39:08 +00:00
tDidierjean efacdab528 [-] BO : fix #PSCFV-2177 - js bug with default supplier selection 2012-05-11 12:49:57 +00:00
tDidierjean 99d7f3e3b8 [-] BO : fix #PSCFV-2302 - import: bug with truncate confirmation 2012-05-11 09:47:57 +00:00
rMalie 24aef3bc08 // Fix click on "all" checkbox on adminproduct for multishop 2012-05-10 08:07:12 +00:00
tDidierjean 560058b9c9 [-] BO : fix bug #PSCFV-2239 - js error on product page on IIS + PHP5.4 2012-05-09 16:50:05 +00:00
rMalie beb95276bd // Fix attr('checked'), attr('disabled') and attr('selected') with jquery update #PSCFV-2142 2012-05-02 08:29:30 +00:00
tDidierjean a2679455ed // #PSTEST-1229 - make sure you cannot select virtual product if you have combinations 2012-04-24 16:45:00 +00:00
tDidierjean dbae669d5f // #PSTEST-1229 - remove virtual combinations 2012-04-24 13:23:02 +00:00
fBrignoli 4d9d6b2303 [*] Project : Jquery 1.7.2 2012-04-20 15:45:43 +00:00
rMalie 84d1e57ad9 // Combination multishop 2012-04-20 10:01:05 +00:00