From 8c5946b72881c38ce43a4b25bda8a38d4f08aac3 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 30 Mar 2020 12:39:28 -0500 Subject: Add button in 3dot menu to copy status link to clipboard --- static/fontello.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'static') diff --git a/static/fontello.json b/static/fontello.json index 5a7086a2..9e56232c 100755 --- a/static/fontello.json +++ b/static/fontello.json @@ -345,6 +345,12 @@ "css": "link", "code": 59427, "src": "fontawesome" + }, + { + "uid": "4aad6bb50b02c18508aae9cbe14e784e", + "css": "share", + "code": 61920, + "src": "fontawesome" } ] -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From bc5005b3ddddeb47d5160a1b79d2edb39e887b4b Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 12 May 2020 13:59:52 -0500 Subject: Permit sidebar alignment with instance configuration option --- src/App.js | 7 ++++++- src/App.vue | 5 ++++- src/modules/instance.js | 1 + static/config.json | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'static') diff --git a/src/App.js b/src/App.js index 61b5eec1..bbb41409 100644 --- a/src/App.js +++ b/src/App.js @@ -99,7 +99,12 @@ export default { }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, isMobileLayout () { return this.$store.state.interface.mobileLayout }, - privateMode () { return this.$store.state.instance.private } + privateMode () { return this.$store.state.instance.private }, + sidebarAlign () { + return { + 'order': this.$store.state.instance.sidebarRight ? 99 : 0 + } + } }, methods: { scrollToTop () { diff --git a/src/App.vue b/src/App.vue index ff62fc51..7018a5a4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -80,7 +80,10 @@ id="content" class="container underlay" > -
+
diff --git a/src/modules/instance.js b/src/modules/instance.js index ffece311..869ceebd 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -36,6 +36,7 @@ const defaultState = { showFeaturesPanel: true, minimalScopesMode: false, greentext: false, + sidebarRight: false, // Nasty stuff pleromaBackend: true, diff --git a/static/config.json b/static/config.json index c8267869..a87ed853 100644 --- a/static/config.json +++ b/static/config.json @@ -19,5 +19,6 @@ "noAttachmentLinks": false, "nsfwCensorImage": "", "showFeaturesPanel": true, - "minimalScopesMode": false + "minimalScopesMode": false, + "sidebarRight": false } -- cgit v1.2.3-70-g09d2 From c2bba3f5addf4c6b851bd2d2e7e53d7e897c0115 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 13 May 2020 14:28:35 -0500 Subject: Remove unused noAttachmentLinks option --- src/boot/after_store.js | 1 - src/modules/instance.js | 1 - static/config.json | 1 - 3 files changed, 3 deletions(-) (limited to 'static') diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 34f6d6e7..abdba305 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { copyInstanceOption('subjectLineBehavior') copyInstanceOption('postContentType') copyInstanceOption('alwaysShowSubjectInput') - copyInstanceOption('noAttachmentLinks') copyInstanceOption('showFeaturesPanel') copyInstanceOption('hideSitename') diff --git a/src/modules/instance.js b/src/modules/instance.js index ffece311..0f430e81 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -32,7 +32,6 @@ const defaultState = { hideSitename: false, nsfwCensorImage: undefined, vapidPublicKey: undefined, - noAttachmentLinks: false, showFeaturesPanel: true, minimalScopesMode: false, greentext: false, diff --git a/static/config.json b/static/config.json index c8267869..0ce85f99 100644 --- a/static/config.json +++ b/static/config.json @@ -16,7 +16,6 @@ "hideUserStats": false, "loginMethod": "password", "webPushNotifications": false, - "noAttachmentLinks": false, "nsfwCensorImage": "", "showFeaturesPanel": true, "minimalScopesMode": false -- cgit v1.2.3-70-g09d2 From 1db2fc3f41207c2af363c2017efb633a60e9a042 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 13 May 2020 14:52:21 -0500 Subject: alpha sort --- static/config.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'static') diff --git a/static/config.json b/static/config.json index c8267869..9aeed8f1 100644 --- a/static/config.json +++ b/static/config.json @@ -1,23 +1,23 @@ { - "theme": "pleroma-dark", + "alwaysShowSubjectInput": true, "background": "/static/aurora_borealis.jpg", - "logo": "/static/logo.png", - "logoMask": true, - "logoMargin": ".1em", - "redirectRootNoLogin": "/main/all", - "redirectRootLogin": "/main/friends", - "showInstanceSpecificPanel": false, "collapseMessageWithSubject": false, - "scopeCopy": true, - "subjectLineBehavior": "email", - "postContentType": "text/plain", - "alwaysShowSubjectInput": true, "hidePostStats": false, "hideUserStats": false, "loginMethod": "password", - "webPushNotifications": false, + "logo": "/static/logo.png", + "logoMargin": ".1em", + "logoMask": true, + "minimalScopesMode": false, "noAttachmentLinks": false, "nsfwCensorImage": "", + "postContentType": "text/plain", + "redirectRootLogin": "/main/friends", + "redirectRootNoLogin": "/main/all", + "scopeCopy": true, "showFeaturesPanel": true, - "minimalScopesMode": false + "showInstanceSpecificPanel": false, + "subjectLineBehavior": "email", + "theme": "pleroma-dark", + "webPushNotifications": false } -- cgit v1.2.3-70-g09d2 From 0ef5965b3bfb6e9f8a305714f60a54b43066473a Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 13 May 2020 14:52:48 -0500 Subject: Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename --- static/config.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'static') diff --git a/static/config.json b/static/config.json index 9aeed8f1..727dde73 100644 --- a/static/config.json +++ b/static/config.json @@ -2,7 +2,12 @@ "alwaysShowSubjectInput": true, "background": "/static/aurora_borealis.jpg", "collapseMessageWithSubject": false, + "disableChat": false, + "greentext": false, + "hideFilteredStatuses": false, + "hideMutedPosts": false, "hidePostStats": false, + "hideSitename": false, "hideUserStats": false, "loginMethod": "password", "logo": "/static/logo.png", -- cgit v1.2.3-70-g09d2