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

Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php

2014-09-02 19:09:38 +02:00

..

API

Apply user rights on sub-definition

2014-08-13 16:20:08 +02: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-08-19 12:17:18 +02:00

connection

Merge branch '3.8'

2014-09-02 19:09:38 +02:00

databox

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

deprecated

Migrate demand table to doctrine entity && refactor registration API

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

eventsmanager

Fix CS

2014-07-17 15:17:04 +02: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

Fix CS

2014-07-17 15:17:04 +02:00

module

Merge branch '3.8'

2014-09-02 19:09:38 +02:00

patch

Fix patch migration

2014-09-02 18:17:00 +02:00

patchthesaurus

Add reconnectable connection

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

record

Add reconnectable statement

2014-08-26 16:42:56 +02: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

Fix latest merge

2014-08-13 17:40:40 +02: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

Fix tests

2014-07-03 15:07:35 +02:00

appbox.php

Remove unused code

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

base.php

Merge branch '3.8'

2014-09-02 19:09:38 +02: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

Merge branch '3.8'

2014-08-26 13:38:01 +02: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

Fix phras-46 display passwords fields as 'password' input

2014-04-23 16:49:37 +02: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