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

60 Commits

Author SHA1 Message Date
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +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
Jerome Nadaud
3cf4dc76b5 // Fix missing localizations page header toolbar 2013-09-12 18:54:28 +02:00
Kevin Granger
22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
gRoussac
6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Jerome Nadaud
a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Sarah Lorenzini
816153687c // update localization tab 2013-07-30 12:25:20 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //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
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +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
1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // 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
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
dMetzger
e19831ba78 // Fixed issue with refresh of default_country_modules_list.xml 2012-10-03 16:22:09 +00:00
dMetzger
e411525323 // Fixed issue with refresh of default_country_modules_list.xml 2012-10-03 16:22:09 +00:00
rGaillard
1f83deff29 // Fix display of AdminLocalization 2012-08-22 10:01:48 +00:00
rGaillard
d6079f42ff // Fix display of AdminLocalization 2012-08-22 10:01:48 +00:00
rGaillard
ee70b85d6b // Improve performance and bug fixes 2012-06-06 16:22:48 +00:00
rGaillard
99b22fbbb8 // Improve performance and bug fixes 2012-06-06 16:22:48 +00:00
lLefevre
ea290e7145 [-] BO : #PSCFV-2214 : Change the order of localizations packs 2012-05-09 14:09:43 +00:00
lLefevre
c19b032b4c [-] BO : #PSCFV-2214 : Change the order of localizations packs 2012-05-09 14:09:43 +00:00
rGaillard
2841323568 [-] BO: Fix localization pack url 2012-04-27 12:48:18 +00:00
rGaillard
ede6b37374 [-] BO: Fix localization pack url 2012-04-27 12:48:18 +00:00
lLefevre
92c78364da [*] BO : fixed #PSTEST-1100 2012-04-05 15:40:20 +00:00
lLefevre
7068c0c3e0 [*] BO : fixed #PSTEST-1100 2012-04-05 15:40:20 +00:00
tDidierjean
60ad46c3d1 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
tDidierjean
e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
lLefevre
01e37845f5 // Fix replace \\" by " in english keys and change french keys for errors files 2012-03-15 08:31:12 +00:00
lLefevre
4f86c0d0ac // Fix replace \\" by " in english keys and change french keys for errors files 2012-03-15 08:31:12 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
d2cfa4e8da [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
rMalie
ec80336fda [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
fBrignoli
e768c89345 [*] LO : 1.5 Localization Pack 2012-01-05 14:58:05 +00:00
fBrignoli
75c36565ae [*] LO : 1.5 Localization Pack 2012-01-05 14:58:05 +00:00