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

5464 Commits

Author SHA1 Message Date
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 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
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
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
Rémi Gaillard 4cba2623e5 Merge pull request #926 from djfm/loc_ui 
//Localization
 2013-11-18 06:32:34 -08:00
Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
 2013-11-18 14:49:27 +01:00
Jerome Nadaud bcc851c98c // Update image fix 2013-11-18 14:44:23 +01:00
Jerome Nadaud 46dc93fd7e // Adding update button on to page header toolbar on module 2013-11-18 14:41:49 +01:00
Damien Metzger b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Jerome Nadaud 5106a5f1e3 // Fix products controller title 2013-11-15 17:25:12 +01:00
Jerome Nadaud 5fb4ac5044 // Fix missing last actions button in tracking controller list 2013-11-15 16:25:31 +01:00
gRoussac bfed3532bf [*] BO : AdminPerformances Hide warnings message when not necessary 2013-11-15 16:12:07 +01:00
gRoussac 73bf2a7db1 [-] BO : Fix #PSCFV-11016 typo 2013-11-15 15:16:02 +01:00
Jerome Nadaud 44f89053e4 // Invoice search fix 2013-11-15 15:00:56 +01:00
Jerome Nadaud 18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Jerome Nadaud 299a8e9e9f // Update attributes group title 2013-11-14 14:13:28 +01:00
gRoussac 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c 2013-11-14 11:43:05 +01:00
Vincent Augagneur 9a0b308846 //remove preactivationLink ajax and move in gamification module 2013-11-14 10:54:29 +01:00
gRoussac db99f188a2 [-] BO : AdminImport, execption when creating groups 2013-11-13 18:23:41 +01:00
fram 28e1a94bb6 // instead instead of insted 2013-11-13 15:10:06 +01:00
Jerome Nadaud 2cbf8af2b2 // Cms title 2013-11-13 09:36:58 +01:00
Kevin Granger 4fbc8deaa8 // fix products 2013-11-12 18:21:36 +01:00
Jerome Nadaud c7fff6b20d // Change edit title on employees controller 2013-11-12 12:05:00 +01:00
Jerome Nadaud d6df601d0e // Preferences identrifer names 2013-11-12 11:55:54 +01:00
Jerome Nadaud fe387fa8ed // Set Identifier name for search engine 2013-11-12 11:30:26 +01:00
Jerome Nadaud 41196f3c5f // General modification for view and edit title 2013-11-12 11:06:20 +01:00
Jerome Nadaud 44d1ed0982 // Add category name to page header title 2013-11-12 10:45:17 +01:00