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 |
|
Rémi Gaillard
|
0f81518ba2
|
// Add a buton to erase all log
|
2013-09-05 15:58:36 +02:00 |
|
Rémi Gaillard
|
dd9aa9fdb5
|
// disable log deletion
|
2013-08-21 17:43:34 +02:00 |
|
Sarah Lorenzini
|
142006e69a
|
// update advanced parameters
|
2013-08-02 15:10:58 +02:00 |
|
Rémi Gaillard
|
004e833b24
|
[+] BO: Addition, deletion and edition are now logged
|
2013-07-11 14:50:23 +02:00 |
|
vAugagneur
|
4ef61eb8f8
|
[-] BO : error message on install module
|
2013-02-05 09:41:34 +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
|
a1db83ef41
|
//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
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
lLefevre
|
0d4ff05960
|
[-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages
|
2012-05-15 10:04:43 +00:00 |
|
tDidierjean
|
c5bf3ab59a
|
// Rename fieldsDisplay to fields_list part2 (timeout)
|
2012-03-29 16:29:31 +00:00 |
|
tDidierjean
|
60ad46c3d1
|
// Renaming options to fields_options
|
2012-03-29 16:14:14 +00:00 |
|
lLefevre
|
6301922ab9
|
// Fix replace //" by " in english keys and change french keys
|
2012-03-14 17:25:41 +00:00 |
|
lLefevre
|
9f4e2698ee
|
// revert to revision 14160
|
2012-03-14 15:05:13 +00:00 |
|
lLefevre
|
7d71d0316c
|
// Fix replace \\" by " in english keys
|
2012-03-14 14:58:48 +00:00 |
|
lLefevre
|
1998bb56d4
|
// Fix update english key of translations in all files
|
2012-03-14 12:25:51 +00:00 |
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
1c288bf01d
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
vKham
|
eef7e9ecd8
|
// fix table extensible
|
2011-12-22 19:45:23 +00:00 |
|
lLefevre
|
54861e073d
|
// fix display AdminLogsController
|
2011-11-22 17:21:41 +00:00 |
|
tDidierjean
|
2dd023e92d
|
[*] BO : #PSFV-94 - added AdminLogsController and changed initX() functions to return their result
|
2011-10-21 13:40:41 +00:00 |
|