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

Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl

2013-10-22 10:07:03 +02:00

..

controllers

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

2013-10-22 10:07:03 +02:00

helpers

// Remove duplicate class

2013-10-21 19:13:19 +02:00

content.tpl

// Toolbar modifs

2013-10-08 18:42:07 +02:00

footer_toolbar.tpl

// Toolbar improvement

2013-10-09 15:18:54 +02:00

footer.tpl

// Added comparison to the dashboard

2013-10-15 13:52:12 +02:00

form_date_range_picker.tpl

// Date range picker improvements

2013-10-21 17:07:57 +02:00

form_submit_ajax.tpl

// Welcome 2013

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

header.tpl

// small fixs

2013-10-22 10:04:45 +02:00

index.php

// Welcome 2013

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

invalid_token.tpl

// Welcome 2013

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

layout-ajax.tpl

// Attributes generator

2013-09-17 12:33:06 +02:00

layout-export.tpl

[-] BO : Fix bug for csv export

2013-04-24 17:29:36 +02:00

layout.tpl

[*] BO : you can noww override header and footer for each controller

2013-10-02 17:04:18 +02:00

nav.tpl

// fix nav collapsed and clipping on page loading

2013-10-17 15:39:53 +02:00

page_header_toolbar.tpl

// Code cleaning (backoffice javascript)

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

toolbar.tpl

// Code cleaning (backoffice javascript)

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