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

Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Root.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Export.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/format.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Feed_CollectionTest.php
	tests/classes/api/v1/api_v1_adapterTest.php

2014-03-30 09:00:17 +02:00

..

API/OAuth2

Add feed title in feed entry json schema

2014-03-24 12:26:55 +01:00

Bridge

Use rhumsaa/uuid instead of custom uuid implementation

2014-03-03 11:29:23 +01:00

cache

Use Doctrine DBAL instead of custom connection

2014-02-22 23:55:12 +01:00

caption

Merge branch '3.8'

2014-03-03 00:05:11 +01:00

databox

Merge branch '3.8'

2014-03-10 17:13:02 +01:00

deprecated

Migrate demand table to doctrine entity && refactor registration API

2014-02-26 12:06:34 +01:00

eventsmanager

Add token entities

2014-03-05 15:27:43 +01:00

Exception

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

http

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

media

Add token entities

2014-03-05 15:27:43 +01:00

module

Merge branch '3.8'

2014-03-03 17:00:17 +01:00

patch

Fix CS

2014-03-23 23:07:01 +01:00

patchthesaurus

Add reconnectable connection

2014-03-03 01:00:15 +01:00

record

Add compatibility with elasticsearch 1

2014-03-05 02:19:18 +01:00

recordutils

Remove unused files

2014-03-05 02:58:52 +01:00

Session

Fix unit tests

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

set

Add token entities

2014-03-05 15:27:43 +01:00

Setup

Remove unused code

2014-03-05 16:53:03 +01:00

thesaurus

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

User

Merge pull request #1002 from romainneutron/fix-1710

2014-03-03 16:23:08 +01:00

ACL.php

Merge branch '3.8'

2014-03-03 00:05:11 +01:00

appbox.php

Remove unused code

2014-03-05 16:53:03 +01:00

base.php

Remove unused code

2014-03-05 16:53:03 +01:00

Browser.php

Use short array declaration

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

collection.php

Add reconnectable connection

2014-03-03 01:00:15 +01:00

DailymotionWithoutOauth2.php

Merge branch '3.8'

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

databox.php

Add reconnectable connection

2014-03-03 01:00:15 +01:00

ftpclient.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

p4field.php

Bump copyright year

2014-01-06 15:40: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

Use Doctrine DBAL instead of custom connection

2014-02-22 23:55:12 +01:00

phraseadate.php

Bump copyright year

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

queries.php

Fix hidden use of repositories

2014-02-28 20:02:24 +01:00

random.php

Add token entities

2014-03-05 15:27:43 +01:00

setup.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

thesaurus.php

Bump copyright year

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

unicode.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00