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

83 Commits

Author SHA1 Message Date
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
gRoussac
c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
Jerome Nadaud
a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Jerome Nadaud
e47f0a7c68 // Adding stats compare date to employee table 2013-10-11 18:34:20 +02:00
Damien Metzger
f80b348d86 // Default vertical menu in BO 2013-10-11 11:02:35 +02:00
Damien Metzger
39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage 2013-09-18 15:09:04 +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
Damien Metzger
06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
gRoussac
da353c884d [-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT 2013-09-04 10:45:48 +02:00
Damien Metzger
e6ecf0c177 // Added a more efficient index 2013-07-25 17:07:28 +02:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
vAugagneur
231614290a [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
vAugagneur
bfc717e241 [-] BO : fixed bug #PSCFV-8095 now maximum weigh for carrier is float 2013-03-28 12:06:32 +01:00
Rémi Gaillard
6c84dce1e9 [-] Core: increase size of phone field 2013-03-01 16:01:26 +01:00
Damien Metzger
8b2e9fb08e [+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order 2013-02-28 15:23:21 +01:00
Rémi Gaillard
3fd12ef9bd [-] Installer: fix UNIQUE key on stock_available table #PSCFV-7886 2013-02-20 16:12:39 +01:00
vAugagneur
4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
Damien Metzger
a53163feee [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Damien Metzger
4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
vAugagneur
a0a5aa929d [-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short 2013-01-07 14:08:08 +01:00
vAugagneur
2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger
0af5008818 // Missing part of a fix 2012-12-31 09:45:10 +01:00
Damien Metzger
c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Rémi Gaillard
2a14176055 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
Rémi Gaillard
35013b82fe [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
vAugagneur
2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
vAugagneur
47412852a8 [-] FO : fixed bug #PSCFV-5236 - 2 issues with Customer::outstanding_allow_amount 2012-11-05 15:32:06 +00:00
lLefevre
5aae2111a5 [-] BO : fix #PSCFV-4953 2012-10-15 08:41:27 +00:00
rGaillard
88457e2cce // Fix #PSCFV-4569 2012-10-01 16:16:54 +00:00
rGaillard
1e1549d9eb // small fix 2012-10-01 11:38:53 +00:00
rGaillard
06ef191d41 [-] Installer : Fix #PSCFV-4306 2012-09-25 18:30:29 +00:00
rGaillard
07df641b65 // Miss files 2012-09-18 08:35:35 +00:00
rGaillard
3835d068d2 [*] Core: Image covers is now multishop 2012-09-14 14:25:44 +00:00
dMetzger
5e038a6dd1 [-] Installer : changed the primary keys of tha language tables of category, product, meta, carrier #PSCFV-3726 2012-09-11 15:58:10 +00:00
dMetzger
edb9bd04b7 // Merged improvements of 1.4.9 database schema 2012-09-06 15:50:28 +00:00
vAugagneur
0a41c84666 //oups 2012-09-04 12:38:09 +00:00
dMetzger
8abc3dbac6 // Fixed #PSCFV-3845 2012-08-31 08:49:15 +00:00
rGaillard
f2b6fd5289 // Fix installer 2012-08-23 16:56:18 +00:00
dMetzger
fdc5adc415 [*] BO : Changed the default list view for products and categories when multistore is activated 2012-08-23 14:36:52 +00:00
dMetzger
6b5abfa1d3 // Added index in installer 2012-08-17 10:10:01 +00:00
dMetzger
bd56ebf337 // Oops #PSCFV-3647 #PSCFV-3649 #PSCFV-3650 2012-08-17 07:06:10 +00:00
dMetzger
62cbffc551 // Added missing index 2012-08-16 14:32:47 +00:00
dMetzger
4229fffe61 [-] Installer : fixed warnings #PSCFV-3633 2012-08-16 09:59:35 +00:00
dMetzger
c170eca2be // Perfs and clean 2012-08-14 14:18:55 +00:00
dMetzger
455f13e996 // Perfs and clean 2012-08-14 14:10:11 +00:00
rGaillard
63a2b6c9f2 [-] BO: Invoices and products order detail are now not empty after deleting a product 2012-08-07 12:20:10 +00:00
dMetzger
2ed5310998 [-] Installer : crash with mysql strict mode fixed (datetime has a range of 1000-9999) 2012-08-06 12:05:58 +00:00
vChabot
36cd2717f3 // fixing SQL #PSCFV-3366 2012-08-01 15:28:23 +00:00
rGaillard
98edaa8979 [*] Core: you can now associate modules to order states in order to add extra mail vars 2012-07-31 09:18:41 +00:00