dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
4ef7bd0b7735ed8d280dba6928514dba2eaec2a9
Commit Graph

169 Commits

Author SHA1 Message Date
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
Sarah Lorenzini f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Jerome Nadaud da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
Damien Metzger 496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +02:00
Sarah Lorenzini 142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Rémi Gaillard 4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
François Gaillard 8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
Damien Metzger 155150ea00 [-] BO : fixed product indexation markup in import #PSCFV-7695 2013-03-20 10:43:18 +01:00
Damien Metzger 9ae5e0e12a // Code cleaning 2013-03-19 16:39:02 +01:00
Damien Metzger ce4148b89a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +01:00
Gregory Roussac 4c704c97c4 Merge pull request #325 from DrySs/patch-3 
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
 2013-03-15 17:12:02 +01:00
DrÿSs' 70bb7de9b5 [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport 2013-03-15 16:51:55 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Damien Metzger d811f74d6c // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger 38cc7103fb // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger 2df3e7ee8b // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Damien Metzger 836791bb7a Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Gregory Roussac 6d61b22a4f [-] BO : Fix warnings when importing #PSCFV-6648 again 2013-01-29 12:33:15 +01:00
Gregory Roussac 84005fea26 [-] Bo : Fix warnings #PSCFV-6648 2013-01-29 11:55:51 +01:00
Samy Rabih 8e80cdb6b7 Disable search indexation 
Search indexation is very CPU-intensive, it should not be used here
 2013-01-22 14:34:17 +01:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Damien Metzger 3d1663279a [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:45:40 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard c925f8f9fb [-] BO: Fix #PSCFV-4284 combinations import should delete available stock for combinations and not for products 2012-11-15 16:26:24 +00:00
vAugagneur 04df5fe3ab [-] BO : fixed bug #PSCFV-4274 - supplier reference missing in csv import of combinations 2012-10-31 15:30:58 +00:00
vAugagneur 5f15072eda [-] BO : fixed bug #PSCFV-5251 - unable deactivate product via CSV import 2012-10-25 16:40:03 +00:00
rGaillard f38ef7b915 [-] Core: Fix cache issue and order slip pdf generation 2012-10-22 12:40:15 +00:00
lLefevre 462ef5e55d [-] BO : fix #PSCFV-5019 2012-10-17 09:31:27 +00:00
lLefevre 779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre 221d32301a [-] BO : fix #PSCFV-4764 2012-10-16 13:57:17 +00:00
lLefevre 3c47a0a71c [-] BO : fix #PSCFV-5008 2012-10-16 13:14:14 +00:00
lLefevre d570297658 [-] BO : fix #PSCFV-4988 2012-10-15 09:36:01 +00:00
lLefevre 0b349abb66 [-] BO : fix #PSCFV-4901 2012-10-11 09:02:17 +00:00
vAugagneur b440b6ac14 [-] BO : fixed bug #PSCFV-4209 2012-10-10 09:48:13 +00:00
rGaillard 910b3916c4 [-] BO: Allow only one default combination per product when using import 2012-10-10 09:44:41 +00:00
lLefevre 98135572df [-] BO : fix #PSCFV-4607 2012-10-04 13:33:13 +00:00
lLefevre f686c79473 [-] BO : fix #PSCFV-4672 2012-10-03 12:49:16 +00:00
lLefevre af32a55fad [-] BO : fix #PSCFV-4626 2012-10-03 12:08:00 +00:00
lLefevre 4f6a1ee3c0 [-] BO : fix #PSCFV-4596 : added an option for to force the id during CSV import 2012-10-02 12:08:41 +00:00
lLefevre e09bbe3494 [-] BO : fix #PSCFV-4216 2012-10-01 14:19:39 +00:00
lLefevre 1673825599 [-] BO : fix #PSCFV-4216 2012-10-01 08:41:44 +00:00
lLefevre cf4bb05e6f [-] BO : fix #PSCFV-4424 2012-09-28 09:09:57 +00:00
lLefevre fa98806550 [-] BO : fix #PSCFV-4344 2012-09-28 08:08:08 +00:00
lLefevre b848550d71 [-] BO : fix #PSCFV-4069 2012-09-21 14:01:08 +00:00
lLefevre a867a58058 [-] BO : fix #PSCFV-4131 2012-09-21 13:40:41 +00:00