dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,587 Commits 9 Branches 19 Tags
bcfd092a1db3cd222701e3bf5dc0cab9db3adfca
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
Vincent Augagneur
4124a48b1e //added check on range picker if date from is superior than date to 2013-09-05 16:34:03 +02:00
Vincent Augagneur
c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Vincent Augagneur
b840f28137 //oups 2013-09-03 15:13:05 +02:00
Vincent Augagneur
4d3b378965 //added form date range picker on dashboard 2013-09-03 10:19:15 +02:00
PrestaEdit
4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
Damien Metzger
141772725b // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Damien Metzger
e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +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
Damien Metzger
a33c6ff54b // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Damien Metzger
7bd2bb9cb6 // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Damien Metzger
9ebe9e1894 // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Damien Metzger
d4a6a56d1b // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +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
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
90877048d0 [-] BO : #PSTP-73 : fix bug translations in AdminStatsTabController 2012-06-20 08:43:22 +00:00
lLefevre
72390c4f68 [-] BO : #PSTP-73 : fix bug translations in AdminStatsTabController 2012-06-20 08:43:22 +00:00
rGaillard
ee70b85d6b // Improve performance and bug fixes 2012-06-06 16:22:48 +00:00
rGaillard
99b22fbbb8 // Improve performance and bug fixes 2012-06-06 16:22:48 +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
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
rMalie
caa389bc46 // Normalize 2012-01-26 09:29:50 +00:00
rMalie
f9046ae595 // Normalize 2012-01-26 09:29:50 +00:00
rMalie
3a7325c75e [-] 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
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
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
tDidierjean
e2dbac517f // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00
tDidierjean
b1e9cedf42 // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00
rMalie
a776684f13 // Rename correctly all hooks 2012-01-02 15:52:40 +00:00
rMalie
15614d2747 // Rename correctly all hooks 2012-01-02 15:52:40 +00:00
rMalie
165573abc9 // Remove AdminStatsConf controller (conf is already in AdminStatsTab) 2011-12-08 09:25:10 +00:00
rMalie
b0561c5277 // Remove AdminStatsConf controller (conf is already in AdminStatsTab) 2011-12-08 09:25:10 +00:00
rMalie
5172f2f7bf // Add again engines in stats 2011-12-07 13:52:31 +00:00
rMalie
cf17efe87e // Add again engines in stats 2011-12-07 13:52:31 +00:00