diff --git a/changelog/unreleased/default-extension b/changelog/unreleased/default-extension new file mode 100644 index 00000000000..de2f1243797 --- /dev/null +++ b/changelog/unreleased/default-extension @@ -0,0 +1,6 @@ +Change: Configurable default extension + +We introduced a config option in the config.json file which allows to configure the default extension for ownCloud Web. +Any of the configured extension ids can be chosen as default extension. If none is provided, we fall back to the files extension. + +https://github.com/owncloud/phoenix/pull/4382 diff --git a/changelog/unreleased/extension-loading b/changelog/unreleased/extension-loading new file mode 100644 index 00000000000..2a0c67d6a58 --- /dev/null +++ b/changelog/unreleased/extension-loading @@ -0,0 +1,6 @@ +Bugfix: Unavailable extensions causing route duplication + +There was an error in the extension loading handlers which caused routes to be loaded multiple times when extensions from the config.json were unavailable. +We hardened the extension loading handlers to just skip those extensions. + +https://github.com/owncloud/phoenix/pull/4382 diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue index 4346995f6c6..7a561050fb6 100644 --- a/src/components/Avatar.vue +++ b/src/components/Avatar.vue @@ -62,9 +62,9 @@ export default { } }, computed: { - ...mapGetters(['getToken']), + ...mapGetters(['getToken', 'configuration']), enabled: function() { - return this.$root.config.enableAvatars || true + return this.configuration.enableAvatars || true } }, watch: { @@ -92,7 +92,7 @@ export default { return } const headers = new Headers() - const instance = this.$root.config.server || window.location.origin + const instance = this.configuration.server || window.location.origin const url = instance + '/remote.php/dav/avatars/' + this.userid + '/128.png' headers.append('Authorization', 'Bearer ' + this.getToken) headers.append('X-Requested-With', 'XMLHttpRequest') diff --git a/src/components/Top-Bar.vue b/src/components/Top-Bar.vue index b3af3ea9fc7..6174de4686e 100644 --- a/src/components/Top-Bar.vue +++ b/src/components/Top-Bar.vue @@ -32,7 +32,6 @@