Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	config/webpack.common.js
	package.json
	src/app/pages/components/components/treeView/treeView.component.ts
This commit is contained in:
nixa 2016-07-12 13:53:21 +03:00
commit 661583bee1
5 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/webpack.common.js
View file

@ -89,6 +89,7 @@ module.exports = {
// these packages have problems with their sourcemaps // these packages have problems with their sourcemaps
helpers.root('node_modules/rxjs'), helpers.root('node_modules/rxjs'),
helpers.root('node_modules/ng2-bootstrap'), helpers.root('node_modules/ng2-bootstrap'),
helpers.root('node_modules/ng2-branchy')
] ]
} }

6
package.json
View file

@ -35,9 +35,9 @@
"leaflet": "^0.7.7", "leaflet": "^0.7.7",
"leaflet-map": "^0.2.1", "leaflet-map": "^0.2.1",
"lodash": "^4.12.0", "lodash": "^4.12.0",
"ng2-bootstrap": "^1.0.16", "ng2-bootstrap": "^1.0.20",
"ng2-branchy": "0.0.2-2", "ng2-ckeditor": "^1.0.4",
"ng2-ckeditor": "^1.0.3", "ng2-branchy": "^0.0.2-5",
"ng2-uploader": "^0.5.2", "ng2-uploader": "^0.5.2",
"normalize.css": "^4.1.1", "normalize.css": "^4.1.1",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.6",

2
src/app/pages/components/components/treeView/treeView.component.ts
View file

@ -1,6 +1,6 @@
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {BranchyComponent, TreeModel} from 'ng2-branchy'; import {BranchyComponent, TreeModel} from 'ng2-branchy';
import {BaCard} from "../../../../theme/components/baCard/baCard.component"; import {BaCard} from '../../../../theme/components/baCard';
@Component({ @Component({
selector: 'tree-view', selector: 'tree-view',

5
src/platform/browser/directives.ts
View file

@ -6,10 +6,13 @@ import {PLATFORM_DIRECTIVES} from '@angular/core';
// Angular 2 Router // Angular 2 Router
import {ROUTER_DIRECTIVES} from '@angular/router'; import {ROUTER_DIRECTIVES} from '@angular/router';
// Angular 2 forms
import { REACTIVE_FORM_DIRECTIVES } from '@angular/forms';
// application_directives: directives that are global through out the application // application_directives: directives that are global through out the application
export const APPLICATION_DIRECTIVES = [ export const APPLICATION_DIRECTIVES = [
...ROUTER_DIRECTIVES ...ROUTER_DIRECTIVES,
...REACTIVE_FORM_DIRECTIVES
]; ];
export const DIRECTIVES = [ export const DIRECTIVES = [

16
src/platform/browser/providers.ts
View file

@ -10,15 +10,21 @@ import {HTTP_PROVIDERS} from '@angular/http';
import {APP_ROUTER_PROVIDERS} from '../../app/app.routes'; import {APP_ROUTER_PROVIDERS} from '../../app/app.routes';
// Angular 2 forms
import {disableDeprecatedForms, provideForms} from '@angular/forms';
/* /*
* Application Providers/Directives/Pipes * Application Providers/Directives/Pipes
* providers/directives/pipes that only live in our browser environment * providers/directives/pipes that only live in our browser environment
*/ */
export const APPLICATION_PROVIDERS = [ export const APPLICATION_PROVIDERS = [
...FORM_PROVIDERS, // new Angular 2 forms
disableDeprecatedForms(),
provideForms(),
...HTTP_PROVIDERS, ...HTTP_PROVIDERS,
...APP_ROUTER_PROVIDERS, ...APP_ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy } {provide: LocationStrategy, useClass: HashLocationStrategy},
{provide: LocationStrategy, useClass: HashLocationStrategy}
]; ];
export const PROVIDERS = [ export const PROVIDERS = [