Nicolas Le Goff 46da7be65d Merge branch '3.8' ...

Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php

2014-08-19 15:30:25 +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

Use Doctrine DBAL instead of custom connection

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

systemBackupDB.php

Merge branch '3.8'

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

systemClearCache.php

Merge branch '3.8'

2014-01-06 15:38:14 +01: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-08-19 15:30:25 +02:00