Skip to content

Commit

Permalink
Upstream to ADF:6.5.1 JS-API:7.2.0 (#3514)
Browse files Browse the repository at this point in the history
* upstream to ADF:6.5.0 JS-API:7.2.0

* Fix pipeline for PR

* Fix pipeline for PR

* Fix pipeline for PR

* exclude C286473

---------

Co-authored-by: Tomasz <[email protected]>
  • Loading branch information
dominikiwanekhyland and tomgny authored Nov 15, 2023
1 parent 7a0d21c commit cde4308
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 342 deletions.
6 changes: 3 additions & 3 deletions app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';

import { TRANSLATION_PROVIDER, AppConfigService, DebugAppConfigService, CoreModule, AuthGuard } from '@alfresco/adf-core';
import { TRANSLATION_PROVIDER, AppConfigService, DebugAppConfigService, CoreModule, AuthGuard, AuthModule } from '@alfresco/adf-core';
import { AppService } from '@alfresco/aca-shared';

import { AppExtensionsModule } from './extensions.module';
Expand Down Expand Up @@ -102,7 +101,8 @@ registerLocaleData(localeSv);
ShellModule.withRoutes({
shellChildren: [CONTENT_LAYOUT_ROUTES]
}),
ContentServiceExtensionModule
ContentServiceExtensionModule,
AuthModule.forRoot({ useHash: true })
],
providers: [
{ provide: AppService, useClass: AppService },
Expand Down
3 changes: 2 additions & 1 deletion e2e/playwright/authentication/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"C213097" : "https://alfresco.atlassian.net/browse/ACS-5479"
"C213097" : "https://alfresco.atlassian.net/browse/ACS-5479",
"C286473" : "https://alfresco.atlassian.net/browse/ACS-5996"
}
Loading

0 comments on commit cde4308

Please sign in to comment.