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

Merge branch 'master' into entities-master

Browse Source 
Conflicts:
	src/app/core/cache/models/normalized-object-factory.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2018-10-10 14:28:18 +02:00
parent 796b9b60f1 1a20cec41c
commit 3a23b703d5
74 changed files with 1982 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,9 @@ 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';
import { ClickOutsideDirective } from './utils/click-outside.directive';
import { EmphasizePipe } from './utils/emphasize.pipe';
@@ -163,7 +166,8 @@ const COMPONENTS = [
TruncatablePartComponent,
InputSuggestionsComponent,
EntitySearchResultComponent,
EntityTypeSwitcherComponent
EntityTypeSwitcherComponent,
BrowseByComponent
];
const ENTRY_COMPONENTS = [
@@ -182,7 +186,8 @@ const ENTRY_COMPONENTS = [
ProjectListElementComponent,
JournalListElementComponent,
JournalVolumeListElementComponent,
JournalIssueListElementComponent
JournalIssueListElementComponent,
BrowseEntryListElementComponent
];
const PROVIDERS = [