Merge branch 'master' into...
Merge branch 'master' into '15-anstatt-die-wegbschreibungen-selbst-zu-generieren-sollten-wir-ein-vorhandenes-tool-verwenden' Master See merge request open-source/MetaGerMaps!9
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- .gitlab-ci.yml 2 additions, 0 deletions.gitlab-ci.yml
- app/Console/Kernel.php 1 addition, 0 deletionsapp/Console/Kernel.php
- composer.json 27 additions, 20 deletionscomposer.json
- composer.lock 1298 additions, 786 deletionscomposer.lock
- package.json 20 additions, 18 deletionspackage.json
- public/build/css/general-b3671fea55.css 0 additions, 7637 deletionspublic/build/css/general-b3671fea55.css
- public/build/css/general.css.map 0 additions, 1 deletionpublic/build/css/general.css.map
- public/build/css/iframeSearch-83852d6007.css 0 additions, 7393 deletionspublic/build/css/iframeSearch-83852d6007.css
- public/build/css/iframeSearch.css.map 0 additions, 1 deletionpublic/build/css/iframeSearch.css.map
- public/build/css/mapSearch-54c67f71f8.css 0 additions, 126 deletionspublic/build/css/mapSearch-54c67f71f8.css
- public/build/css/mapSearch.css.map 0 additions, 1 deletionpublic/build/css/mapSearch.css.map
- public/build/css/routing-2e3423c3c6.css 0 additions, 561 deletionspublic/build/css/routing-2e3423c3c6.css
- public/build/css/routing.css.map 0 additions, 1 deletionpublic/build/css/routing.css.map
- public/build/css/staticPages-98eb271535.css 0 additions, 7358 deletionspublic/build/css/staticPages-98eb271535.css
- public/build/css/staticPages.css.map 0 additions, 1 deletionpublic/build/css/staticPages.css.map
- public/build/js/map-980bb9ac14.js 0 additions, 5968 deletionspublic/build/js/map-980bb9ac14.js
- public/build/js/map-a5befd313c.js 0 additions, 5984 deletionspublic/build/js/map-a5befd313c.js
- public/build/js/map-d4edf4722b.js 0 additions, 26 deletionspublic/build/js/map-d4edf4722b.js
- public/build/js/map-d70b945b2d.js 0 additions, 5917 deletionspublic/build/js/map-d70b945b2d.js
... | @@ -5,47 +5,54 @@ | ... | @@ -5,47 +5,54 @@ |
"license": "MIT", | "license": "MIT", | ||
"type": "project", | "type": "project", | ||
"require": { | "require": { | ||
"php": ">=5.6.4", | "php": ">=7.0.0", | ||
"laravel/framework": "5.3.*", | "fideloper/proxy": "~3.3", | ||
"laravel/framework": "5.5.*", | |||
"laravel/tinker": "~1.0", | |||
"predis/predis": "^1.1" | "predis/predis": "^1.1" | ||
}, | }, | ||
"require-dev": { | "require-dev": { | ||
"filp/whoops": "~2.0", | |||
"fzaninotto/faker": "~1.4", | "fzaninotto/faker": "~1.4", | ||
"mockery/mockery": "0.9.*", | "mockery/mockery": "~1.0", | ||
"phpunit/phpunit": "~5.0", | "phpunit/phpunit": "~6.0", | ||
"symfony/css-selector": "3.1.*", | "symfony/thanks": "^1.0" | ||
"symfony/dom-crawler": "3.1.*" | |||
}, | }, | ||
"autoload": { | "autoload": { | ||
"classmap": [ | "classmap": [ | ||
"database" | "database/seeds", | ||
"database/factories" | |||
], | ], | ||
"psr-4": { | "psr-4": { | ||
"App\\": "app/" | "App\\": "app/" | ||
} | } | ||
}, | }, | ||
"autoload-dev": { | "autoload-dev": { | ||
"classmap": [ | "psr-4": { | ||
"tests/TestCase.php" | "Tests\\": "tests/" | ||
] | } | ||
}, | |||
"extra": { | |||
"laravel": { | |||
"dont-discover": [ | |||
] | |||
} | |||
}, | }, | ||
"scripts": { | "scripts": { | ||
"post-root-package-install": [ | "post-root-package-install": [ | ||
"php -r \"file_exists('.env') || copy('.env.example', '.env');\"" | "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" | ||
], | ], | ||
"post-create-project-cmd": [ | "post-create-project-cmd": [ | ||
"php artisan key:generate" | "@php artisan key:generate" | ||
], | |||
"post-install-cmd": [ | |||
"Illuminate\\Foundation\\ComposerScripts::postInstall", | |||
"php artisan optimize" | |||
], | ], | ||
"post-update-cmd": [ | "post-autoload-dump": [ | ||
"Illuminate\\Foundation\\ComposerScripts::postUpdate", | "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", | ||
"php artisan optimize" | "@php artisan package:discover" | ||
] | ] | ||
}, | }, | ||
"config": { | "config": { | ||
"preferred-install": "dist" | "preferred-install": "dist", | ||
"sort-packages": true, | |||
"optimize-autoloader": true | |||
} | } | ||
} | } |
This diff is collapsed.
{ | { | ||
"private": true, | "private": true, | ||
"scripts": { | "scripts": { | ||
"prod": "gulp --production", | "dev": "npm run development", | ||
"dev": "gulp watch" | "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
}, | "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"devDependencies": { | "watch-poll": "npm run watch -- --watch-poll", | ||
"bootstrap-sass": "^3.3.7", | "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"gulp": "^3.9.1", | "prod": "npm run production", | ||
"gulp-minify": "0.0.14", | "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" | ||
"jquery": "^3.1.0", | }, | ||
"laravel-elixir": "^6.0.0-11", | "devDependencies": { | ||
"laravel-elixir-vue-2": "^0.2.0", | "axios": "^0.17", | ||
"laravel-elixir-webpack-official": "^1.0.2", | "bootstrap-sass": "^3.3.7", | ||
"lodash": "^4.16.2", | "cross-env": "^5.1", | ||
"vue": "^2.0.1", | "jquery": "^3.2", | ||
"vue-resource": "^1.0.3" | "laravel-mix": "^2.0", | ||
} | "lodash": "^4.17.4", | ||
} | "vue": "^2.5.7" | ||
} | |||
} | |||
\ No newline at end of file |
This diff is collapsed.
public/build/css/general.css.map
deleted
100644 → 0
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
public/build/css/mapSearch.css.map
deleted
100644 → 0
public/build/css/routing.css.map
deleted
100644 → 0
This diff is collapsed.
public/build/css/staticPages.css.map
deleted
100644 → 0
source diff could not be displayed: it is too large. Options to address this: view the blob.
public/build/js/map-980bb9ac14.js
deleted
100644 → 0
This diff is collapsed.
public/build/js/map-a5befd313c.js
deleted
100644 → 0
This diff is collapsed.
public/build/js/map-d4edf4722b.js
deleted
100644 → 0
This diff is collapsed.
public/build/js/map-d70b945b2d.js
deleted
100644 → 0
This diff is collapsed.
Please register or sign in to comment