Merge branch 'feature/update' of manuel/converter into develop
continuous-integration/drone the build was successful Details

This commit is contained in:
Manuel Friedli 2018-09-06 14:17:10 +02:00 committed by Gitea
commit 1a8c6c7928
2 changed files with 44 additions and 44 deletions

70
package-lock.json generated
View File

@ -11,7 +11,7 @@
"dev": true,
"requires": {
"@angular-devkit/core": "0.7.5",
"rxjs": "6.3.0"
"rxjs": "6.3.2"
}
},
"@angular-devkit/build-angular": {
@ -51,7 +51,7 @@
"postcss-loader": "2.1.6",
"postcss-url": "7.3.2",
"raw-loader": "0.5.1",
"rxjs": "6.3.0",
"rxjs": "6.3.2",
"sass-loader": "6.0.7",
"semver": "5.5.1",
"source-map-loader": "0.2.4",
@ -91,7 +91,7 @@
"requires": {
"@angular-devkit/architect": "0.7.5",
"@angular-devkit/core": "0.7.5",
"rxjs": "6.3.0"
"rxjs": "6.3.2"
}
},
"@angular-devkit/core": {
@ -102,7 +102,7 @@
"requires": {
"ajv": "6.4.0",
"chokidar": "2.0.4",
"rxjs": "6.3.0",
"rxjs": "6.3.2",
"source-map": "0.5.7"
}
},
@ -113,7 +113,7 @@
"dev": true,
"requires": {
"@angular-devkit/core": "0.7.5",
"rxjs": "6.3.0"
"rxjs": "6.3.2"
}
},
"@angular/cli": {
@ -128,32 +128,32 @@
"@schematics/angular": "0.7.5",
"@schematics/update": "0.7.5",
"opn": "5.3.0",
"rxjs": "6.3.0",
"rxjs": "6.3.2",
"semver": "5.5.1",
"symbol-observable": "1.2.0",
"yargs-parser": "10.1.0"
}
},
"@angular/common": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/common/-/common-6.1.6.tgz",
"integrity": "sha1-Fll9id3dcqYG08xxJf+jCof17gk=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/common/-/common-6.1.7.tgz",
"integrity": "sha1-uUrp8ccbEiOjBZQvCaq/gY9e0uk=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/compiler": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/compiler/-/compiler-6.1.6.tgz",
"integrity": "sha1-LIWP54rRyluzyIa9Y4u7FErzbgY=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/compiler/-/compiler-6.1.7.tgz",
"integrity": "sha1-z05A7FBRMHEBIiKUgakMoQa62FU=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/compiler-cli": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/compiler-cli/-/compiler-cli-6.1.6.tgz",
"integrity": "sha1-zM6/r2avO3wZ3VKHMrlFzjeL1l8=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/compiler-cli/-/compiler-cli-6.1.7.tgz",
"integrity": "sha1-YKvfs8rG9Q1Bsq+QWlv6K/HwizY=",
"dev": true,
"requires": {
"chokidar": "1.7.0",
@ -290,41 +290,41 @@
}
},
"@angular/core": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/core/-/core-6.1.6.tgz",
"integrity": "sha1-EwdYrUnK1fbwdWk/ZJa7x9UQ2zs=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/core/-/core-6.1.7.tgz",
"integrity": "sha1-A2CIIny/99P8evDEPFr520YUnxY=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/forms": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/forms/-/forms-6.1.6.tgz",
"integrity": "sha1-HEk2mT8tvO5RbLVHpTTaPHD4S3Y=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/forms/-/forms-6.1.7.tgz",
"integrity": "sha1-QkhMKrEHn9NN3WN+sUPbahe+SZA=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/platform-browser": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/platform-browser/-/platform-browser-6.1.6.tgz",
"integrity": "sha1-mpSYqkVZeOl0Q2AA3d6K+fZO7xM=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/platform-browser/-/platform-browser-6.1.7.tgz",
"integrity": "sha1-IdpPvm9AcyDuUM35qwtpsuEOylA=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/platform-browser-dynamic": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.6.tgz",
"integrity": "sha1-ScIEjWG20JWLLw3raM6+Y4svf2M=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.7.tgz",
"integrity": "sha1-RDgfxO2ZAZSzclU+apn0zICFJBQ=",
"requires": {
"tslib": "1.9.3"
}
},
"@angular/router": {
"version": "6.1.6",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/router/-/router-6.1.6.tgz",
"integrity": "sha1-0oDgFOW0OZ2WMayc/T394M8/du0=",
"version": "6.1.7",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/@angular/router/-/router-6.1.7.tgz",
"integrity": "sha1-kClLJJdkn9bW0VB+bkR9nBU+jbg=",
"requires": {
"tslib": "1.9.3"
}
@ -504,7 +504,7 @@
"dev": true,
"requires": {
"@angular-devkit/core": "0.7.5",
"rxjs": "6.3.0",
"rxjs": "6.3.2",
"tree-kill": "1.2.0",
"webpack-sources": "1.2.0"
}
@ -529,7 +529,7 @@
"@angular-devkit/core": "0.7.5",
"@angular-devkit/schematics": "0.7.5",
"npm-registry-client": "8.6.0",
"rxjs": "6.3.0",
"rxjs": "6.3.2",
"semver": "5.5.1",
"semver-intersect": "1.4.0"
}
@ -8664,9 +8664,9 @@
}
},
"rxjs": {
"version": "6.3.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/rxjs/-/rxjs-6.3.0.tgz",
"integrity": "sha1-5VsFrUvfNR20tFdWY436NoJgqKM=",
"version": "6.3.2",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/rxjs/-/rxjs-6.3.2.tgz",
"integrity": "sha1-amiLFsTm6YDmLqgF7DBkjhxgkH8=",
"requires": {
"tslib": "1.9.3"
}

View File

@ -32,24 +32,24 @@
},
"private": true,
"dependencies": {
"@angular/common": "6.1.6",
"@angular/compiler": "6.1.6",
"@angular/core": "6.1.6",
"@angular/forms": "6.1.6",
"@angular/platform-browser": "6.1.6",
"@angular/platform-browser-dynamic": "6.1.6",
"@angular/router": "6.1.6",
"@angular/common": "6.1.7",
"@angular/compiler": "6.1.7",
"@angular/core": "6.1.7",
"@angular/forms": "6.1.7",
"@angular/platform-browser": "6.1.7",
"@angular/platform-browser-dynamic": "6.1.7",
"@angular/router": "6.1.7",
"core-js": "^2.5.1",
"punycode": "^2.1.0",
"quoted-printable": "^1.0.0",
"rxjs": "^6.3.0",
"rxjs": "^6.3.2",
"utf8": "^2.1.0",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.7.0",
"@angular/cli": "6.1.5",
"@angular/compiler-cli": "6.1.6",
"@angular/compiler-cli": "6.1.7",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",