Kevin Granger 369ac0f664 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl

2013-11-18 15:13:04 +01:00

..

configuration_bar.tpl

// Adding more buttons to module configuration

2013-11-14 15:49:17 +01:00

configure.tpl

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-11-18 15:13:04 +01:00

content.tpl

// Added Modules KPIs

2013-10-08 19:39:52 +02:00

favorites.tpl

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-11-04 14:43:01 +01:00

filters.tpl

[*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned)

2013-10-09 18:33:41 +02:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

js.tpl

// small fix

2013-10-30 18:28:55 +01:00

list.tpl

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-11-04 14:43:01 +01:00

login_addons.tpl

// Modules page + Warning

2013-08-26 11:38:10 +02:00

page.tpl

// Wrong col size

2013-11-08 17:58:09 +01:00

tab_module_line.tpl

// small change

2013-10-21 12:39:48 +02:00

tab_modules_list.tpl

// Modules page + Warning

2013-08-26 11:38:10 +02:00

top.tpl

// Code cleaning (backoffice javascript)

2013-10-11 10:47:48 +02:00