Romain Neutron 09c74afab6 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php

2013-12-18 12:12:58 +01:00

..

320alpha1a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

320alpha1b.php

Fix neutron's comments

2013-11-18 16:22:28 +01:00

320alpha2a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

320alpha3a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

320alpha4a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

320alpha4b.php

Fix CS

2013-11-18 17:09:21 +01:00

320alpha5a.php

Fix neutron's comments

2013-11-18 16:22:28 +01:00

320alpha6a.php

Fix CS

2013-11-18 17:09:21 +01:00

320alpha8a.php

Fix CS

2013-11-18 17:09:21 +01:00

360alpha1a.php

Fix CS

2013-11-18 17:09:21 +01:00

360alpha1b.php

Fix CS

2013-11-18 17:09:21 +01:00

360alpha2a.php

Fix CS

2013-11-18 17:09:21 +01:00

360alpha2b.php

Fix CS

2013-11-18 17:09:21 +01:00

361alpha1a.php

Fix CS

2013-11-18 17:09:21 +01:00

370alpha1a.php

Fix CS

2013-11-18 17:09:21 +01:00

370alpha3a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

370alpha4a.php

Fix neutron's comments

2013-11-18 16:22:28 +01:00

370alpha5a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

370alpha6a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

370alpha7a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

370alpha8a.php

Remove commented code

2013-11-20 16:04:20 +01:00

370alpha9a.php

Use configuration property accessor

2013-11-18 18:48:27 +01:00

371alpha1a.php

Use short array syntax

2013-11-18 14:40:20 +01:00

373alpha1a.php

Use configuration property accessor

2013-11-18 18:48:27 +01:00

379alpha1a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha2a.php

Remove license comments

2013-11-20 16:49:29 +01:00

380alpha2b.php

Fix CS

2013-11-18 17:09:21 +01:00

380alpha3a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha3b.php

Use configuration property accessor

2013-11-18 18:48:27 +01:00

380alpha4a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha6a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha8a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha9a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha10a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha11a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha13a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha14a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha15a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha16a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha17a.php

Add missing headers

2013-11-20 19:03:55 +01:00

380alpha18a.php

Add missing headers

2013-11-20 19:03:55 +01:00

381alpha1b.php

Add missing headers

2013-11-20 19:03:55 +01:00

381alpha2a.php

Add missing headers

2013-11-20 19:03:55 +01:00

381alpha3a.php

Add missing headers

2013-11-20 19:03:55 +01:00

381alpha4a.php

Add missing headers

2013-11-20 19:03:55 +01:00

383alpha1a.php

Fix latest merges

2013-12-09 19:19:53 +01:00

383alpha2a.php

Fix latest merge

2013-12-10 01:28:32 +01:00

383alpha3a.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

390alpha1a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha1b.php

Merge pull request #794 from nlegoff/fix1562

2013-11-22 00:20:29 -08:00

390alpha2a.php

Merge pull request #794 from nlegoff/fix1562

2013-11-22 00:20:29 -08:00

390alpha3a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha4a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha5a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha6a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha7a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha8a.php

Add missing headers

2013-11-20 19:03:55 +01:00

390alpha9a.php

Fix CS

2013-12-03 20:59:47 +01:00

3715alpha1a.php

Add missing headers

2013-11-20 19:03:55 +01:00