Romain Neutron 5d843ab370 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Helper/User/Manage.php
	lib/classes/User/Adapter.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/patch/370alpha7a.php
	lib/classes/patch/370alpha8a.php
	lib/classes/record/adapter.php
	lib/classes/task/period/RecordMover.php
	tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php

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

..

API/OAuth2

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

Bridge

Merge pull request #990 from romainneutron/repositories-as-services

2014-03-01 15:49:24 +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-03 00:05:11 +01:00

deprecated

Migrate demand table to doctrine entity && refactor registration API

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

eventsmanager

Fix hidden use of repositories

2014-02-28 20:02:24 +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

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

module

Add user repository as a service

2014-02-28 19:58:12 +01:00

patch

Merge branch '3.8'

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

patchthesaurus

Merge branch '3.8'

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

record

Merge branch '3.8'

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

recordutils

Merge branch '3.8'

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

Session

Fix unit tests

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

set

Add story-wz repository as a service

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

Setup

Merge branch '3.8'

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

system

Merge branch '3.8'

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

thesaurus

Merge branch '3.8'

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

User

Fix #1705 : MySQL connection might be lost after long operations

2014-03-02 02:19:13 +01:00

ACL.php

Merge branch '3.8'

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

appbox.php

Add access restriction

2014-02-25 19:00:53 +01:00

base.php

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

Browser.php

Use short array declaration

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

collection.php

Merge branch '3.8'

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

DailymotionWithoutOauth2.php

Merge branch '3.8'

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

databox.php

Merge branch '3.8'

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

format.php

Bump copyright year

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

p4file.php

Merge branch '3.8'

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

p4string.php

Bump copyright year

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

patchAbstract.php

Fix CS

2014-03-01 14:40:03 +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

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

recordutils.php

Bump copyright year

2014-01-06 15:28:12 +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

uuid.php

Fix CS

2014-01-14 12:04:38 +01:00