Romain Neutron a805c94524 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php

2013-10-21 19:05:37 +02:00

..

caption_templates

Fix #1334 : Technical informations display is not grouped in caption whenever the option is selected

2013-07-17 14:04:35 +02:00

analytics.html.twig

Remove providers instanciation in Twig setup

2012-10-04 15:44:48 +02:00

caption.html.twig

Add AuthenticationServiceProvider

2013-05-29 14:22:50 +02:00

dialog_export.html.twig

Merge branch '3.8'

2013-09-05 14:38:55 +02:00

doctype_icons.html.twig

Rename twig templates

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

drop_down_options.html.twig

Add AuthenticationServiceProvider

2013-05-29 14:22:50 +02:00

HTML5Video.html.twig

Add AuthenticationServiceProvider

2013-05-29 14:22:50 +02:00

index_bootstrap.html.twig

Fix assets path

2013-08-17 17:12:57 +02:00

indexfloat.html.twig

Fix tooltip + enhancement

2013-06-24 15:50:59 +02:00

macros.html.twig

Fix #1497 Resizing images is not working on tablet in paysage mode

2013-10-18 16:11:54 +02:00

menubar.html.twig

Fix #1302 : redirect mechanism does not work as expected

2013-07-17 14:35:39 +02:00

password_strength_widget.html.twig

Fix #1131 Add password strength validation

2013-06-14 16:55:29 +02:00

preview.html.twig

Add AuthenticationServiceProvider

2013-05-29 14:22:50 +02:00

technical_datas.html.twig

Merge branch '3.7'

2013-01-09 11:25:14 +01:00

templates.html.twig

Fix #1338 : Fix notices display in admin

2013-07-17 13:38:30 +02:00

thumbnail.html.twig

Fix #1362 : Fix video display

2013-07-23 16:01:28 +02:00