Merge branch 'master' into 7432-filetype-filterchip

.drone.star

@@ -1312,12 +1312,14 @@ def checkForExistingOcisCache(ctx):
     return [
         {
             "name": "check-for-existing-cache",
-            "image": OC_UBUNTU,
+            "image": MINIO_MC,
             "environment": minio_mc_environment,
             "commands": [
                 "curl -o .drone.env %s/.drone.env" % web_repo_path,
                 "curl -o check-oCIS-cache.sh %s/tests/drone/check-oCIS-cache.sh" % web_repo_path,
                 ". ./.drone.env",
+                "mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY",
+                "mc ls --recursive s3/$CACHE_BUCKET/ocis-build",
                 "bash check-oCIS-cache.sh",
             ],
         },

CHANGELOG.md

@@ -26,7 +26,10 @@ Summary
 * Bugfix - Duplicated file search request: [#9861](https://github.com/owncloud/web/pull/9861)
 * Bugfix - Tags are no longer editable for a locked file: [#9873](https://github.com/owncloud/web/pull/9873)
 * Bugfix - Prevent rendering of old/wrong set of resources in search list: [#9881](https://github.com/owncloud/web/pull/9881)
+* Bugfix - Private link resolving via share jail ID: [#9913](https://github.com/owncloud/web/pull/9913)
+* Bugfix - Keep both folders conflict in same-named folders: [#9915](https://github.com/owncloud/web/pull/9915)
 * Enhancement - Make login url configurable: [#7317](https://github.com/owncloud/ocis/pull/7317)
+* Enhancement - Permission checks for shares and favorites: [#7497](https://github.com/owncloud/ocis/issues/7497)
 * Enhancement - Scroll to newly created folder: [#7600](https://github.com/owncloud/web/issues/7600)
 * Enhancement - Application unification: [#9302](https://github.com/owncloud/web/issues/9302)
 * Enhancement - Show local loading spinner in sharing button: [#9423](https://github.com/owncloud/web/pull/9423)
@@ -63,6 +66,8 @@ Summary
 * Enhancement - Location picker in embed mode: [#9863](https://github.com/owncloud/web/pull/9863)
 * Enhancement - Search tags filter chips style aligned: [#9864](https://github.com/owncloud/web/pull/9864)
 * Enhancement - Enable dark theme on importer: [#9884](https://github.com/owncloud/web/pull/9884)
+* Enhancement - Create shortcuts: [#9890](https://github.com/owncloud/web/pull/9890)
+* Enhancement - Manage tags in details panel: [#9905](https://github.com/owncloud/web/pull/9905)
 * Enhancement - Reorganize "New" menu: [#9906](https://github.com/owncloud/web/pull/9906)
 * Enhancement - Provide vendor neutral file icons: [#9911](https://github.com/owncloud/web/pull/9911)
 
@@ -208,6 +213,21 @@ Details
    https://github.com/owncloud/web/issues/9790
    https://github.com/owncloud/web/pull/9881
 
+* Bugfix - Private link resolving via share jail ID: [#9913](https://github.com/owncloud/web/pull/9913)
+
+   Resolving private links via the share jail ID has been fixed.
+
+   https://github.com/owncloud/web/issues/9867
+   https://github.com/owncloud/web/pull/9913
+
+* Bugfix - Keep both folders conflict in same-named folders: [#9915](https://github.com/owncloud/web/pull/9915)
+
+   Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the
+   same name
+
+   https://github.com/owncloud/web/issues/9158
+   https://github.com/owncloud/web/pull/9915
+
 * Enhancement - Make login url configurable: [#7317](https://github.com/owncloud/ocis/pull/7317)
 
    We've added a new configuration option loginUrl to web, this is helpful if you use an external
@@ -216,6 +236,13 @@ Details
    https://github.com/owncloud/web/issues/9707
    https://github.com/owncloud/ocis/pull/7317
 
+* Enhancement - Permission checks for shares and favorites: [#7497](https://github.com/owncloud/ocis/issues/7497)
+
+   Permission checks for creating shares and favorites have been added.
+
+   https://github.com/owncloud/ocis/issues/7497
+   https://github.com/owncloud/web/pull/9810
+
 * Enhancement - Scroll to newly created folder: [#7600](https://github.com/owncloud/web/issues/7600)
 
    After creating a new folder that gets sorted into the currently displayed resources but
@@ -415,6 +442,7 @@ Details
    session is started, e.g. by opening a new tab.
 
    https://github.com/owncloud/web/pull/9696
+   https://github.com/owncloud/web/pull/9872
 
 * Enhancement - Unify sharing expiration date menu items: [#9706](https://github.com/owncloud/web/pull/9706)
 
@@ -576,6 +604,28 @@ Details
    https://github.com/owncloud/web/issues/9452
    https://github.com/owncloud/web/pull/9884
 
+* Enhancement - Create shortcuts: [#9890](https://github.com/owncloud/web/pull/9890)
+
+   We've added a new functionality to add to shortcuts to web, those can be created via the "+ New"
+   context menu. Users can enter URLs or pick a file via the drop down menu and create a '.url' file.
+
+   '.url' files can be opened via web or downloaded and opened on the desktop.
+
+   https://github.com/owncloud/web/issues/9796
+   https://github.com/owncloud/web/issues/9887
+   https://github.com/owncloud/web/issues/9850
+   https://github.com/owncloud/web/pull/9890
+   https://github.com/owncloud/web/pull/9908
+
+* Enhancement - Manage tags in details panel: [#9905](https://github.com/owncloud/web/pull/9905)
+
+   We've enhanced the details panel, now tags are viewable and manageable there. That change
+   makes it easier for the user to manage tags, as they don't need to click an additional context
+   menu action.
+
+   https://github.com/owncloud/web/issues/9783
+   https://github.com/owncloud/web/pull/9905
+
 * Enhancement - Reorganize "New" menu: [#9906](https://github.com/owncloud/web/pull/9906)
 
    We've reorganized the "new" menu and added optional file extension indicators that will show

changelog/unreleased/bugfix-keep-both-conflict

@@ -0,0 +1,6 @@
+Bugfix: Keep both folders conflict in same-named folders
+
+Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the same name
+
+https://github.com/owncloud/web/pull/9915
+https://github.com/owncloud/web/issues/9158

changelog/unreleased/bugfix-resolving-via-share-jail-id

@@ -0,0 +1,6 @@
+Bugfix: Private link resolving via share jail ID
+
+Resolving private links via the share jail ID has been fixed.
+
+https://github.com/owncloud/web/pull/9913
+https://github.com/owncloud/web/issues/9867

changelog/unreleased/enhancement-app-banner

@@ -3,3 +3,5 @@ Enhancement: Added app banner for mobile devices
 We've added an app banner at the top of the web view for mobile devices asking the user whether they want to continue working in the app. By dismissing it, it will not show again until a new session is started, e.g. by opening a new tab.
 
 https://github.com/owncloud/web/pull/9696
+https://github.com/owncloud/web/pull/9872
+

changelog/unreleased/enhancement-create-shortcuts

@@ -0,0 +1,12 @@
+Enhancement: Create shortcuts
+
+We've added a new functionality to add to shortcuts to web, those can be created via the "+ New" context menu.
+Users can enter URLs or pick a file via the drop down menu and create a '.url' file.
+
+'.url' files can be opened via web or downloaded and opened on the desktop.
+
+https://github.com/owncloud/web/pull/9890
+https://github.com/owncloud/web/pull/9908
+https://github.com/owncloud/web/issues/9796
+https://github.com/owncloud/web/issues/9887
+https://github.com/owncloud/web/issues/9850

changelog/unreleased/enhancement-manage-tags-in-details-panel

@@ -0,0 +1,8 @@
+Enhancement: Manage tags in details panel
+
+We've enhanced the details panel, now tags are viewable and manageable there.
+That change makes it easier for the user to manage tags, as they don't need to click an additional
+context menu action.
+
+https://github.com/owncloud/web/pull/9905
+https://github.com/owncloud/web/issues/9783

changelog/unreleased/enhancement-share-and-favorite-permission-checks

@@ -0,0 +1,6 @@
+Enhancement: Permission checks for shares and favorites
+
+Permission checks for creating shares and favorites have been added.
+
+https://github.com/owncloud/ocis/issues/7497
+https://github.com/owncloud/web/pull/9810

docs/getting-started.md

@@ -73,6 +73,7 @@ Depending on the backend you are using, there are sample config files provided i
 - `options.upload.xhr.timeout` Specifies the timeout for XHR uploads in milliseconds.
 - `options.editor.autosaveEnabled` Specifies if the autosave for the editor apps is enabled.
 - `options.editor.autosaveInterval` Specifies the time interval for the autosave of editor apps in seconds.
+- `options.editor.openAsPreview` Specifies if non-personal files i.e. files in shares, spaces or public links are being opened in read only mode so the user needs to manually switch to edit mode. Can be set to `true`, `false` or an array of web app/editor names.
 - `options.contextHelpersReadMore` Specifies whether the "Read more" link should be displayed or not.
 - `options.openLinksWithDefaultApp` Specifies whether single file link shares should be opened with default app or not.
 - `options.tokenStorageLocal` Specifies whether the access token will be stored in the local storage when set to `true` or in the session storage when set to `false`. If stored in the local storage, login state will be persisted across multiple browser tabs, means no additional logins are required. Defaults to `true`.

docs/theming/_index.md

@@ -259,6 +259,26 @@ Spacing variables get prepended with `--oc-space-`, so e.g. _"xlarge"_ creates t
 }
 ```
 
+### App Banner
+To configure the app banner shown on mobile devices, you can use the following settings:
+
+```json 
+{
+  "appBanner": {
+    "title": "ownCloud",
+    "publisher": "ownCloud GmbH",
+    "additionalInformation": "",
+    "ctaText": "OPEN",
+    "icon": "themes/owncloud/assets/owncloud-app-icon.png",
+    "appScheme": "owncloud"
+  }
+}
+```
+
+`title` is usually your app's name as shown in the App Store or Google Play. `publisher` is the app developer's name.
+`additionalInformation` can be used to specify pricing information, such as "FREE" or a catchphrase like "Don't miss out on our awesome app!".
+`ctaText` refers to the text in the call to action button on the right side. The `icon` directive may be used to specify your own app icon. `appScheme` is the first part of the URL that is used to tell the mobile OS which app to open, so using `ownCloud` will generate links such as `owncloud://yourdomain.com/f/2b61b822...`.
+
 ## Example theme
 
 An empty template for your custom theme is provided below, and you can use the instructions above to set it up according to your needs. Please note that since changing themes at runtime is not yet supported it only consists of a `default` theme.
@@ -277,6 +297,14 @@ An empty template for your custom theme is provided below, and you can use the i
         "name": "",
         "slogan": ""
       },
+      "appBanner": {
+        "title": "",
+        "publisher": "",
+        "additionalInformation": "",
+        "ctaText": "",
+        "icon": "",
+        "appScheme": ""
+      },
       "logo": {
         "topbar": "",
         "favicon": "",

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-alpha.5",
+  "version": "8.0.0-alpha.7",
   "private": true,
   "homepage": "https://github.com/owncloud/web",
   "license": "AGPL-3.0",