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

66 Commits

Author SHA1 Message Date
Rémi Gaillard
b6d3bf1bc3 // missing method 2013-09-26 13:49:17 +02:00
Jerome Nadaud
b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
Damien Metzger
a7f9f23b73 // AdminStates code cleaning 2013-09-25 16:00:29 +02:00
Damien Metzger
337b7333a2 // Improved States tab 2013-09-25 15:45:00 +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
Rémi Gaillard
51083e17af // 2013-08-29 17:18:05 +02:00
Jerome Nadaud
a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +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
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
vAugagneur
7f130e3c4b [-] BO : fixed bug #PSCFV-4750 2012-10-09 16:36:13 +00:00
vAugagneur
c50a1b7530 [-] BO : fixed bug #PSCFV-4750 2012-10-09 16:36:13 +00:00
mDeflotte
516b555397 // Normalization 2012-07-18 14:27:55 +00:00
mDeflotte
151abedb04 // Normalization 2012-07-18 14:27:55 +00:00
mDeflotte
991aa1da1c [-] BO : #PSCFV-3234 - Change error message 2012-07-17 14:39:33 +00:00
mDeflotte
435db38e5c [-] BO : #PSCFV-3234 - Change error message 2012-07-17 14:39:33 +00:00
vAugagneur
f65dd294db //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
vAugagneur
b9e27705df //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
dMetzger
40c79494e1 [-] BO : changed state iso code max length #PSCFV-2220 2012-05-09 12:00:50 +00:00
dMetzger
f80ffe338b [-] BO : changed state iso code max length #PSCFV-2220 2012-05-09 12:00:50 +00:00
dMetzger
dc23b1d5ca [-] BO : you cannot create 2 states with the same iso code in the same country anymore #PSCFV-53 2012-05-03 15:11:43 +00:00
dMetzger
95b1fdc779 [-] BO : you cannot create 2 states with the same iso code in the same country anymore #PSCFV-53 2012-05-03 15:11:43 +00:00
tDidierjean
24c326e2bc // Rename fieldsDisplay to fields_list part3 (timeout) 2012-03-29 16:31:01 +00:00
tDidierjean
ad1d630fd6 // Rename fieldsDisplay to fields_list part3 (timeout) 2012-03-29 16:31:01 +00:00
vAugagneur
5534a52edf // 2012-03-14 10:20:30 +00:00
vAugagneur
feea1838c3 // 2012-03-14 10:20:30 +00:00
bMancone
069b4add05 // Fixed revision 13573 2012-02-28 13:13:47 +00:00
bMancone
362258ede6 // Fixed revision 13573 2012-02-28 13:13:47 +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
mDeflotte
07ebf2e2e5 // Removing attribute 'preselect_country' and use 'default_value' instead 2012-02-22 14:27:32 +00:00
mDeflotte
47aed25464 // Removing attribute 'preselect_country' and use 'default_value' instead 2012-02-22 14:27:32 +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
mDeflotte
0088f5d245 [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 2012-02-16 14:13:04 +00:00
mDeflotte
a52f8c38ee [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 2012-02-16 14:13:04 +00:00
lLefevre
f754faa9f9 // fix remove includeSubTab 2012-01-20 14:00:10 +00:00
lLefevre
3626ca09e0 // fix remove includeSubTab 2012-01-20 14:00:10 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00