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

5487 Commits

Author SHA1 Message Date
Damien Metzger 35fc864e0b // Fixed potential warning 2013-11-28 14:29:40 +01:00
gRoussac cb9d00352f [-] BO : Adminimport reset selected csv if not exists 2013-11-28 14:19:23 +01:00
Jerome Nadaud 37afb369c3 // Fix already defined Core class 2013-11-28 11:46:32 +01:00
Vincent Augagneur dde8540a86 //carrier wizard logo location fixed 2013-11-28 11:27:34 +01:00
gRoussac 8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Kevin Granger cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
Jerome Nadaud 76f115ac22 // Small Fix in Import controller 2013-11-27 18:12:45 +01:00
Jerome Nadaud 17294618e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 17:57:31 +01:00
Jerome Nadaud 724d52e019 // Adding timestamp filename to csv import 2013-11-27 17:57:19 +01:00
Damien Metzger 8c4e2a9a93 // Removed useless lines 2013-11-27 17:40:35 +01:00
Jerome Nadaud b58e8b6bb7 // One step csv uploader 2013-11-27 16:35:58 +01:00
Jerome Nadaud cc8f4696b1 // Small Fix in product image upload 2013-11-27 15:56:15 +01:00
gRoussac 5485433df6 [-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819 2013-11-26 22:57:57 +01:00
rGaillard 58eb63e99e // small fix 2013-11-26 17:02:13 +01:00
Jerome Nadaud dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
Gregory Roussac 841f6ec65d Merge pull request #1011 from indesign47/patch-10 
[+] BO : AdminSearchConf add import alias
 2013-11-26 02:35:30 -08:00
Damien Metzger 9ad56871de Merge pull request #1004 from djfm/bootstrap 
// when adding a translation pack, do not install translations for modules that are not on the disk
 2013-11-26 01:31:24 -08:00
Jerome Nadaud 5eae3acee3 // Add new value button at attribute controller start 2013-11-25 18:29:06 +01:00
Kevin Granger 0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:17:15 +01:00
Kevin Granger fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Damien Metzger 93cbad2a05 [*] BO : replaced age by total spent in the customer list 2013-11-25 14:30:04 +01:00
Damien Metzger b8c77d90b4 [*] BO : Added countries to order list (idea from PhpMadman https://github.com/PrestaShop/PrestaShop/pull/909) 2013-11-25 12:17:40 +01:00
Jerome Nadaud 611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category 2013-11-25 12:08:34 +01:00
Gregory Roussac c613ca5a7d Merge pull request #1009 from indesign47/patch-6 
[+] BO : AdminProducts add import products
 2013-11-25 03:00:08 -08:00
Damien Metzger dec1555b32 // Fixed dashboard simulation mode switch 2013-11-25 11:30:30 +01:00
Gregory Roussac c6e1fbbae9 Merge pull request #1010 from indesign47/patch-8 
[+] BO : AdminAttributes add import combinations
 2013-11-25 01:41:12 -08:00
Jerome Nadaud 3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
Damien Metzger 361450aab9 // Fixed entities on KPIs 2013-11-22 16:15:48 +01:00
Felipe Uribe 5113125a0d Update AdminPPreferencesController.php 
Falta coma:

),
					'PS_DISPLAY_DISCOUNT_PRICE' => array(
 2013-11-22 07:23:09 -05:00
gRoussac dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
indesign47 20cc8c3f42 [+] BO : AdminSearchConf add import alias 2013-11-22 09:54:53 +01:00
indesign47 a76578b094 [+] BO : AdminAttributes add import combinations 2013-11-22 09:51:20 +01:00
indesign47 569c81c0de [+] BO : AdminProducts add import products 2013-11-22 09:45:15 +01:00
Damien Metzger 47531534fc // Updated Addons API call in the search 2013-11-21 18:34:42 +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
Damien Metzger 26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
Damien Metzger 9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Jerome Nadaud 9229d6cb52 // Features and attributes title and buttons 2013-11-21 12:10:15 +01:00
Jerome Nadaud 2e16a1e5d4 // Better products attributes list button handle 2013-11-21 11:25:09 +01:00
fram 5a9bb5106f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 10:16:47 +01:00
Jerome Nadaud 89f400d3fc // Remove unnecessary button from shipping options 2013-11-21 10:12:53 +01:00
Jerome Nadaud 24daa6fa05 // Changing add new title button label 2013-11-21 10:04:03 +01:00
Jerome Nadaud a536833f52 // Some bootstrap changes in controllers 2013-11-20 18:44:20 +01:00
Jerome Nadaud a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
fram 64e84ff296 // when adding a translation pack, do not install translations for modules that are not on the disk 2013-11-20 17:35:09 +01:00
Jerome Nadaud e2aa776a64 // update cms controller title 2013-11-20 15:19:07 +01:00
Jerome Nadaud 62a149ebe6 [-] BO : FixBug #PSCSX-33 Misplaced save button 2013-11-20 14:50:31 +01:00
Jerome Nadaud 339fb86f4b // oops 2013-11-18 17:42:26 +01:00
Jerome Nadaud 04bc320080 // Small fix 2013-11-18 17:41:16 +01:00
Damien Metzger 1f71090b86 // Timeout increased for translation download #PSCFV-11046 2013-11-18 15:37:34 +01:00