DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-23 21:17:43 -07:00
parent 47c7061af5 c18220069d
commit a41d603e0f
3 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
composer.json
View file

@ -18,7 +18,7 @@
"intervention/image": "^2.3", "intervention/image": "^2.3",
"javiereguiluz/easyslugger": "^1.0", "javiereguiluz/easyslugger": "^1.0",
"jenssegers/rollbar": "^1.5", "jenssegers/rollbar": "^1.5",
"laravel/framework": "5.4.*", "laravel/framework": "5.4.29",
"laravel/passport": "^3.0", "laravel/passport": "^3.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"laravelcollective/html": "^5.3", "laravelcollective/html": "^5.3",
@ -72,6 +72,10 @@
"config": { "config": {
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true, "sort-packages": true,
"optimize-autoloader": true "optimize-autoloader": true,
"platform": {
"php": "5.6.4"
}
} }
} }

69
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0b0e517d5028f9e5282a8683afeeb28d", "content-hash": "a1fc66ea043e149e85b4d708f852adbe",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -343,21 +343,21 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "v1.5.0", "version": "v1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
"reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/lexer": "1.*", "doctrine/lexer": "1.*",
"php": "^7.1" "php": "^5.6 || ^7.0"
}, },
"require-dev": { "require-dev": {
"doctrine/cache": "1.*", "doctrine/cache": "1.*",
@ -366,7 +366,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5.x-dev" "dev-master": "1.4.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -407,41 +407,37 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2017-07-22T10:58:02+00:00" "time": "2017-02-24T16:22:25+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.7.1", "version": "v1.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a" "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a", "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a", "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "~7.1" "php": "~5.5|~7.0"
}, },
"conflict": { "conflict": {
"doctrine/common": ">2.2,<2.4" "doctrine/common": ">2.2,<2.4"
}, },
"require-dev": { "require-dev": {
"alcaeus/mongo-php-adapter": "^1.1", "phpunit/phpunit": "~4.8|~5.0",
"mongodb/mongodb": "^1.1", "predis/predis": "~1.0",
"phpunit/phpunit": "^5.7", "satooshi/php-coveralls": "~0.6"
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7.x-dev" "dev-master": "1.6.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -481,24 +477,24 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2017-08-25T07:02:50+00:00" "time": "2017-07-22T12:49:21+00:00"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
"version": "v1.5.0", "version": "v1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/collections.git", "url": "https://github.com/doctrine/collections.git",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^5.6 || ^7.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "~0.1@dev", "doctrine/coding-standard": "~0.1@dev",
@ -548,7 +544,7 @@
"collections", "collections",
"iterator" "iterator"
], ],
"time": "2017-07-22T10:37:32+00:00" "time": "2017-01-03T10:49:41+00:00"
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
@ -1433,20 +1429,20 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.4.36", "version": "v5.4.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", "url": "https://api.github.com/repos/laravel/framework/zipball/4f7588c744eb15e49544c99c6ee90d5598b0b50b",
"reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/inflector": "~1.1", "doctrine/inflector": "~1.0",
"erusev/parsedown": "~1.6", "erusev/parsedown": "~1.6",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-openssl": "*", "ext-openssl": "*",
@ -1558,7 +1554,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2017-08-30T09:26:16+00:00" "time": "2017-07-19T13:26:57+00:00"
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
@ -6432,5 +6428,8 @@
"platform": { "platform": {
"php": ">=5.6.4" "php": ">=5.6.4"
}, },
"platform-dev": [] "platform-dev": [],
"platform-overrides": {
"php": "5.6.4"
}
} }

4
config/version.php
View file

@ -1,7 +1,7 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.0.14', 'app_version' => 'v4.0.15',
'build_version' => '339', 'build_version' => '339',
'hash_version' => 'g17b2719', 'hash_version' => 'g17b2719',
'full_hash' => 'v4.0.14-339-g17b2719', 'full_hash' => 'v4.0.15-339-g17b2719',
); );