Kevin Granger
|
4cde899834
|
// localization
|
2013-09-13 12:18:27 +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 |
|
gRoussac
|
6daf8ebbfa
|
[-] BO : Fix error returned when first import of a localisation pack
|
2013-09-03 18:20:58 +02:00 |
|
Sarah Lorenzini
|
816153687c
|
// update localization tab
|
2013-07-30 12:25:20 +02:00 |
|
Damien Metzger
|
3820a011cb
|
// Reduced localization form size
|
2013-03-20 18:10:53 +01:00 |
|
Damien Metzger
|
68be65e60f
|
// Reduced localization form size
|
2013-03-20 18:10:53 +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 |
|
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 |
|
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 |
|