lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-09-29 17:05:32 -07:00
commit 1a7e3fbb4b
3 changed files with 339 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
composer.json
View file

@ -10,12 +10,12 @@
"barryvdh/laravel-debugbar": "^2.4", "barryvdh/laravel-debugbar": "^2.4",
"doctrine/cache": "^1.6", "doctrine/cache": "^1.6",
"doctrine/common": "^2.7", "doctrine/common": "^2.7",
"doctrine/dbal": "v2.4.2", "doctrine/dbal": "v2.5.13",
"erusev/parsedown": "^1.6", "erusev/parsedown": "^1.6",
"fideloper/proxy": "^3.1", "fideloper/proxy": "^3.1",
"intervention/image": "^2.3", "intervention/image": "^2.3",
"javiereguiluz/easyslugger": "^1.0", "javiereguiluz/easyslugger": "^1.0",
"laravel/framework": "5.4.20", "laravel/framework": "5.4.*",
"laravel/passport": "^1.0", "laravel/passport": "^1.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"laravelcollective/html": "^5.3", "laravelcollective/html": "^5.3",
@ -29,15 +29,15 @@
"tecnickcom/tc-lib-barcode": "^1.15", "tecnickcom/tc-lib-barcode": "^1.15",
"unicodeveloper/laravel-password": "^1.0", "unicodeveloper/laravel-password": "^1.0",
"watson/validating": "^3.0", "watson/validating": "^3.0",
"doctrine/instantiator": "1.0.5", "doctrine/instantiator": "1.0.*",
"doctrine/inflector": "1.0.*" "doctrine/inflector": "1.2.*"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"phpunit/phpunit": "~5.7", "phpunit/phpunit": "~5.7",
"symfony/css-selector": "3.1.*", "symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*", "symfony/dom-crawler": "3.1.*",
"codeception/codeception": "2.2.9", "codeception/codeception": "2.3.6",
"squizlabs/php_codesniffer": "*", "squizlabs/php_codesniffer": "*",
"phpunit/php-token-stream": "1.4.11" "phpunit/php-token-stream": "1.4.11"

612
composer.lock generated
View file

File diff suppressed because it is too large Load diff

3
public/.htaccess
View file

@ -13,7 +13,8 @@
# Redirect Trailing Slashes If Not A Folder... # Redirect Trailing Slashes If Not A Folder...
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [L,R=301] RewriteCond %{REQUEST_URI} (.+)/$
RewriteRule ^ %1 [L,R=301]
# Handle Front Controller... # Handle Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d