Kevin Granger 8848ff08d8 // test git ...

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

Conflicts:
	controllers/admin/AdminImportController.php

2013-11-28 14:29:34 +01:00

..

controllers

// test git

2013-11-28 14:29:34 +01:00

helpers

// Add Drag and Drop to uploader helper

2013-11-28 09:55:22 +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

// tweaks list + customers

2013-11-22 18:56:52 +01: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

show all messages link linked to tab

2013-11-26 15:56:21 +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

// Show more info content if <= 4

2013-11-21 12:23:54 +01:00

nav.tpl

[-] Core : fixed smarty escape htmlall > html

2013-11-22 09:47:15 +01:00

page_header_toolbar.tpl

// Fixed warning

2013-11-21 17:46:29 +01:00

toolbar.tpl

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

2013-11-21 17:43:51 +01:00