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

58 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
gRoussac
ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
Damien Metzger
b1b636a911 // Added helpbox and fixed translation 2013-08-13 14:16:40 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
sLorenzini
0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +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
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
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
fSerny
d6507099d4 // Fixing warning on PaymentModule Tab 2012-05-22 10:19:01 +00:00
fSerny
f8235d2309 // Fixing warning on PaymentModule Tab 2012-05-22 10:19:01 +00:00
fSerny
5472e45bbc [-] BO : Fixing warnings on PaymentModule Tab 2012-05-22 09:40:18 +00:00
fSerny
b6aeb92914 [-] BO : Fixing warnings on PaymentModule Tab 2012-05-22 09:40:18 +00:00
vSchoener
5b83d9b495 [-] BO : Fixed bug #PSCFV-1590. Save restrictions won't delete the ones for inactive module. 2012-05-16 16:15:55 +00:00
vSchoener
32f0b8cdf5 [-] BO : Fixed bug #PSCFV-1590. Save restrictions won't delete the ones for inactive module. 2012-05-16 16:15:55 +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
45cd48afb4 // Display of payment modules per shop #PSTEST-833 2012-02-27 15:18:51 +00:00
rMalie
e58c1c7123 // Display of payment modules per shop #PSTEST-833 2012-02-27 15:18: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
rMalie
91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00
rMalie
bfd3e8deb1 // Improve multishop API 2012-02-23 15:39:44 +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
dMetzger
5b27eeb8c5 // BO : Small optimization on the payment page 2012-02-21 08:51:10 +00:00
dMetzger
f344430217 // BO : Small optimization on the payment page 2012-02-21 08:51:10 +00:00
mDeflotte
b47fcca12d [-] BO : #PSFV-391 - Country restrictions for payment modules is not effective 2012-01-30 17:09:17 +00:00
mDeflotte
7198161661 [-] BO : #PSFV-391 - Country restrictions for payment modules is not effective 2012-01-30 17:09:17 +00:00
rMalie
8836b9e392 // Normalize 2012-01-25 17:26:04 +00:00
rMalie
33faa2bb1d // Normalize 2012-01-25 17:26:04 +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
fSerny
2b6ff67ed3 [-] BO : Module loading ptimization on Payment Admin Controller 2012-01-06 10:28:16 +00:00
fSerny
98e2f1c6b7 [-] BO : Module loading ptimization on Payment Admin Controller 2012-01-06 10:28:16 +00:00
mDeflotte
e187c0b873 // BugFix - PSTEST-65 - bouton retour à la liste onglet paiement 2011-12-20 09:00:26 +00:00
mDeflotte
2f92d7d271 // BugFix - PSTEST-65 - bouton retour à la liste onglet paiement 2011-12-20 09:00:26 +00:00
tDidierjean
d019c03bb9 // AdminControllers fixes 2011-11-30 18:16:13 +00:00