Commit Graph

25 Commits

Author SHA1 Message Date
Kevin Granger 5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Jerome Nadaud 5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Jerome Nadaud 4c5a6d1efb // Payment bootstrap design 2013-09-26 10:09:50 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Sarah Lorenzini d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
2013-07-24 17:01:23 +02:00
sLorenzini 0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +02:00
Piotr Moćko 68d135b4cf Payment currency restriction incorret type of input for radio
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
2013-07-11 18:56:50 +02:00
gRoussac 9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02: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
dMetzger 06465bc9ea // fix issue in AdminPayment 2012-05-22 13:54:46 +00:00
dMetzger 4dd956fdb8 // fix issue in AdminPayment 2012-05-22 13:54:46 +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
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
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