mirror of
https://github.com/richard-loafle/fuse-angular.git
synced 2025-01-24 20:03:18 +00:00
Merge 'master' into 'skeleton'
This commit is contained in:
commit
9523e3724a
766
package-lock.json
generated
766
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
66
package.json
66
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "fuse",
|
"name": "fuse",
|
||||||
"version": "7.0.0",
|
"version": "7.0.1",
|
||||||
"license": "https://themeforest.net/licenses/terms/regular",
|
"license": "https://themeforest.net/licenses/terms/regular",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
|
@ -19,31 +19,31 @@
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@agm/core": "1.0.0-beta.5",
|
"@agm/core": "1.0.0-beta.5",
|
||||||
"@angular/animations": "7.0.0",
|
"@angular/animations": "7.0.4",
|
||||||
"@angular/cdk": "7.0.0",
|
"@angular/cdk": "7.0.4",
|
||||||
"@angular/common": "7.0.0",
|
"@angular/common": "7.0.4",
|
||||||
"@angular/compiler": "7.0.0",
|
"@angular/compiler": "7.0.4",
|
||||||
"@angular/core": "7.0.0",
|
"@angular/core": "7.0.4",
|
||||||
"@angular/flex-layout": "7.0.0-beta.19",
|
"@angular/flex-layout": "7.0.0-beta.19",
|
||||||
"@angular/forms": "7.0.0",
|
"@angular/forms": "7.0.4",
|
||||||
"@angular/http": "7.0.0",
|
"@angular/http": "7.0.4",
|
||||||
"@angular/material": "7.0.0",
|
"@angular/material": "7.0.4",
|
||||||
"@angular/material-moment-adapter": "7.0.0",
|
"@angular/material-moment-adapter": "7.0.4",
|
||||||
"@angular/platform-browser": "7.0.0",
|
"@angular/platform-browser": "7.0.4",
|
||||||
"@angular/platform-browser-dynamic": "7.0.0",
|
"@angular/platform-browser-dynamic": "7.0.4",
|
||||||
"@angular/router": "7.0.0",
|
"@angular/router": "7.0.4",
|
||||||
"@ngrx/effects": "6.1.0",
|
"@ngrx/effects": "6.1.2",
|
||||||
"@ngrx/router-store": "6.1.0",
|
"@ngrx/router-store": "6.1.2",
|
||||||
"@ngrx/store": "6.1.0",
|
"@ngrx/store": "6.1.2",
|
||||||
"@ngrx/store-devtools": "6.1.0",
|
"@ngrx/store-devtools": "6.1.2",
|
||||||
"@ngx-translate/core": "10.0.2",
|
"@ngx-translate/core": "11.0.1",
|
||||||
"@swimlane/dragula": "3.7.3",
|
"@swimlane/dragula": "3.7.3",
|
||||||
"@swimlane/ngx-charts": "9.0.0",
|
"@swimlane/ngx-charts": "10.0.0",
|
||||||
"@swimlane/ngx-datatable": "13.1.0",
|
"@swimlane/ngx-datatable": "14.0.0",
|
||||||
"@swimlane/ngx-dnd": "5.1.0",
|
"@swimlane/ngx-dnd": "6.0.0",
|
||||||
"@types/prismjs": "1.9.0",
|
"@types/prismjs": "1.9.0",
|
||||||
"angular-calendar": "0.26.3",
|
"angular-calendar": "0.26.4",
|
||||||
"angular-in-memory-web-api": "0.6.1",
|
"angular-in-memory-web-api": "0.7.0",
|
||||||
"chart.js": "2.7.3",
|
"chart.js": "2.7.3",
|
||||||
"classlist.js": "1.1.20150312",
|
"classlist.js": "1.1.20150312",
|
||||||
"core-js": "2.5.7",
|
"core-js": "2.5.7",
|
||||||
|
@ -54,8 +54,8 @@
|
||||||
"moment": "2.22.2",
|
"moment": "2.22.2",
|
||||||
"ng2-charts": "1.6.0",
|
"ng2-charts": "1.6.0",
|
||||||
"ngrx-store-freeze": "0.2.4",
|
"ngrx-store-freeze": "0.2.4",
|
||||||
"ngx-color-picker": "6.7.0",
|
"ngx-color-picker": "7.0.2",
|
||||||
"ngx-cookie-service": "1.0.10",
|
"ngx-cookie-service": "2.0.0",
|
||||||
"perfect-scrollbar": "1.4.0",
|
"perfect-scrollbar": "1.4.0",
|
||||||
"prismjs": "1.15.0",
|
"prismjs": "1.15.0",
|
||||||
"rxjs": "6.3.3",
|
"rxjs": "6.3.3",
|
||||||
|
@ -64,14 +64,14 @@
|
||||||
"zone.js": "0.8.26"
|
"zone.js": "0.8.26"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "7.0.1",
|
"@angular/cli": "7.0.6",
|
||||||
"@angular/compiler-cli": "7.0.0",
|
"@angular/compiler-cli": "7.0.4",
|
||||||
"@angular/language-service": "7.0.0",
|
"@angular/language-service": "7.0.4",
|
||||||
"@angular-devkit/build-angular": "0.10.1",
|
"@angular-devkit/build-angular": "0.10.6",
|
||||||
"@angularclass/hmr": "2.1.3",
|
"@angularclass/hmr": "2.1.3",
|
||||||
"@types/jasmine": "2.8.9",
|
"@types/jasmine": "2.8.11",
|
||||||
"@types/jasminewd2": "2.0.5",
|
"@types/jasminewd2": "2.0.6",
|
||||||
"@types/lodash": "4.14.117",
|
"@types/lodash": "4.14.118",
|
||||||
"@types/node": "8.9.5",
|
"@types/node": "8.9.5",
|
||||||
"codelyzer": "4.5.0",
|
"codelyzer": "4.5.0",
|
||||||
"jasmine-core": "2.99.1",
|
"jasmine-core": "2.99.1",
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
"protractor": "5.4.1",
|
"protractor": "5.4.1",
|
||||||
"ts-node": "7.0.1",
|
"ts-node": "7.0.1",
|
||||||
"tslint": "5.11.0",
|
"tslint": "5.11.0",
|
||||||
"typescript": "3.1.3",
|
"typescript": "3.1.6",
|
||||||
"webpack-bundle-analyzer": "3.0.3"
|
"webpack-bundle-analyzer": "3.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -332,6 +332,9 @@ export class FuseNavigationService
|
||||||
{
|
{
|
||||||
navigation.push(item);
|
navigation.push(item);
|
||||||
|
|
||||||
|
// Trigger the observable
|
||||||
|
this._onNavigationItemAdded.next(true);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,6 +342,11 @@ export class FuseNavigationService
|
||||||
if ( id === 'start' )
|
if ( id === 'start' )
|
||||||
{
|
{
|
||||||
navigation.unshift(item);
|
navigation.unshift(item);
|
||||||
|
|
||||||
|
// Trigger the observable
|
||||||
|
this._onNavigationItemAdded.next(true);
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add it to a specific location
|
// Add it to a specific location
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
],
|
],
|
||||||
"no-misused-new": true,
|
"no-misused-new": true,
|
||||||
"no-non-null-assertion": true,
|
"no-non-null-assertion": true,
|
||||||
"no-redundant-jsdoc": true,
|
|
||||||
"no-shadowed-variable": true,
|
"no-shadowed-variable": true,
|
||||||
"no-string-literal": false,
|
"no-string-literal": false,
|
||||||
"no-string-throw": true,
|
"no-string-throw": true,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user