habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-2021.2'

Browse Source 
# Conflicts:
#	authentik/admin/templates/administration/policy/list.html
#	web/src/pages/outposts/OutpostListPage.ts
This commit is contained in:
Jens Langhammer
2021-02-24 10:20:48 +01:00
parent 9049593ff5 e81d3dad3e
commit 5977c09b05
12 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/constants.ts
View File

@ -28,4 +28,4 @@ export const ColorStyles = css`
background-color: var(--pf-global--danger-color--100);
}
`;
export const VERSION = "2021.2.4-stable";
export const VERSION = "2021.2.5-stable";

2
web/src/pages/outposts/OutpostListPage.ts
View File

@ -57,7 +57,7 @@ export class OutpostListPage extends TablePage<Outpost> {
${gettext("Edit")}
</ak-spinner-button>
<div slot="modal"></div>
</ak-modal-button>
</ak-modal-button>&nbsp;
<ak-modal-button href="${Outpost.adminUrl(`${item.pk}/delete/`)}">
<ak-spinner-button slot="trigger" class="pf-m-danger">
${gettext("Delete")}