Mathieu Darse 63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer ...

Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js

2015-03-10 15:25:20 +01:00

..

Compile

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

Developer

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Plugin

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

SearchEngine

Add possibilty to explicitely set database to populate

2015-02-27 16:23:26 +01:00

Setup

Fix H264MappingGenerator

2015-02-17 15:27:19 +01:00

Task

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Thesaurus

Strict option on concept finding command

2015-03-03 18:58:31 +01:00

Upgrade

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

AbstractCheckCommand.php

Bump year to 2015

2015-01-20 14:08:25 +01:00

BuildMissingSubdefs.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

BuildSubdefs.php

PHRAS-374 #fix

2015-02-17 12:35:39 +01:00

CheckConfig.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

Command.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

CommandInterface.php

Bump year to 2015

2015-01-20 14:08:25 +01:00

CreateCollection.php

Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

2015-03-10 14:36:31 +01:00

MailTest.php

Bump year to 2015

2015-01-20 14:08:25 +01:00

RecordAdd.php

Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

2015-03-10 14:36:31 +01:00

RescanTechnicalDatas.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

UpgradeDBDatas.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00