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

60 Commits

Author SHA1 Message Date
Jerome Nadaud
a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
Jerome Nadaud
1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +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
a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Rémi Gaillard
598469e41e // typo debug 2013-08-27 15:38:29 +02:00
Sarah Lorenzini
816153687c // update localization tab 2013-07-30 12:25:20 +02:00
Damien Metzger
006e8718f2 // Improved label of IETF language tag 2013-07-01 12:35:32 +02:00
Damien Metzger
8f01b35f46 [-] BO : fixed translation and languages issues 2013-06-27 17:51:25 +02:00
gRoussac
a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
Damien Metzger
459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Rémi Gaillard
0f2551f5d6 // Remove unnecessary fsockopen 2013-03-15 16:25:19 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
9000f5184f [-] BO: don't allow bulkdelete of default language 2013-02-26 16:57:00 +01:00
Rémi Gaillard
801b73055e [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
f9c12ad564 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
DamienMetzger
89e207bc4e [-] BO : you can now remove the english language by whatever mean you like most #PSCFV-5815 2012-11-23 15:13:47 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
b394e535a7 //small fix 2012-10-22 16:19:27 +00:00
vAugagneur
402a19f19a //small fix 2012-10-22 13:07:03 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
vAugagneur
85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur
b9e27705df //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
aFolletete
e9bbc06317 // add information message 2012-05-22 14:41:46 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
lLefevre
5330d087fa [-] BO : #PSTEST-1060 : fix bug 2012-03-22 16:33:33 +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
74cd81a66c // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre
05c2b696ce // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre
6608328a2a // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
8994d63ba6 // Fix translation pack fetching in AdminLanguages form 2012-03-07 16:35:29 +00:00
rMalie
ec80336fda [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
mMarinetti
913927d2b0 // replaced api by www in Language class and AdminTranslationsController 
// better error message when suhosin or max_input_vars exceeded in Translations forms
// cleanning/comments code in email translations functions
 2012-02-29 14:36:41 +00:00
rMalie
ffbb4cd3e2 // Fix multishop context in BO 2012-02-27 17:14:33 +00:00
rMalie
7655ee2a3e // Improve shop associations in BO 2012-02-24 09:11:18 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean
5946c9fe93 // Finish removing the "id_theme in ImageType" code 2012-02-13 15:35:05 +00:00
rMalie
359eb16ee5 // Fix list of lang pack from prestashop.com 2012-02-01 15:31:42 +00:00
rMalie
2ca3b2b029 // Normalize 2012-01-25 16:48:14 +00:00
rMalie
f08ce5cb8b [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 2012-01-23 10:21:51 +00:00
rMalie
eee9b353c1 [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 2012-01-19 10:14:10 +00:00
mBertholino
c60ebe8abe [-] BO : #PSTEST-423 : bug fixed 2012-01-17 08:32:03 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00