commit 8c18a54

Author: Jan <jackermann@owncloud.com> Date: Thu Jan 26 12:57:46 2023 +0100 Improve admin settings user management graph api usage (#8261) * Init * Start fixing tests * Current state * Update changelog/unreleased/enhancement-admin-settings-users-role-graph-api-usage Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz> * Update changelog/unreleased/enhancement-admin-settings-users-role-graph-api-usage Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz> * React on code review * Split editUser into functions * Don't interpolate user drive due to api improvements * Update changelog item * Finish line * Fix up duplicate code * Fix up * Remove loadTasks index file * Update snapshot Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz> Co-authored-by: Jannik Stehle <jannik.stehle@gmail.com>
owncloud · Jan 26, 2023 · 03bc509 · 03bc509
1 parent a7d524a
commit 03bc509
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 106 deletions.
diff --git a/getting-started.md b/getting-started.md
@@ -48,6 +48,8 @@ substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}
 - `options.disablePreviews` Set this option to `true` to disable previews in all the different file listing views. The only list view that is not affected
   by this is the trash bin, as that doesn't allow showing previews at all.
 - `options.previewFileMimeTypes` Specifies which mimeTypes will be previewed in the ui. For example to only preview jpg and text files set this option to `["image/jpeg", "text/plain"]`.
+- `options.accountEditLink` This accepts an object with the following optional fields to have a link on the account page:
+  - `options.accountEditLink.href` Set a different target URL for the edit link. Make sure to prepend it with `http(s)://`.
 - `options.disableFeedbackLink` Set this option to `true` to disable the feedback link in the topbar. Keeping it enabled (value `false` or absence of the option)
   allows ownCloud to get feedback from your user base through a dedicated survey website.
 - `options.feedbackLink` This accepts an object with the following optional fields to customize the feedback link in the topbar:

diff --git a/testing/testing.md b/testing/testing.md
@@ -88,13 +88,13 @@ and make sure there are no conflicting ports and everything runs smoothly. You c
 Depending on the backend you want to run the tests on, you can either run
 
 ```shell
-$ pnpm test:e2e:cucumber tests/e2e/cucumber/**/*[!.ocis].feature
+$ pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.ocis].feature'
 ```
 
 for an **ownCloud 10** backend (filenames including `.ocis` are excluded) or
 
 ```shell
-$ OCIS=true pnpm test:e2e:cucumber tests/e2e/cucumber/**/*[!.oc10].feature
+$ OCIS=true pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.oc10].feature'
 ```
 
 for an **oCIS** backend (filenames including `.oc10` are excluded).

diff --git a/theming/_index.md b/theming/_index.md
@@ -35,24 +35,32 @@ You can use the snippet below as a base for writing your own theme by replacing
 
 ```json
 {
-  "default": {
-    "general": {
-      "name": "ownCloud",
-      "slogan": "ownCloud – A safe home for all your data"
-    },
-    "logo": {
-      "topbar": "https://externalurl.example.com/url/for/remote/theme/assets/logo.svg",
-      "favicon": "https://externalurl.example.com/url/for/remote/theme/assets/favicon.jpg",
-      "login": "relative/path/for/local/theme/logo.svg"
-    },
-    "loginPage": {
-      "autoRedirect": true,
-      "backgroundImg": "relative/path/for/local/theme/background.jpg"
-    },
-    "designTokens": {}
+  "common": {
+    "name": "ownCloud",
+    "slogan": "ownCloud – A safe home for all your data",
+    "logo": "themes/owncloud/assets/logo.svg"
   },
-  "alternative": {},
-  "dark": {}
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {
+        "name": "ownCloud",
+        "slogan": "ownCloud – A safe home for all your data"
+      },
+      "logo": {
+        "topbar": "https://externalurl.example.com/url/for/remote/theme/assets/logo.svg",
+        "favicon": "https://externalurl.example.com/url/for/remote/theme/assets/favicon.jpg",
+        "login": "relative/path/for/local/theme/logo.svg"
+      },
+      "loginPage": {
+        "autoRedirect": true,
+        "backgroundImg": "relative/path/for/local/theme/background.jpg"
+      },
+      "designTokens": {}
+    },
+    "alternative": {},
+    "dark": {}
+  }
 }
 ```
 
