Romain Neutron c641ab7841 Merge branch '3.8' ...

Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php

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

..

API/OAuth2

Cleanup API

2014-02-28 00:38:12 +01:00

Bridge

Merge branch '3.8'

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

cache

Use Doctrine DBAL instead of custom connection

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

caption

Merge branch '3.8'

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

databox

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

deprecated

Migrate demand table to doctrine entity && refactor registration API

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

eventsmanager

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +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

Merge branch '3.8'

2014-02-28 00:28:06 +01:00

module

Use Doctrine DBAL instead of custom connection

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

patch

Cleanup API

2014-02-28 00:38:12 +01:00

patchthesaurus

Use Doctrine DBAL instead of custom connection

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

record

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

recordutils

Merge branch '3.8'

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

Session

Use Doctrine DBAL instead of custom connection

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

set

Use Zippy to zip

2014-02-24 16:25:59 +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 users modelOf and lastModel wording

2014-02-28 03:03:53 +01:00

ACL.php

Fix users modelOf and lastModel wording

2014-02-28 03:03:53 +01:00

appbox.php

Add access restriction

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

base.php

Fix registration table name

2014-02-27 16:57:31 +01:00

Browser.php

Use short array declaration

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

collection.php

Merge pull request #900 from nlegoff/replace_demand

2014-02-27 16:08:17 +01:00

DailymotionWithoutOauth2.php

Merge branch '3.8'

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

databox.php

Fix tests, CS && typo

2014-02-26 12:06:34 +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

Cleanup API

2014-02-28 00:38:12 +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 merge

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

random.php

Use Doctrine DBAL instead of custom connection

2014-02-22 23:55:12 +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