Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	modules/themeconfigurator/themeconfigurator.php

2013-11-18 14:49:27 +01:00

..

controllers

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

2013-11-18 14:49:27 +01:00

helpers

// Missing isset on cols and rows

2013-11-18 14:35:15 +01:00

content.tpl

// Toolbar modifs

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

footer_toolbar.tpl

// Fix Tagify javascript error

2013-11-04 17:47:27 +01:00

footer.tpl

// Added comparison to the dashboard

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

form_date_range_picker.tpl

// Fix Stats datepicker

2013-10-23 16:48:55 +02:00

form_submit_ajax.tpl

// Welcome 2013

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

header.tpl

// merge fixes

2013-11-07 17:43:26 +01: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

// layout fix

2013-10-25 17:30:10 +02:00

nav.tpl

// fix nav collapsed and clipping on page loading

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

page_header_toolbar.tpl

// Fix Tagify javascript error

2013-11-04 17:47:27 +01:00

toolbar.tpl

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

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