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

62 Commits

Author SHA1 Message Date
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
Damien Metzger 06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Damien Metzger ec11b7e064 // Better control of the requests when our website is down 2013-09-06 10:18:48 +02:00
Vincent Augagneur 39c882cdb4 //small fix 2013-08-27 16:21:13 +02: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 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
dMetzger 0f12f57714 // Back office is now always accessible even with a wrong base uri 2012-09-21 08:57:58 +00:00
dMetzger 59f00ea894 // Back office is now always accessible even with a wrong base uri 2012-09-21 08:57:58 +00:00
vAugagneur 21bc1376de [-] BO : fixed bug #PSCFV-4213 2012-09-20 14:08:56 +00:00
vAugagneur c324b5241d [-] BO : fixed bug #PSCFV-4213 2012-09-20 14:08:56 +00:00
dMetzger fbe1702703 // The video is back 2012-09-05 09:31:45 +00:00
dMetzger 30da80e29b // The video is back 2012-09-05 09:31:45 +00:00
lLefevre 1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre 12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
dMetzger 1ce98c26ea // Screencast deprecated #PSCFV-3003 2012-07-05 08:59:47 +00:00
dMetzger 61e5df5577 // Screencast deprecated #PSCFV-3003 2012-07-05 08:59:47 +00:00
dMetzger 4403908775 // Updated the number of shops in the back end 2012-04-18 09:49:05 +00:00
dMetzger c9582ca754 // Updated the number of shops in the back end 2012-04-18 09:49:05 +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
fSerny c1a9ed16ab [+] BO : Preactivation Premium 2012-03-01 17:00:43 +00:00
fSerny 447a1f608b [+] BO : Preactivation Premium 2012-03-01 17:00:43 +00:00
tDidierjean 78c0ad182a // fix translation 2012-02-29 15:22:49 +00:00
tDidierjean cfacd6580f // fix translation 2012-02-29 15:22:49 +00:00
tDidierjean 07cd6e4a38 [-] BO : fix bug #PSTEST-898 - translations 2012-02-29 15:00:45 +00:00
tDidierjean efe85e08cb [-] BO : fix bug #PSTEST-898 - translations 2012-02-29 15:00:45 +00:00
tDidierjean 7b1add1357 [-] TR : fix bug #PSTEST-893 2012-02-28 13:34:31 +00:00
tDidierjean 8bc1cde5ab [-] TR : fix bug #PSTEST-893 2012-02-28 13:34:31 +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
aFolletete 72626f4cbe [-] BO : fixed bug #PSFV-495 - Back-office homepage is not totally translated 2012-02-20 15:54:41 +00:00
aFolletete 5b6fbacde2 [-] BO : fixed bug #PSFV-495 - Back-office homepage is not totally translated 2012-02-20 15:54:41 +00:00