diff --git a/.gitmodules b/.gitmodules
index 2b090810..5b5f27b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "plugins"]
- path = plugins
- url = git@github.com:printempw/blessing-skin-plugins.git
- ignore = dirty
+ path = plugins
+ url = git@github.com:printempw/blessing-skin-plugins.git
+ ignore = dirty
diff --git a/composer.json b/composer.json
index e30f8a3c..b6af0542 100644
--- a/composer.json
+++ b/composer.json
@@ -1,48 +1,48 @@
{
- "name": "printempw/blessing-skin-server",
- "description": "A web application brings your custom skins back in offline Minecraft servers.",
- "license": "GPL-3.0",
- "require": {
- "php": ">=5.5.9",
- "filp/whoops": "^2.1",
- "predis/predis": "~1.0",
- "gregwar/captcha": "^1.1",
- "erusev/parsedown": "^1.6",
- "swiggles/memcache": "^2.0",
- "doctrine/inflector": "1.1.0",
- "laravel/framework": "5.2.*",
- "devitek/yaml-translation": "^2.0",
- "printempw/laravel-datatables-lite": "^1.0"
+ "name": "printempw/blessing-skin-server",
+ "description": "A web application brings your custom skins back in offline Minecraft servers.",
+ "license": "GPL-3.0",
+ "require": {
+ "php": ">=5.5.9",
+ "filp/whoops": "^2.1",
+ "predis/predis": "~1.0",
+ "gregwar/captcha": "^1.1",
+ "erusev/parsedown": "^1.6",
+ "swiggles/memcache": "^2.0",
+ "doctrine/inflector": "1.1.0",
+ "laravel/framework": "5.2.*",
+ "devitek/yaml-translation": "^2.0",
+ "printempw/laravel-datatables-lite": "^1.0"
+ },
+ "require-dev": {
+ "fzaninotto/faker": "~1.4",
+ "mockery/mockery": "0.9.*",
+ "phpdocumentor/reflection-docblock": "3.2.2",
+ "phpunit/phpunit": "~4.0",
+ "symfony/css-selector": "2.8.*|3.0.*",
+ "symfony/dom-crawler": "2.8.*|3.0.*",
+ "barryvdh/laravel-debugbar": "^2.3",
+ "league/flysystem-memory": "^1.0",
+ "mikey179/vfsStream": "1.6.4"
+ },
+ "autoload": {
+ "classmap": [
+ "app/Models",
+ "database"
+ ],
+ "psr-4": {
+ "App\\": "app/"
},
- "require-dev": {
- "fzaninotto/faker": "~1.4",
- "mockery/mockery": "0.9.*",
- "phpdocumentor/reflection-docblock": "3.2.2",
- "phpunit/phpunit": "~4.0",
- "symfony/css-selector": "2.8.*|3.0.*",
- "symfony/dom-crawler": "2.8.*|3.0.*",
- "barryvdh/laravel-debugbar": "^2.3",
- "league/flysystem-memory": "^1.0",
- "mikey179/vfsStream": "1.6.4"
- },
- "autoload": {
- "classmap": [
- "app/Models",
- "database"
- ],
- "psr-4": {
- "App\\": "app/"
- },
- "files": [
- "app/helpers.php"
- ]
- },
- "autoload-dev": {
- "classmap": [
- "tests"
- ]
- },
- "config": {
- "preferred-install": "dist"
- }
+ "files": [
+ "app/helpers.php"
+ ]
+ },
+ "autoload-dev": {
+ "classmap": [
+ "tests"
+ ]
+ },
+ "config": {
+ "preferred-install": "dist"
+ }
}
diff --git a/package.json b/package.json
index 341657cd..88ee91cc 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,19 @@
"codecov": "codecov -F js",
"dev": "gulp watch"
},
- "jest": {
- "timers": "fake"
+ "dependencies": {
+ "admin-lte": "^2.3.11",
+ "bootstrap": "^3.3.7",
+ "bootstrap-fileinput": "^4.4.2",
+ "es6-promise": "^4.1.1",
+ "font-awesome": "^4.7.0",
+ "highlight.js": "^9.12.0",
+ "icheck": "^1.0.2",
+ "jqPaginator": "^1.2.0",
+ "jquery": "^3.2.1",
+ "regenerator": "^0.12.2",
+ "sweetalert2": "^6.6.5",
+ "toastr": "^2.1.2"
},
"devDependencies": {
"babel-plugin-transform-inline-environment-variables": "^0.2.0",
@@ -44,19 +55,8 @@
"node-sass": "^4.5.3",
"run-sequence": "^2.0.0"
},
- "dependencies": {
- "admin-lte": "^2.3.11",
- "bootstrap": "^3.3.7",
- "bootstrap-fileinput": "^4.4.2",
- "es6-promise": "^4.1.1",
- "font-awesome": "^4.7.0",
- "highlight.js": "^9.12.0",
- "icheck": "^1.0.2",
- "jqPaginator": "^1.2.0",
- "jquery": "^3.2.1",
- "regenerator": "^0.12.2",
- "sweetalert2": "^6.6.5",
- "toastr": "^2.1.2"
+ "jest": {
+ "timers": "fake"
},
"optionalDependencies": {
"@types/jest": "^20.0.2"
diff --git a/phpunit.xml b/phpunit.xml
index 84594f0e..b49a393a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,27 +1,27 @@
-
-
-
- ./tests
-
-
-
-
- ./app
-
- ./app/Http/routes.php
-
-
-
-
-
-
+ bootstrap="bootstrap/autoload.php">
+
+
+ ./tests
+
+
+
+
+ ./app
+
+ ./app/Http/routes.php
+
+
+
+
+
+
diff --git a/web.config b/web.config
index 1e9b3e7b..5ec190f5 100644
--- a/web.config
+++ b/web.config
@@ -1,36 +1,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+