Nicolas Le Goff 28eecf6a09 Merge branch '3.8' ...

Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup

2014-10-09 19:40:33 +02:00

..

aboutAuthors.php

Merge branch '3.8'

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

aboutLicense.php

Merge branch '3.8'

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

checkExtension.php

Add user repository as a service

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

fieldsDelete.php

Merge branch '3.8'

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

fieldsList.php

Merge branch '3.8'

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

fieldsMerge.php

Merge branch '3.8'

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

fieldsRename.php

Merge branch '3.8'

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

sphinxGenerateSuggestion.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

systemBackupDB.php

Merge branch '3.8'

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

systemClearCache.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

systemExport.php

Decouple caption and its serialization

2014-01-27 20:12:13 +01:00

systemMailCheck.php

Add user repository as a service

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

systemTemplateGenerator.php

Merge branch '3.8'

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

systemUpgrade.php

Merge branch '3.8'

2014-10-09 19:40:33 +02:00