Nicolas Le Goff f4f063ad3e Merge branch '3.8' ...

Conflicts:
	templates/web/report/report_layout_child.html.twig

2014-02-13 11:12:26 +01:00

..

ajax_dashboard_content_child.html.twig

Remove phraseanet registry

2013-12-20 16:44:22 +01:00

ajax_dashboard_content.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

ajax_data_content.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

ajax_report_content.html.twig

Add labels to databoxes

2013-06-13 09:45:43 +02:00

ajax_report_dashboard.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

all_content.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

base.html.twig

Locale simplification

2013-12-03 20:05:20 +01:00

chart.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

colFilter.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

dashboard_macro.html.twig

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

form_date_and_base.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

generate_tab.html.twig

Merge branch '3.8'

2013-12-20 16:46:35 +01:00

listColumn.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

panel_hide_button.html.twig

Update templates filepaths

2012-07-24 13:12:25 +02:00

report_layout_child.html.twig

Merge branch '3.8'

2014-02-13 11:12:26 +01:00

report_layout.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00