From d7dabc7c5f92eb8745d0087f98efc510d4cfaddc Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Wed, 3 May 2023 15:08:43 +0300
Subject: [PATCH 1/2] web/admin: add notes for users and groups

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 web/src/admin/groups/GroupViewPage.ts | 14 ++++++++++++++
 web/src/admin/users/UserViewPage.ts   | 16 +++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/web/src/admin/groups/GroupViewPage.ts b/web/src/admin/groups/GroupViewPage.ts
index abbab633673b..e29a178586f6 100644
--- a/web/src/admin/groups/GroupViewPage.ts
+++ b/web/src/admin/groups/GroupViewPage.ts
@@ -134,6 +134,20 @@ export class GroupViewPage extends AKElement {
                             </ak-forms-modal>
                         </div>
                     </div>
+                    <div
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-9-col-on-xl pf-m-9-col-on-2xl"
+                    >
+                        <div class="pf-c-card__title">${t`Notes`}</div>
+                        <div class="pf-c-card__body">
+                            ${Object.hasOwn(this.group?.attributes || {}, "notes")
+                                ? html`${this.group.attributes?.notes}`
+                                : html`
+                                      <p>
+                                          ${t`Edit the notes attribute of this group to add notes here. Markdown is supported.`}
+                                      </p>
+                                  `}
+                        </div>
+                    </div>
                     <div
                         class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-12-col-on-xl pf-m-12-col-on-2xl"
                     >
diff --git a/web/src/admin/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts
index dfd2c5f2d710..4caf3612ad41 100644
--- a/web/src/admin/users/UserViewPage.ts
+++ b/web/src/admin/users/UserViewPage.ts
@@ -280,7 +280,21 @@ export class UserViewPage extends AKElement {
                         </div>
                     </div>
                     <div
-                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-12-col-on-xl pf-m-12-col-on-2xl"
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-3-col-on-xl pf-m-3-col-on-2xl"
+                    >
+                        <div class="pf-c-card__title">${t`Notes`}</div>
+                        <div class="pf-c-card__body">
+                            ${Object.hasOwn(this.user?.attributes || {}, "notes")
+                                ? html`${this.user.attributes?.notes}`
+                                : html`
+                                      <p>
+                                          ${t`Edit the notes attribute of this user to add notes here. Markdown is supported.`}
+                                      </p>
+                                  `}
+                        </div>
+                    </div>
+                    <div
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-9-col-on-xl pf-m-9-col-on-2xl"
                     >
                         <div class="pf-c-card__title">${t`Changelog`}</div>
                         <div class="pf-c-card__body">

From 3ad9ea3bb1265ad271244c02221dfc58e3a77115 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Wed, 3 May 2023 15:11:54 +0300
Subject: [PATCH 2/2] fix unrelated typo

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 web/src/common/ui/config.ts                    | 4 ++--
 website/integrations/services/proftpd/index.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/common/ui/config.ts b/web/src/common/ui/config.ts
index 57f0d4cedf18..1007af1bb7f5 100644
--- a/web/src/common/ui/config.ts
+++ b/web/src/common/ui/config.ts
@@ -44,8 +44,8 @@ export interface UIConfig {
     };
     locale: string;
     defaults: {
-        userPath: string,
-    },
+        userPath: string;
+    };
 }
 
 export class DefaultUIConfig implements UIConfig {
diff --git a/website/integrations/services/proftpd/index.md b/website/integrations/services/proftpd/index.md
index 870793095fb3..9b7e9f9ddf93 100644
--- a/website/integrations/services/proftpd/index.md
+++ b/website/integrations/services/proftpd/index.md
@@ -77,7 +77,7 @@ DefaultRoot /your/ftp/storage/dir
     LDAPBindDN cn=ldapservice,ou=users,dc=ldap,dc=goauthentik,dc=io PASSWORDOFLDAPSERVICE
     # The second parameter is optional
     #  In this case I am restricting access to the group ftpusers
-    #  Instead you could also create bind policys in your created authentik application
+    #  Instead you could also create bind policies in your created authentik application
     LDAPUsers ou=users,dc=ldap,dc=goauthentik,dc=io (&(objectClass=user)(cn=%u)(memberOf=cn=ftpusers,ou=groups,dc=ldap,dc=goauthentik,dc=io))
 
     # In this example, I am forcing the permission of all files to the system user/group 1000