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

51 Commits

Author SHA1 Message Date
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Jerome Nadaud
bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Jerome Nadaud
ff81667b5c // Image thumnail fix 2013-10-18 18:28:57 +02:00
Jerome Nadaud
667353d43f // Store contacts bootstraping 2013-10-18 18:24:21 +02:00
Jerome Nadaud
748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud
234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +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
6059b4301a // states list 2013-09-02 17:10:20 +02:00
Sarah Lorenzini
680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
gRoussac
125884d8c0 [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
gRoussac
91ab0362db [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
François Gaillard
7467fa17da [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +01:00
Francois Gaillard
55caa6f0cb [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +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
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +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
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00: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
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
sLorenzini
f6cc10d793 [-] FO : fixed bug #PSCFV-4117 2012-09-18 07:59:39 +00:00
sLorenzini
3e02600327 [-] FO : fixed bug #PSCFV-4117 2012-09-18 07:59:39 +00:00
mBertholino
849617327d [-] BO : #PSCFV-2255 - overide helper/options in admin-dev/themes/.../stores 2012-05-10 18:48:43 +00:00
mBertholino
d9dacf573a [-] BO : #PSCFV-2255 - overide helper/options in admin-dev/themes/.../stores 2012-05-10 18:48:43 +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
tDidierjean
0f468ac091 // Rename tpl blocks 2012-03-12 16:33:59 +00:00
tDidierjean
f44d00edde // Rename tpl blocks 2012-03-12 16:33:59 +00:00
tDidierjean
4c9438f405 // More helper forms refactoring 2012-03-08 16:45:23 +00:00
tDidierjean
386ddf6443 // More helper forms refactoring 2012-03-08 16:45:23 +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
3a30f788ac // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean
597e921d96 // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean
a94c3b98d8 // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
tDidierjean
e73990a61c // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
lLefevre
7a36bc48d9 // fix htmlentities in .tpl 2012-02-01 18:00:32 +00:00
lLefevre
e0d34a8746 // fix htmlentities in .tpl 2012-02-01 18:00:32 +00:00
tDidierjean
e2dbac517f // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00