Mathieu Darse 63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer ...

Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js

2015-03-10 15:25:20 +01:00

..

players

Fix latest merge

2014-06-24 00:34:07 +02:00

analytics.html.twig

Remove phraseanet registry

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

caption.html.twig

Fix latest merge

2014-06-19 16:11:27 +02:00

dialog_export.html.twig

Fix geonames amd loading

2015-02-06 16:04:18 +01:00

HTML5Video.html.twig

Add AuthenticationServiceProvider

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

index_bootstrap.html.twig

header size

2015-02-19 18:35:18 +09:00

indexfloat.html.twig

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

macros.html.twig

Merge remote-tracking branch 'upstream/master' into elastic-indexer

2015-03-10 15:25:20 +01:00

menubar.html.twig

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

password_strength_widget.html.twig

Fix #1131 Add password strength validation

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

preview.html.twig

Use ACL service provider to get user's ACL

2013-11-05 12:21:42 +01:00

technical_datas.html.twig

Typo

2014-12-04 11:48:12 +01:00

templates.html.twig

Fix #1338 : Fix notices display in admin

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

thumbnail.html.twig

Fix mess in prod (record & feed) templates

2014-12-04 11:48:11 +01:00