hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Damien Alexandre
2014-09-08 11:39:02 +02:00
parent 0bbd028969 792e29a307
commit ab07cb8e17
2224 changed files with 1709 additions and 14016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/console
View File

@@ -12,6 +12,7 @@
namespace KonsoleKommander;
use Alchemy\Phrasea\Command\Plugin\ListPlugin;
use Alchemy\Phrasea\Command\Setup\CrossDomainGenerator;
use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper;
use Alchemy\Phrasea\Command\Setup\H264MappingGenerator;
use Alchemy\Phrasea\Command\SearchEngine\IndexCreateCommand;
@@ -116,6 +117,7 @@ $cli->command(new H264ConfigurationDumper());
$cli->command(new H264MappingGenerator());
$cli->command(new XSendFileConfigurationDumper());
$cli->command(new XSendFileMappingGenerator());
$cli->command(new CrossDomainGenerator());
if ($cli['phraseanet.SE']->getName() === 'ElasticSearch') {
$cli->command(new IndexCreateCommand());