mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Merge remote-tracking branch 'upstream/master' into elastic-indexer
Conflicts: composer.lock www/scripts/apps/admin/main/app.js
This commit is contained in:
Mathieu Darse
479
composer.lock
generated
479
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "f5e0457425e2c151f1a6b27e0bad160d",
|
||||
"hash": "9727062f8f765284d232f9204bdd3a0b",
|
||||
"packages": [
|
||||
{
|
||||
"name": "alchemy-fr/tcpdf-clone",
|
||||
@@ -428,55 +428,6 @@
|
||||
],
|
||||
"time": "2014-05-05 13:39:00"
|
||||
},
|
||||
{
|
||||
"name": "cboden/ratchet",
|
||||
"version": "v0.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ratchetphp/Ratchet.git",
|
||||
"reference": "d36a8699df04354147a4f47845035b1ea8239189"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/d36a8699df04354147a4f47845035b1ea8239189",
|
||||
"reference": "d36a8699df04354147a4f47845035b1ea8239189",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"guzzle/http": "~3.6",
|
||||
"php": ">=5.3.9",
|
||||
"react/socket": "0.3.*|0.4.*",
|
||||
"symfony/http-foundation": "~2.2",
|
||||
"symfony/routing": "~2.2"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Ratchet": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Chris Boden",
|
||||
"email": "cboden@gmail.com",
|
||||
"homepage": "http://res.im",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "PHP WebSocket library",
|
||||
"homepage": "http://socketo.me",
|
||||
"keywords": [
|
||||
"Ratchet",
|
||||
"WebSockets",
|
||||
"server",
|
||||
"sockets"
|
||||
],
|
||||
"time": "2014-06-08 15:19:45"
|
||||
},
|
||||
{
|
||||
"name": "dailymotion/sdk",
|
||||
"version": "1.6.2",
|
||||
@@ -2368,17 +2319,17 @@
|
||||
},
|
||||
{
|
||||
"name": "jms/translation-bundle",
|
||||
"version": "1.1.0",
|
||||
"version": "dev-master",
|
||||
"target-dir": "JMS/TranslationBundle",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/schmittjoh/JMSTranslationBundle.git",
|
||||
"reference": "6f03035a38badaf8c48767c7664c3196df1eebdf"
|
||||
"url": "https://github.com/alchemy-fr/JMSTranslationBundle.git",
|
||||
"reference": "808d11543fc9c1abc20dcf6b4d99e066c6a955da"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/6f03035a38badaf8c48767c7664c3196df1eebdf",
|
||||
"reference": "6f03035a38badaf8c48767c7664c3196df1eebdf",
|
||||
"url": "https://api.github.com/repos/alchemy-fr/JMSTranslationBundle/zipball/808d11543fc9c1abc20dcf6b4d99e066c6a955da",
|
||||
"reference": "808d11543fc9c1abc20dcf6b4d99e066c6a955da",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2414,16 +2365,13 @@
|
||||
"JMS\\TranslationBundle": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache2"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
"name": "Johannes M. Schmitt",
|
||||
"email": "schmittjoh@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Puts the Symfony2 Translation Component on steroids",
|
||||
@@ -2438,7 +2386,10 @@
|
||||
"ui",
|
||||
"webinterface"
|
||||
],
|
||||
"time": "2013-06-08 14:08:19"
|
||||
"support": {
|
||||
"source": "https://github.com/alchemy-fr/JMSTranslationBundle/tree/master"
|
||||
},
|
||||
"time": "2015-03-09 17:01:23"
|
||||
},
|
||||
{
|
||||
"name": "justinrainbow/json-schema",
|
||||
@@ -3591,181 +3542,6 @@
|
||||
],
|
||||
"time": "2012-12-21 11:40:51"
|
||||
},
|
||||
{
|
||||
"name": "react/event-loop",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/EventLoop",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/event-loop.git",
|
||||
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/event-loop/zipball/235cddfa999a392e7d63dc9bef2e042492608d9f",
|
||||
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-libev": "*",
|
||||
"ext-libevent": ">=0.0.5"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\EventLoop": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Event loop abstraction layer that libraries can use for evented I/O.",
|
||||
"keywords": [
|
||||
"event-loop"
|
||||
],
|
||||
"time": "2013-07-21 02:23:09"
|
||||
},
|
||||
{
|
||||
"name": "react/socket",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/Socket",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/socket.git",
|
||||
"reference": "19bc0c4309243717396022ffb2e59be1cc784327"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/socket/zipball/19bc0c4309243717396022ffb2e59be1cc784327",
|
||||
"reference": "19bc0c4309243717396022ffb2e59be1cc784327",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "1.0.*",
|
||||
"php": ">=5.3.3",
|
||||
"react/event-loop": "0.3.*",
|
||||
"react/stream": "0.3.*"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\Socket": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Library for building an evented socket server.",
|
||||
"keywords": [
|
||||
"Socket"
|
||||
],
|
||||
"time": "2014-02-17 22:32:00"
|
||||
},
|
||||
{
|
||||
"name": "react/stream",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/Stream",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/stream.git",
|
||||
"reference": "feef56628afe3fa861f0da5f92c909e029efceac"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/stream/zipball/feef56628afe3fa861f0da5f92c909e029efceac",
|
||||
"reference": "feef56628afe3fa861f0da5f92c909e029efceac",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "1.0.*",
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"suggest": {
|
||||
"react/event-loop": "0.3.*",
|
||||
"react/promise": "~1.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\Stream": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Basic readable and writable stream interfaces that support piping.",
|
||||
"keywords": [
|
||||
"pipe",
|
||||
"stream"
|
||||
],
|
||||
"time": "2014-02-16 19:48:52"
|
||||
},
|
||||
{
|
||||
"name": "react/zmq",
|
||||
"version": "v0.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/zmq.git",
|
||||
"reference": "b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/zmq/zipball/b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e",
|
||||
"reference": "b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "~1.0",
|
||||
"ext-zmq": "*",
|
||||
"php": ">=5.3.2",
|
||||
"react/event-loop": "0.3.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-pcntl": "*"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.2-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\ZMQ": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "ZeroMQ bindings for React.",
|
||||
"keywords": [
|
||||
"zeromq",
|
||||
"zmq"
|
||||
],
|
||||
"time": "2013-09-18 11:02:06"
|
||||
},
|
||||
{
|
||||
"name": "rhumsaa/uuid",
|
||||
"version": "2.8.0",
|
||||
@@ -5034,6 +4810,55 @@
|
||||
],
|
||||
"time": "2014-09-29 13:12:12"
|
||||
},
|
||||
{
|
||||
"name": "cboden/ratchet",
|
||||
"version": "v0.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ratchetphp/Ratchet.git",
|
||||
"reference": "d36a8699df04354147a4f47845035b1ea8239189"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/d36a8699df04354147a4f47845035b1ea8239189",
|
||||
"reference": "d36a8699df04354147a4f47845035b1ea8239189",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"guzzle/http": "~3.6",
|
||||
"php": ">=5.3.9",
|
||||
"react/socket": "0.3.*|0.4.*",
|
||||
"symfony/http-foundation": "~2.2",
|
||||
"symfony/routing": "~2.2"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Ratchet": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Chris Boden",
|
||||
"email": "cboden@gmail.com",
|
||||
"homepage": "http://res.im",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "PHP WebSocket library",
|
||||
"homepage": "http://socketo.me",
|
||||
"keywords": [
|
||||
"Ratchet",
|
||||
"WebSockets",
|
||||
"server",
|
||||
"sockets"
|
||||
],
|
||||
"time": "2014-06-08 15:19:45"
|
||||
},
|
||||
{
|
||||
"name": "fabpot/goutte",
|
||||
"version": "v1.0.7",
|
||||
@@ -5749,6 +5574,181 @@
|
||||
"xunit"
|
||||
],
|
||||
"time": "2013-01-13 10:24:48"
|
||||
},
|
||||
{
|
||||
"name": "react/event-loop",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/EventLoop",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/event-loop.git",
|
||||
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/event-loop/zipball/235cddfa999a392e7d63dc9bef2e042492608d9f",
|
||||
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-libev": "*",
|
||||
"ext-libevent": ">=0.0.5"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\EventLoop": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Event loop abstraction layer that libraries can use for evented I/O.",
|
||||
"keywords": [
|
||||
"event-loop"
|
||||
],
|
||||
"time": "2013-07-21 02:23:09"
|
||||
},
|
||||
{
|
||||
"name": "react/socket",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/Socket",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/socket.git",
|
||||
"reference": "19bc0c4309243717396022ffb2e59be1cc784327"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/socket/zipball/19bc0c4309243717396022ffb2e59be1cc784327",
|
||||
"reference": "19bc0c4309243717396022ffb2e59be1cc784327",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "1.0.*",
|
||||
"php": ">=5.3.3",
|
||||
"react/event-loop": "0.3.*",
|
||||
"react/stream": "0.3.*"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\Socket": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Library for building an evented socket server.",
|
||||
"keywords": [
|
||||
"Socket"
|
||||
],
|
||||
"time": "2014-02-17 22:32:00"
|
||||
},
|
||||
{
|
||||
"name": "react/stream",
|
||||
"version": "v0.3.4",
|
||||
"target-dir": "React/Stream",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/stream.git",
|
||||
"reference": "feef56628afe3fa861f0da5f92c909e029efceac"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/stream/zipball/feef56628afe3fa861f0da5f92c909e029efceac",
|
||||
"reference": "feef56628afe3fa861f0da5f92c909e029efceac",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "1.0.*",
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"suggest": {
|
||||
"react/event-loop": "0.3.*",
|
||||
"react/promise": "~1.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\Stream": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Basic readable and writable stream interfaces that support piping.",
|
||||
"keywords": [
|
||||
"pipe",
|
||||
"stream"
|
||||
],
|
||||
"time": "2014-02-16 19:48:52"
|
||||
},
|
||||
{
|
||||
"name": "react/zmq",
|
||||
"version": "v0.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/reactphp/zmq.git",
|
||||
"reference": "b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/reactphp/zmq/zipball/b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e",
|
||||
"reference": "b69d97f99f2127e27d130d7fe3b2cec2a63b2c4e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"evenement/evenement": "~1.0",
|
||||
"ext-zmq": "*",
|
||||
"php": ">=5.3.2",
|
||||
"react/event-loop": "0.3.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-pcntl": "*"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.2-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"React\\ZMQ": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "ZeroMQ bindings for React.",
|
||||
"keywords": [
|
||||
"zeromq",
|
||||
"zmq"
|
||||
],
|
||||
"time": "2013-09-18 11:02:06"
|
||||
}
|
||||
],
|
||||
"aliases": [
|
||||
@@ -5758,6 +5758,12 @@
|
||||
"version": "dev-alchemy-0.6.2",
|
||||
"package": "imagine/imagine"
|
||||
},
|
||||
{
|
||||
"alias": "1.1.0",
|
||||
"alias_normalized": "1.1.0.0",
|
||||
"version": "9999999-dev",
|
||||
"package": "jms/translation-bundle"
|
||||
},
|
||||
{
|
||||
"alias": "0.4.1",
|
||||
"alias_normalized": "0.4.1.0",
|
||||
@@ -5771,6 +5777,7 @@
|
||||
"alchemy/zippy": 20,
|
||||
"goodby/csv": 20,
|
||||
"imagine/imagine": 20,
|
||||
"jms/translation-bundle": 20,
|
||||
"neutron/process-manager": 20,
|
||||
"phpexiftool/phpexiftool": 20,
|
||||
"silex/silex": 20,
|
||||
|
||||
Reference in New Issue
Block a user