Nicolas Le Goff 5e33fdafe4 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/classes/caption/field.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/download.php
	lib/classes/task/period/apibridge.php

2014-12-16 13:07:25 +01:00

..

dashboard

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

activity.php

Merge branch '3.8'

2014-12-16 13:07:25 +01:00

add.php

Add user repository as a service

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

connexion.php

Fix merge 3.8

2014-12-09 14:01:00 +01:00

dashboard.php

Merge branch '3.8'

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

download.php

Merge branch '3.8'

2014-12-16 13:07:25 +01: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

Fix merge 3.8

2014-12-09 14:01:00 +01:00

push.php

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

question.php

Fix merge 3.8

2014-12-09 14:01:00 +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

Get logs from deleted records as well

2014-11-21 09:24:44 +01:00

sqlconnexion.php

Fix merge 3.8

2014-12-09 14:01:00 +01:00

sqldownload.php

Merge branch '3.8'

2014-12-16 13:07:25 +01:00

sqlfilter.php

Fix merge 3.8

2014-12-09 14:01:00 +01:00

sqlquestion.php

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

sqlReportInterface.php

Bump copyright year

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

validate.php

Merge branch '3.8'

2014-12-09 13:59:29 +01:00