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

Merge remote-tracking branch 'remotes/origin/master' into authentication

Browse Source 
# Conflicts:
#	package.json
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2018-03-08 10:18:33 +01:00
parent 1726c8afdb 605c3524c8
commit beb5e97158
69 changed files with 2180 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@ import { NgxPaginationModule } from 'ngx-pagination';
import { EnumKeysPipe } from './utils/enum-keys-pipe';
import { FileSizePipe } from './utils/file-size-pipe';
import { SafeUrlPipe } from './utils/safe-url-pipe';
import { TruncatePipe } from './utils/truncate.pipe';
import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
@@ -44,6 +43,11 @@ import { VarDirective } from './utils/var.directive';
import { LogInComponent } from './log-in/log-in.component';
import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
import { LogOutComponent } from './log-out/log-out.component';
import { DragClickDirective } from './utils/drag-click.directive';
import { TruncatePipe } from './utils/truncate.pipe';
import { TruncatableComponent } from './truncatable/truncatable.component';
import { TruncatableService } from './truncatable/truncatable.service';
import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -85,7 +89,9 @@ const COMPONENTS = [
ThumbnailComponent,
GridThumbnailComponent,
WrapperListElementComponent,
ViewModeSwitchComponent
ViewModeSwitchComponent,
TruncatableComponent,
TruncatablePartComponent,
];
const ENTRY_COMPONENTS = [
@@ -100,8 +106,13 @@ const ENTRY_COMPONENTS = [
SearchResultGridElementComponent
];
const PROVIDERS = [
TruncatableService
];
const DIRECTIVES = [
VarDirective
VarDirective,
DragClickDirective
];
@NgModule({
@@ -115,6 +126,9 @@ const DIRECTIVES = [
...ENTRY_COMPONENTS,
...DIRECTIVES
],
providers: [
...PROVIDERS
],
exports: [
...MODULES,
...PIPES,