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

574 Commits

Author SHA1 Message Date
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Jerome Nadaud
53b327ec46 // small fix 2013-11-29 18:32:05 +01:00
Jerome Nadaud
4c2500fb35 // Remove unnecessary code 2013-11-29 14:35:06 +01:00
Jerome Nadaud
e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
Jerome Nadaud
9e6868ba97 // Change product attachment upload system 2013-11-28 19:09:24 +01:00
Jerome Nadaud
cc8f4696b1 // Small Fix in product image upload 2013-11-27 15:56:15 +01:00
Jerome Nadaud
dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +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
Jerome Nadaud
3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
indesign47
569c81c0de [+] BO : AdminProducts add import products 2013-11-22 09:45: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
Jerome Nadaud
5106a5f1e3 // Fix products controller title 2013-11-15 17:25:12 +01:00
Kevin Granger
4fbc8deaa8 // fix products 2013-11-12 18:21:36 +01:00
Jerome Nadaud
ef469d7782 // Move spin and ladda js to products controller 2013-11-08 17:47:09 +01:00
Jerome Nadaud
bf67bd56a3 // Add uploader to products controller 2013-11-08 16:29:07 +01:00
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Jerome Nadaud
0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Damien Metzger
e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +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
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
gRoussac
0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Jerome Nadaud
a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
gRoussac
2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
Rémi Gaillard
5ac471deaf // product toolbar 2013-10-25 16:11:33 +02:00
Rémi Gaillard
554ab9414f [-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context 2013-10-23 15:08:02 +02:00
Jerome Nadaud
45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Jerome Nadaud
6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Jerome Nadaud
cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
 2013-10-18 18:47:42 +02:00
Jerome Nadaud
7e176b157b // Fix save and preview button 2013-10-18 18:44:13 +02:00
Kevin Granger
5f52a9e171 // fix products 2013-10-18 18:38:02 +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
Rémi Gaillard
3bc02bbe10 // fields are already correctly formated when they are in a object coming from the database 2013-10-14 10:56:38 +02:00
Damien Metzger
a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Jerome Nadaud
d595cd2f12 // Toolbar modif for products 2013-10-08 18:51:10 +02:00
Jerome Nadaud
b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Damien Metzger
a14118863e // Code cleaning 2013-10-08 14:45:21 +02:00
Rémi Gaillard
7d0e9a5f06 // Fix double entities on AdminLog listing #PSCFV-10472 2013-10-07 19:37:58 +02:00
Jerome Nadaud
9ae6546d90 // Features - Remove select language with one language and add autosize to textarea 2013-10-04 12:23:01 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +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
Nino Uzelac
ca01b58262 fix multilingual field validity in AdminProductsController 2013-09-27 18:22:07 +02:00
Damien Metzger
6e6fe384ff // KPIs updated 2013-09-24 17:26:05 +02:00
Jerome Nadaud
f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
Damien Metzger
39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage 2013-09-18 15:09:04 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Damien Metzger
8a4b24f45e // Added KPIs in products and categories 2013-09-18 13:49:42 +02:00
Jerome Nadaud
8f10a0e32f // Product customization 2013-09-17 17:30:23 +02:00
Jerome Nadaud
57ed337030 // Fix autosize for products attachment tab textarea 2013-09-16 18:57:11 +02:00
Jerome Nadaud
2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00