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

..

API

Revert downloadble subdef api expositioon

2015-02-20 18:44:19 +01:00

Bridge

Merge branch '3.8'

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

cache

Merge branch '3.8'

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

caption

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

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

connection

Merge branch '3.8'

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

databox

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

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

eventsmanager

Design update

2015-02-23 15:15:55 +09:00

Exception

Merge branch '3.8'

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

http

Merge branch '3.8'

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

media

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

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

module

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

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

patch

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

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

patchthesaurus

Merge branch '3.8'

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

record

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

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

recordutils

Merge branch '3.8'

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

Session

Multiple ORMs for all database

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

set

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

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

Setup

Merge branch '3.8'

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

thesaurus

Merge branch '3.8'

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

User

Fix feeds migration & disable email transport

2015-02-12 17:35:13 +01:00

ACL.php

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

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

appbox.php

Multiple ORMs for all database

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

base.php

Merge remote-tracking branch 'upstream/3.8'

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

Browser.php

Use short array declaration

2013-11-18 13:57:33 +01:00

collection.php

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

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

DailymotionWithoutOauth2.php

Merge branch '3.8'

2014-02-28 19:37:54 +01:00

databox.php

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

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

ftpclient.php

Merge branch '3.8'

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

p4field.php

Merge remote-tracking branch 'upstream/3.8'

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

p4string.php

Remove unused functions

2014-03-05 02:45:10 +01:00

patchAbstract.php

Fix missing namespaces

2014-03-14 11:37:11 +01:00

patchInterface.php

Bump copyright year

2014-01-06 15:40:56 +01:00

phrasea.php

Merge branch '3.8'

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

phraseadate.php

Bump copyright year

2014-01-06 15:40:56 +01:00

queries.php

Merge branch '3.8'

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

random.php

Merge branch '3.8'

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

setup.php

Merge branch '3.8'

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

thesaurus.php

Bump copyright year

2014-01-06 15:40:56 +01:00

unicode.php

Merge branch '3.8'

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