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

Merge branch 'master' into Browse-By-Date

Browse Source 
Conflicts:
	config/environment.default.js
	src/config/global-config.interface.ts
This commit is contained in:
Kristof De Langhe
2019-03-04 11:15:49 +01:00
parent d370e789c9 cebea75605
commit d5fe5c432b
123 changed files with 3984 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,9 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre
import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
import { LangSwitchComponent } from './lang-switch/lang-switch.component';
import { ObjectValuesPipe } from './utils/object-values-pipe';
import { InListValidator } from './utils/in-list-validator.directive';
import { AutoFocusDirective } from './utils/auto-focus.directive';
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
@@ -127,6 +130,7 @@ const PIPES = [
EmphasizePipe,
CapitalizePipe,
ObjectKeysPipe,
ObjectValuesPipe,
ConsolePipe
];
@@ -201,7 +205,9 @@ const DIRECTIVES = [
VarDirective,
DragClickDirective,
DebounceDirective,
ClickOutsideDirective
ClickOutsideDirective,
InListValidator,
AutoFocusDirective
];
@NgModule({