Thibaud Fabre cefb2f99f4 Merge pull request #2033 from alchemy-fr/4.0 ...

Port PHRAS-1292 in master

2016-12-19 13:41:41 +01:00

..

API/OAuth2

Merge branch 4.0

2016-12-05 15:26:48 +01:00

Bridge

Merge branch 4.0

2016-12-05 15:26:48 +01:00

cache

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

caption

PHRAS-1192_quarantaine-by-filenames_4.0

2016-09-28 13:16:10 +02:00

connection

bump copyright year

2016-01-05 13:38:14 +01:00

databox

Fix merge error

2016-12-06 13:53:26 +01:00

eventsmanager

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

Exception

bump copyright year

2016-01-05 13:38:14 +01:00

http

bump copyright year

2016-01-05 13:38:14 +01:00

media

Merge pull request #2032 from jygaulier/PHRAS-1292_BAD-CHARS-IN-PERMALINKS

2016-12-07 18:45:59 +01:00

module

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

patch

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

patchthesaurus

bump copyright year

2016-01-05 13:38:14 +01:00

record

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

recordutils

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

Session

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

set

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

Setup

bump copyright year

2016-01-05 13:38:14 +01:00

thesaurus

bump copyright year

2016-01-05 13:38:14 +01:00

User

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

ACL.php

PHRAS-508_acl-cache

2016-10-27 18:38:33 +02:00

appbox.php

Allow removing order masters without adding a new one

2016-07-29 14:46:18 +02:00

base.php

Remove useless function argument apply_patches

2016-01-22 12:23:18 +01:00

Browser.php

Use short array declaration

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

collection.php

Fix watermark getter

2016-03-23 18:02:48 +01:00

DailymotionWithoutOauth2.php

Merge branch '3.8'

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

databox.php

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

ftpclient.php

PHRAS-771 #time 2h

2015-10-15 17:02:04 +02:00

p4field.php

Merge branch 4.0

2016-12-05 15:26:48 +01:00

p4string.php

Remove unused functions

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

patchAbstract.php

Proper renaming of migrations to comply with doctrine migration convention

2015-03-26 09:57:18 +01:00

patchInterface.php

Bump copyright year

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

phrasea.php

Add array type check on cache returned value

2016-01-22 12:23:18 +01:00

phraseadate.php

Bump copyright year

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

random.php

bump copyright year

2016-01-05 13:38:14 +01:00

setup.php

bump copyright year

2016-01-05 13:38:14 +01:00

thesaurus.php

Bump copyright year

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

unicode.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00