Nicolas Le Goff ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer ...

Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css

2015-03-10 14:36:31 +01:00

..

ACL

Delete references to usr.usr_id field in entities

2014-02-19 17:29:25 +01:00

Application

Merge remote-tracking branch 'upstream/3.8'

2015-02-23 19:16:56 +01:00

Authentication

Merge branch '3.8'

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

Border

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

2015-03-10 14:36:31 +01:00

Cache

Merge branch '3.8'

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

Command

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

2015-03-10 14:36:31 +01:00

Controller

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

2015-03-10 14:36:31 +01:00

Core

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

2015-03-10 14:36:31 +01:00

Exception

Merge branch '3.8'

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

Feed

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Form

Merge branch '3.8'

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

Helper

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

2015-03-10 14:36:31 +01:00

Http

Makes static thumbnails delivery as default delivery && set symlink dir in www directory

2015-02-16 15:01:44 +01:00

Media

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

2015-03-10 14:36:31 +01:00

Metadata

Merge branch '3.8'

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

Model

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

2015-03-10 14:36:31 +01:00

Notification

Merge branch '3.8'

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

Out

Merge branch '3.8'

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

Plugin

Merge branch '3.8'

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

SearchEngine

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

2015-03-10 14:36:31 +01:00

Security

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

Setup

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Status

Refactor status display

2015-02-19 15:14:23 +01:00

TaskManager

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

2015-03-10 14:36:31 +01:00

Twig

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

2015-03-10 14:36:31 +01:00

Utilities

Merge branch '3.8'

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

Vocabulary

Merge branch '3.8'

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

Webhook

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Websocket

Use short array notations

2014-02-19 17:28:39 +01:00

Application.php

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

2015-03-10 14:36:31 +01:00

CLI.php

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00