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 remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

Browse Source 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
This commit is contained in:
Nicolas Le Goff
2015-03-06 14:35:29 +01:00
committed by Mathieu Darse
parent bcff55962c 6b89c123e3
commit ed3ffb59a6
1078 changed files with 7964 additions and 16363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
composer.json
View File

@@ -26,28 +26,29 @@
"require": {
"php" : ">=5.4",
"alchemy/oauth2php" : "1.0.0",
"alchemy/phlickr" : "0.2.8",
"alchemy/phlickr" : "0.2.9",
"alchemy/task-manager" : "2.0.x-dev@dev",
"alchemy/zippy" : "0.2.x-dev@dev",
"cboden/ratchet" : "~0.3",
"dailymotion/sdk" : "~1.5",
"data-uri/data-uri" : "~0.1.0",
"doctrine/orm" : "~2.4.0",
"doctrine/dbal" : "~2.4.0",
"elasticsearch/elasticsearch" : "~1.0",
"facebook/php-sdk" : "~3.0",
"gedmo/doctrine-extensions" : "~2.3.0",
"alchemy/google-plus-api-client" : "~0.6.2",
"alchemy/geonames-api-consumer" : "~0.1.0",
"goodby/csv" : "~1.0",
"goodby/csv" : "dev-master",
"guzzle/guzzle" : "~3.0",
"imagine/imagine" : "dev-0.6.1-flatten-layer as 0.6.1",
"imagine/imagine" : "dev-alchemy-0.6.2 as 0.6.2",
"igorw/get-in" : "~1.0",
"ircmaxell/random-lib" : "~1.0",
"jms/serializer" : "~0.10",
"jms/serializer" : "~0.10",
"jms/translation-bundle" : "~1.1",
"justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.4",
"monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6",
"neutron/process-manager" : "2.0.x-dev@dev",
@@ -64,7 +65,7 @@
"silex/silex" : "1.1.x-dev@dev",
"silex/web-profiler" : "~1.0.0@dev",
"sorien/silex-dbal-profiler" : "~1.0.0",
"swiftmailer/swiftmailer" : "~4.3.0",
"swiftmailer/swiftmailer" : "~5.3.0",
"symfony/symfony" : "~2.4",
"alchemy-fr/tcpdf-clone" : "~6.0",
"themattharris/tmhoauth" : "~0.7",
@@ -73,8 +74,10 @@
"vierbergenlars/php-semver" : "~2.1",
"zend/gdata" : "~1.12.1",
"doctrine/migrations" : "1.0.x-dev@dev",
"willdurand/negotiation" : "~1.3",
"hoa/compiler": "2.14.09.23"
"willdurand/negotiation" : "~1.3",
"hoa/compiler": "2.14.09.23",
"dflydev/doctrine-orm-service-provider" : "~1.0",
"roave/security-advisories": "dev-master"
},
"require-dev": {
"phpunit/phpunit" : "~3.7",