Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
73a2a475
Commit
73a2a475
authored
Mar 30, 2015
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating modules
parent
e4bc6bc4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
57 additions
and
55 deletions
+57
-55
composer.lock
composer.lock
+57
-55
No files found.
composer.lock
View file @
73a2a475
...
@@ -98,12 +98,12 @@
...
@@ -98,12 +98,12 @@
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/AsgardCms/Dashboard.git",
"url": "https://github.com/AsgardCms/Dashboard.git",
"reference": "
f2c31a4f750e3554a0b4c6bbc9fc65acfe8d4f93
"
"reference": "
6e3f345c7dc834fb725ffbf2431bc2a0f976a429
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Dashboard/zipball/
f2c31a4f750e3554a0b4c6bbc9fc65acfe8d4f93
",
"url": "https://api.github.com/repos/AsgardCms/Dashboard/zipball/
6e3f345c7dc834fb725ffbf2431bc2a0f976a429
",
"reference": "
f2c31a4f750e3554a0b4c6bbc9fc65acfe8d4f93
",
"reference": "
6e3f345c7dc834fb725ffbf2431bc2a0f976a429
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
"asgardcms",
"asgardcms",
"dashboard"
"dashboard"
],
],
"time": "2015-03-2
3 19:22:20
"
"time": "2015-03-2
9 18:04:13
"
},
},
{
{
"name": "asgardcms/flatly-theme",
"name": "asgardcms/flatly-theme",
...
@@ -135,12 +135,12 @@
...
@@ -135,12 +135,12 @@
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/AsgardCms/Flatly-theme.git",
"url": "https://github.com/AsgardCms/Flatly-theme.git",
"reference": "
5da7493a89d85bbb678b1f158ca3811fc7101a24
"
"reference": "
f6274fde1d7b07a670f5045a0371a30fa8418922
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Flatly-theme/zipball/
5da7493a89d85bbb678b1f158ca3811fc7101a24
",
"url": "https://api.github.com/repos/AsgardCms/Flatly-theme/zipball/
f6274fde1d7b07a670f5045a0371a30fa8418922
",
"reference": "
5da7493a89d85bbb678b1f158ca3811fc7101a24
",
"reference": "
f6274fde1d7b07a670f5045a0371a30fa8418922
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
"keywords": [
"keywords": [
"asgard-cms"
"asgard-cms"
],
],
"time": "2015-03-
06 07:28
:21"
"time": "2015-03-
28 16:10
:21"
},
},
{
{
"name": "asgardcms/media-module",
"name": "asgardcms/media-module",
...
@@ -304,12 +304,12 @@
...
@@ -304,12 +304,12 @@
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/AsgardCms/Setting.git",
"url": "https://github.com/AsgardCms/Setting.git",
"reference": "
1d1af1e5a4eff3e0a95766f7f449cd0dbd08f86b
"
"reference": "
5674075df861ecc7a56ec5c2b568cd4cbb1d3a46
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Setting/zipball/
1d1af1e5a4eff3e0a95766f7f449cd0dbd08f86b
",
"url": "https://api.github.com/repos/AsgardCms/Setting/zipball/
5674075df861ecc7a56ec5c2b568cd4cbb1d3a46
",
"reference": "
1d1af1e5a4eff3e0a95766f7f449cd0dbd08f86b
",
"reference": "
5674075df861ecc7a56ec5c2b568cd4cbb1d3a46
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -338,7 +338,7 @@
...
@@ -338,7 +338,7 @@
"Settings",
"Settings",
"asgardcms"
"asgardcms"
],
],
"time": "2015-03-2
3 19:35:02
"
"time": "2015-03-2
8 16:12:56
"
},
},
{
{
"name": "asgardcms/user-module",
"name": "asgardcms/user-module",
...
@@ -991,16 +991,16 @@
...
@@ -991,16 +991,16 @@
},
},
{
{
"name": "guzzlehttp/ringphp",
"name": "guzzlehttp/ringphp",
"version": "1.0.
6
",
"version": "1.0.
7
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/guzzle/RingPHP.git",
"url": "https://github.com/guzzle/RingPHP.git",
"reference": "
f43ab34aad69ca0ba04172cf2c3cd5c12fc0e5a4
"
"reference": "
52d868f13570a9a56e5fce6614e0ec75d0f13ac2
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/
f43ab34aad69ca0ba04172cf2c3cd5c12fc0e5a4
",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/
52d868f13570a9a56e5fce6614e0ec75d0f13ac2
",
"reference": "
f43ab34aad69ca0ba04172cf2c3cd5c12fc0e5a4
",
"reference": "
52d868f13570a9a56e5fce6614e0ec75d0f13ac2
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -1038,7 +1038,7 @@
...
@@ -1038,7 +1038,7 @@
}
}
],
],
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
"time": "2015-0
2-26 20:43:09
"
"time": "2015-0
3-30 01:43:20
"
},
},
{
{
"name": "guzzlehttp/streams",
"name": "guzzlehttp/streams",
...
@@ -1469,16 +1469,16 @@
...
@@ -1469,16 +1469,16 @@
},
},
{
{
"name": "laravel/framework",
"name": "laravel/framework",
"version": "v5.0.2
0
",
"version": "v5.0.2
3
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/laravel/framework.git",
"url": "https://github.com/laravel/framework.git",
"reference": "
419d3f485ce7946cace4325ef19a30e1d5543951
"
"reference": "
59219f7afb60be05d74ce01fcb5d2440f7a1b13d
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/
419d3f485ce7946cace4325ef19a30e1d5543951
",
"url": "https://api.github.com/repos/laravel/framework/zipball/
59219f7afb60be05d74ce01fcb5d2440f7a1b13d
",
"reference": "
419d3f485ce7946cace4325ef19a30e1d5543951
",
"reference": "
59219f7afb60be05d74ce01fcb5d2440f7a1b13d
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -1591,7 +1591,7 @@
...
@@ -1591,7 +1591,7 @@
"framework",
"framework",
"laravel"
"laravel"
],
],
"time": "2015-03-2
4 13:36:37
"
"time": "2015-03-2
8 16:56:59
"
},
},
{
{
"name": "laravelcollective/html",
"name": "laravelcollective/html",
...
@@ -1645,16 +1645,16 @@
...
@@ -1645,16 +1645,16 @@
},
},
{
{
"name": "league/flysystem",
"name": "league/flysystem",
"version": "1.0.
2
",
"version": "1.0.
3
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "
51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a
"
"reference": "
3c2400a99ccc3be6884d40361890010449c6b447
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/
51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a
",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/
3c2400a99ccc3be6884d40361890010449c6b447
",
"reference": "
51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a
",
"reference": "
3c2400a99ccc3be6884d40361890010449c6b447
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -1664,7 +1664,7 @@
...
@@ -1664,7 +1664,7 @@
"ext-fileinfo": "*",
"ext-fileinfo": "*",
"league/phpunit-coverage-listener": "~1.1",
"league/phpunit-coverage-listener": "~1.1",
"mockery/mockery": "~0.9",
"mockery/mockery": "~0.9",
"phpspec/phpspec": "~2.0
.0
",
"phpspec/phpspec": "~2.0",
"phpspec/prophecy-phpunit": "~1.0",
"phpspec/prophecy-phpunit": "~1.0",
"phpunit/phpunit": "~4.1",
"phpunit/phpunit": "~4.1",
"predis/predis": "~1.0",
"predis/predis": "~1.0",
...
@@ -1724,7 +1724,7 @@
...
@@ -1724,7 +1724,7 @@
"sftp",
"sftp",
"storage"
"storage"
],
],
"time": "2015-03-
10 11:04:14
"
"time": "2015-03-
29 14:01:43
"
},
},
{
{
"name": "maatwebsite/laravel-sidebar",
"name": "maatwebsite/laravel-sidebar",
...
@@ -1940,20 +1940,21 @@
...
@@ -1940,20 +1940,21 @@
},
},
{
{
"name": "nesbot/carbon",
"name": "nesbot/carbon",
"version": "1.1
7
.0",
"version": "1.1
8
.0",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "
a1dd1ad9abfc8b3c4d8768068e6c71d293424e8
6"
"reference": "
99e2f69f7bdc2cc4334b2d00f1e0ba450623ea3
6"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/
a1dd1ad9abfc8b3c4d8768068e6c71d293424e8
6",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/
99e2f69f7bdc2cc4334b2d00f1e0ba450623ea3
6",
"reference": "
a1dd1ad9abfc8b3c4d8768068e6c71d293424e8
6",
"reference": "
99e2f69f7bdc2cc4334b2d00f1e0ba450623ea3
6",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
"php": ">=5.3.0"
"php": ">=5.3.0",
"symfony/translation": "2.6.*"
},
},
"require-dev": {
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "~4.0"
...
@@ -1982,7 +1983,7 @@
...
@@ -1982,7 +1983,7 @@
"datetime",
"datetime",
"time"
"time"
],
],
"time": "2015-03-
08 14:05:44
"
"time": "2015-03-
26 03:05:57
"
},
},
{
{
"name": "nikic/php-parser",
"name": "nikic/php-parser",
...
@@ -2225,16 +2226,16 @@
...
@@ -2225,16 +2226,16 @@
},
},
{
{
"name": "psy/psysh",
"name": "psy/psysh",
"version": "v0.4.
3
",
"version": "v0.4.
4
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "
b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a
"
"reference": "
489816db71649bd95b416e3ed9062d40528ab0ac
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/
b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a
",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/
489816db71649bd95b416e3ed9062d40528ab0ac
",
"reference": "
b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a
",
"reference": "
489816db71649bd95b416e3ed9062d40528ab0ac
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -2292,7 +2293,7 @@
...
@@ -2292,7 +2293,7 @@
"interactive",
"interactive",
"shell"
"shell"
],
],
"time": "2015-03-
17 15:17:33
"
"time": "2015-03-
26 18:43:54
"
},
},
{
{
"name": "react/promise",
"name": "react/promise",
...
@@ -3525,21 +3526,22 @@
...
@@ -3525,21 +3526,22 @@
},
},
{
{
"name": "phpspec/prophecy",
"name": "phpspec/prophecy",
"version": "
v1.3.1
",
"version": "
1.4.0
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "
9ca52329bcdd1500de24427542577ebf3fc2f1c9
"
"reference": "
8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/
9ca52329bcdd1500de24427542577ebf3fc2f1c9
",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/
8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5
",
"reference": "
9ca52329bcdd1500de24427542577ebf3fc2f1c9
",
"reference": "
8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
"doctrine/instantiator": "~1.0,>=1.0.2",
"doctrine/instantiator": "^1.0.2",
"phpdocumentor/reflection-docblock": "~2.0"
"phpdocumentor/reflection-docblock": "~2.0",
"sebastian/comparator": "~1.1"
},
},
"require-dev": {
"require-dev": {
"phpspec/phpspec": "~2.0"
"phpspec/phpspec": "~2.0"
...
@@ -3547,7 +3549,7 @@
...
@@ -3547,7 +3549,7 @@
"type": "library",
"type": "library",
"extra": {
"extra": {
"branch-alias": {
"branch-alias": {
"dev-master": "1.
2
.x-dev"
"dev-master": "1.
4
.x-dev"
}
}
},
},
"autoload": {
"autoload": {
...
@@ -3571,7 +3573,7 @@
...
@@ -3571,7 +3573,7 @@
}
}
],
],
"description": "Highly opinionated mocking framework for PHP 5.3+",
"description": "Highly opinionated mocking framework for PHP 5.3+",
"homepage": "http
://phpspec.org
",
"homepage": "http
s://github.com/phpspec/prophecy
",
"keywords": [
"keywords": [
"Double",
"Double",
"Dummy",
"Dummy",
...
@@ -3580,7 +3582,7 @@
...
@@ -3580,7 +3582,7 @@
"spy",
"spy",
"stub"
"stub"
],
],
"time": "201
4-11-17 16:23:49
"
"time": "201
5-03-27 19:31:25
"
},
},
{
{
"name": "phpunit/php-code-coverage",
"name": "phpunit/php-code-coverage",
...
@@ -3828,16 +3830,16 @@
...
@@ -3828,16 +3830,16 @@
},
},
{
{
"name": "phpunit/phpunit",
"name": "phpunit/phpunit",
"version": "4.5.
0
",
"version": "4.5.
1
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "
5b578d3865a9128b9c209b011fda6539ec06e7a5
"
"reference": "
d6429b0995b24a2d9dfe5587ee3a7071c1161af4
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/
5b578d3865a9128b9c209b011fda6539ec06e7a5
",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/
d6429b0995b24a2d9dfe5587ee3a7071c1161af4
",
"reference": "
5b578d3865a9128b9c209b011fda6539ec06e7a5
",
"reference": "
d6429b0995b24a2d9dfe5587ee3a7071c1161af4
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -3847,8 +3849,8 @@
...
@@ -3847,8 +3849,8 @@
"ext-reflection": "*",
"ext-reflection": "*",
"ext-spl": "*",
"ext-spl": "*",
"php": ">=5.3.3",
"php": ">=5.3.3",
"phpspec/prophecy": "~1.3.1",
"phpspec/prophecy": "~1.3
,>=1.3
.1",
"phpunit/php-code-coverage": "~2.0",
"phpunit/php-code-coverage": "~2.0
,>=2.0.11
",
"phpunit/php-file-iterator": "~1.3.2",
"phpunit/php-file-iterator": "~1.3.2",
"phpunit/php-text-template": "~1.2",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "~1.0.2",
"phpunit/php-timer": "~1.0.2",
...
@@ -3896,7 +3898,7 @@
...
@@ -3896,7 +3898,7 @@
"testing",
"testing",
"xunit"
"xunit"
],
],
"time": "2015-0
2-05 15:51:19
"
"time": "2015-0
3-29 09:24:05
"
},
},
{
{
"name": "phpunit/phpunit-mock-objects",
"name": "phpunit/phpunit-mock-objects",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment