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

..

dashboard

Use Doctrine DBAL instead of custom connection

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

activity.php

Merge branch '3.8'

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

add.php

Add user repository as a service

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

connexion.php

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

dashboard.php

Merge branch '3.8'

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

download.php

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

edit.php

Add user repository as a service

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

filter.php

Merge branch '3.8'

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

nav.php

Merge branch '3.8'

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

push.php

Add user repository as a service

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

question.php

Merge branch '3.8'

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

sent.php

Add user repository as a service

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

sql.php

Use Doctrine DBAL instead of custom connection

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

sqlaction.php

Merge branch '3.8'

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

sqlconnexion.php

Merge branch '3.8'

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

sqldownload.php

Merge branch '3.8'

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

sqlfilter.php

Merge branch '3.8'

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

sqlquestion.php

Merge branch '3.8'

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

sqlReportInterface.php

Bump copyright year

2014-01-06 15:28:12 +01:00

validate.php

Add user repository as a service

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