aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/core/core.module.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-08-25 11:42:30 +0200
committerChocobozzz <me@florianbigard.com>2021-08-25 11:42:30 +0200
commitfdec51e3846d50e3375612a6820ed3ab0b5fcd25 (patch)
tree17283e85a6794c9e8fe3f5d4478a406d8d188425 /client/src/app/core/core.module.ts
parent59c8902a57991be29f0aacac1642389fb770c6ed (diff)
parentdd24f1bb0a4b252e5342b251ba36853364da7b8e (diff)
downloadPeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.gz
PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.zst
PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.zip
Merge branch 'feature/video-filters' into develop
Diffstat (limited to 'client/src/app/core/core.module.ts')
-rw-r--r--client/src/app/core/core.module.ts14
1 files changed, 13 insertions, 1 deletions
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 3e2056481..04be0671c 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -14,7 +14,17 @@ import { throwIfAlreadyLoaded } from './module-import-guard'
14import { Notifier } from './notification' 14import { Notifier } from './notification'
15import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer' 15import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer'
16import { RestExtractor, RestService } from './rest' 16import { RestExtractor, RestService } from './rest'
17import { HomepageRedirectComponent, LoginGuard, MetaGuard, MetaService, RedirectService, UnloggedGuard, UserRightGuard } from './routing' 17import {
18 HomepageRedirectComponent,
19 LoginGuard,
20 MetaGuard,
21 MetaService,
22 PeerTubeRouterService,
23 RedirectService,
24 ScrollService,
25 UnloggedGuard,
26 UserRightGuard
27} from './routing'
18import { CanDeactivateGuard } from './routing/can-deactivate-guard.service' 28import { CanDeactivateGuard } from './routing/can-deactivate-guard.service'
19import { ServerConfigResolver } from './routing/server-config-resolver.service' 29import { ServerConfigResolver } from './routing/server-config-resolver.service'
20import { ScopedTokensService } from './scoped-tokens' 30import { ScopedTokensService } from './scoped-tokens'
@@ -80,6 +90,8 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
80 PeerTubeSocket, 90 PeerTubeSocket,
81 ServerConfigResolver, 91 ServerConfigResolver,
82 CanDeactivateGuard, 92 CanDeactivateGuard,
93 PeerTubeRouterService,
94 ScrollService,
83 95
84 MetaService, 96 MetaService,
85 MetaGuard 97 MetaGuard