Nicolas Le Goff b9bb9f5f0e Merge branch '3.8' ...

Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig

2014-08-26 13:38:01 +02:00

..

Compile

Merge branch '3.8'

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

Developer

Merge branch '3.8'

2014-08-19 15:30:25 +02:00

Plugin

Fix Cs

2014-02-25 16:33:43 +01:00

SearchEngine

Fix CS

2014-01-30 19:56:05 +01:00

Setup

Merge branch '3.8'

2014-08-26 13:38:01 +02:00

Task

Fix latest merge

2014-08-13 17:40:40 +02:00

Upgrade

Merge branch '3.8'

2014-03-23 19:49:12 +01:00

AbstractCheckCommand.php

PHP CS fix

2014-05-30 15:22:00 +02:00

BuildMissingSubdefs.php

PHP CS fix

2014-05-30 15:22:00 +02:00

CheckConfig.php

Merge branch '3.8'

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

Command.php

Merge branch '3.8'

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

CommandInterface.php

Bump copyright year

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

CreateCollection.php

PHP CS fix

2014-05-30 15:22:00 +02:00

MailTest.php

Bump copyright year

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

RecordAdd.php

PHP CS fix

2014-05-30 15:22:00 +02:00

RescanTechnicalDatas.php

PHP CS fix

2014-05-30 15:22:00 +02:00

UpgradeDBDatas.php

PHP CS fix

2014-05-30 15:22:00 +02:00

WebsocketServer.php

Address PR comments

2014-02-15 12:05:05 +01:00