hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 19:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-55946_Item-mapping-on-item-level

Browse Source 
Conflicts:
	src/app/+community-page/community-page.component.html
	src/app/app.reducer.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2018-12-21 13:53:10 +01:00
parent 13c1a553a1 2055f3216d
commit 6e7024e31e
135 changed files with 5380 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/shared.module.ts
View File

@@ -76,7 +76,6 @@ import { NumberPickerComponent } from './number-picker/number-picker.component';
import { DsDatePickerComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
import { MockAdminGuard } from './mocks/mock-admin-guard.service';
import { BrowseByModule } from '../+browse-by/browse-by.module';
import { BrowseByComponent } from './browse-by/browse-by.component';
import { BrowseEntryListElementComponent } from './object-list/browse-entry-list-element/browse-entry-list-element.component';
import { DebounceDirective } from './utils/debounce.directive';
@@ -88,6 +87,7 @@ import { ObjectKeysPipe } from './utils/object-keys-pipe';
import { MomentModule } from 'ngx-moment';
import { ItemSelectComponent } from './object-select/item-select/item-select.component';
import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
import { MenuModule } from './menu/menu.module';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -108,7 +108,8 @@ const MODULES = [
TranslateModule,
NouisliderModule,
MomentModule,
TextMaskModule
TextMaskModule,
MenuModule
];
const PIPES = [
@@ -200,7 +201,6 @@ const DIRECTIVES = [
...COMPONENTS,
...DIRECTIVES,
...ENTRY_COMPONENTS,
...DIRECTIVES
],
providers: [
...PROVIDERS