@@ -81,14 +89,18 @@ In general, the theme loader looks for a `designTokens` key inside your theme co
 
 ```json
 {
-  "default": {
-    "general": {},
-    "designTokens": {
-      "breakpoints": {},
-      "colorPalette": {},
-      "fontSizes": {},
-      "sizes": {},
-      "spacing": {}
+  "common": {},
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {},
+      "designTokens": {
+        "breakpoints": {},
+        "colorPalette": {},
+        "fontSizes": {},
+        "sizes": {},
+        "spacing": {}
+      }
     }
   }
 }
@@ -232,88 +244,96 @@ An empty template for your custom theme is provided below, and you can use the i
 
 ```json
 {
-  "default": {
-    "general": {
-      "name": "",
-      "slogan": ""
-    },
-    "logo": {
-      "topbar": "",
-      "favicon": "",
-      "login": "",
-      "notFound": ""
-    },
-    "loginPage": {
-      "autoRedirect": true,
-      "backgroundImg": ""
-    },
-    "designTokens": {
-      "breakpoints": {
-        "xsmall-max": "",
-        "small-default": "",
-        "small-max": "",
-        "medium-default": "",
-        "medium-max": "",
-        "large-default": "",
-        "large-max": "",
-        "xlarge": ""
-      },
-      "colorPalette": {
-        "background-accentuate": "",
-        "background-default": "",
-        "background-highlight": "",
-        "background-muted": "",
-        "border": "",
-        "input-bg": "",
-        "input-border": "",
-        "input-text-default": "",
-        "input-text-muted": "",
-        "swatch-brand-default": "",
-        "swatch-brand-hover": "",
-        "swatch-danger-default": "",
-        "swatch-danger-hover": "",
-        "swatch-danger-muted": "",
-        "swatch-inverse-default": "",
-        "swatch-inverse-hover": "",
-        "swatch-inverse-muted": "",
-        "swatch-passive-default": "",
-        "swatch-passive-hover": "",
-        "swatch-passive-muted": "",
-        "swatch-primary-default": "",
-        "swatch-primary-hover": "",
-        "swatch-primary-muted": "",
-        "swatch-primary-gradient": "",
-        "swatch-success-default": "",
-        "swatch-success-hover": "",
-        "swatch-success-muted": "",
-        "swatch-warning-default": "",
-        "swatch-warning-hover": "",
-        "swatch-warning-muted": "",
-        "text-default": "",
-        "text-inverse": "",
-        "text-muted": ""
+   "common": {
+    "name": "",
+    "slogan": "",
+    "logo": ""
+  },
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {
+        "name": "",
+        "slogan": ""
       },
-      "fontSizes": {
-        "default": "",
-        "large": "",
-        "medium": ""
+      "logo": {
+        "topbar": "",
+        "favicon": "",
+        "login": "",
+        "notFound": ""
       },
-      "sizes": {
-        "form-check-default": "",
-        "height-small": "",
-        "height-table-row": "",
-        "icon-default": "",
-        "max-height-logo": "",
-        "max-width-logo": "",
-        "width-medium": ""
+      "loginPage": {
+        "autoRedirect": true,
+        "backgroundImg": ""
       },
-      "spacing": {
-        "xsmall": "",
-        "small": "",
-        "medium": "",
-        "large": "",
-        "xlarge": "",
-        "xxlarge": ""
+      "designTokens": {
+        "breakpoints": {
+          "xsmall-max": "",
+          "small-default": "",
+          "small-max": "",
+          "medium-default": "",
+          "medium-max": "",
+          "large-default": "",
+          "large-max": "",
+          "xlarge": ""
+        },
+        "colorPalette": {
+          "background-accentuate": "",
+          "background-default": "",
+          "background-highlight": "",
+          "background-muted": "",
+          "border": "",
+          "input-bg": "",
+          "input-border": "",
+          "input-text-default": "",
+          "input-text-muted": "",
+          "swatch-brand-default": "",
+          "swatch-brand-hover": "",
+          "swatch-danger-default": "",
+          "swatch-danger-hover": "",
+          "swatch-danger-muted": "",
+          "swatch-inverse-default": "",
+          "swatch-inverse-hover": "",
+          "swatch-inverse-muted": "",
+          "swatch-passive-default": "",
+          "swatch-passive-hover": "",
+          "swatch-passive-muted": "",
+          "swatch-primary-default": "",
+          "swatch-primary-hover": "",
+          "swatch-primary-muted": "",
+          "swatch-primary-gradient": "",
+          "swatch-success-default": "",
+          "swatch-success-hover": "",
+          "swatch-success-muted": "",
+          "swatch-warning-default": "",
+          "swatch-warning-hover": "",
+          "swatch-warning-muted": "",
+          "text-default": "",
+          "text-inverse": "",
+          "text-muted": ""
+        },
+        "fontSizes": {
+          "default": "",
+          "large": "",
+          "medium": ""
+        },
+        "sizes": {
+          "form-check-default": "",
+          "height-small": "",
+          "height-table-row": "",
+          "icon-default": "",
+          "max-height-logo": "",
+          "max-width-logo": "",
+          "width-medium": ""
+        },
+        "spacing": {
+          "xsmall": "",
+          "small": "",
+          "medium": "",
+          "large": "",
+          "xlarge": "",
+          "xxlarge": ""
+        }
       }
     }
   }