lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1653 from CachetHQ/updates

Browse Source 
Updates
This commit is contained in:
Graham Campbell
2016-03-24 13:58:35 +00:00
parent d5542f7555 adab5487fd
commit 85094805f2
7 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+2 -4
View File
@@ -20,7 +20,7 @@
],
"require": {
"php": ">=5.5.9",
"laravel/framework": "~5.2.21",
"laravel/framework": "~5.2.24",
"alt-three/badger": "^3.0",
"alt-three/bus": "^1.0",
"alt-three/emoji": "^3.0",
@@ -79,10 +79,8 @@
"php artisan config:cache",
"php artisan route:cache"
],
"pre-update-cmd": [
"php artisan clear-compiled"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize --force",
"php artisan config:cache",
"php artisan route:cache"
composer.lock
Generated
+19 -19
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "490a0354838e9ad71f1f8dd22f2f4b91",
"content-hash": "8ad3d1b6eec470748458409d2fc149b7",
"hash": "4eb117df631024aa9dc6b1036dc6421d",
"content-hash": "714d9d3df78aef789a7fe3780e401885",
"packages": [
{
"name": "alt-three/badger",
@@ -1330,16 +1330,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.1.1",
"version": "6.2.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
"reference": "d094e337976dff9d8e2424e8485872194e768662"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
"reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
"reference": "d094e337976dff9d8e2424e8485872194e768662",
"shasum": ""
},
"require": {
@@ -1355,7 +1355,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.1-dev"
"dev-master": "6.2-dev"
}
},
"autoload": {
@@ -1388,7 +1388,7 @@
"rest",
"web service"
],
"time": "2015-11-23 00:47:50"
"time": "2016-03-21 20:02:09"
},
{
"name": "guzzlehttp/promises",
@@ -1703,16 +1703,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.23",
"version": "v5.2.24",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "87c090845f135ca94eba903f1c8462e60e3a6e36"
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/87c090845f135ca94eba903f1c8462e60e3a6e36",
"reference": "87c090845f135ca94eba903f1c8462e60e3a6e36",
"url": "https://api.github.com/repos/laravel/framework/zipball/396297a5fd3c70c2fc1af68f09ee574a2380175c",
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c",
"shasum": ""
},
"require": {
@@ -1725,7 +1725,7 @@
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
"nesbot/carbon": "~1.20",
"paragonie/random_compat": "~1.1",
"paragonie/random_compat": "~1.4",
"php": ">=5.5.9",
"psy/psysh": "0.7.*",
"swiftmailer/swiftmailer": "~5.1",
@@ -1827,7 +1827,7 @@
"framework",
"laravel"
],
"time": "2016-03-14 14:22:33"
"time": "2016-03-22 13:45:19"
},
{
"name": "league/commonmark",
@@ -1982,16 +1982,16 @@
},
{
"name": "mccool/laravel-auto-presenter",
"version": "v4.2.1",
"version": "4.2.1",
"source": {
"type": "git",
"url": "https://github.com/laravel-auto-presenter/laravel-auto-presenter.git",
"reference": "48649d3f98e369c2e0922ef37190dd15812a292a"
"reference": "c385b113696dfc564869c54f5c4baba5e116a3be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel-auto-presenter/laravel-auto-presenter/zipball/c385b113696dfc564869c54f5c4baba5e116a3be",
"reference": "48649d3f98e369c2e0922ef37190dd15812a292a",
"reference": "c385b113696dfc564869c54f5c4baba5e116a3be",
"shasum": ""
},
"require": {
@@ -2040,7 +2040,7 @@
"lpm",
"presenter"
],
"time": "2016-01-24 11:06:03"
"time": "2016-01-30 14:04:34"
},
{
"name": "monolog/monolog",
@@ -3850,7 +3850,7 @@
],
"authors": [
{
"name": "Francois Zaninotto"
"name": "François Zaninotto"
}
],
"description": "Faker is a PHP library that generates fake data for you.",
public/build/dist/css/all-1f42aa88c2.css
Vendored
+23
View File
File diff suppressed because one or more lines are too long
public/build/dist/css/all-61fb27e8dd.css
Vendored
-19
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all-84f6fb9f0b.js
Vendored
+20
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all-e35605aa24.js
Vendored
-20
View File
File diff suppressed because one or more lines are too long
public/build/rev-manifest.json
+2 -2
View File
@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-61fb27e8dd.css",
"dist/js/all.js": "dist/js/all-e35605aa24.js"
"dist/css/all.css": "dist/css/all-1f42aa88c2.css",
"dist/js/all.js": "dist/js/all-84f6fb9f0b.js"
}