From 52fe01e4d8c6b9c783f8606ac1ece6a66371508a Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Mon, 3 Sep 2018 14:43:10 +0900 Subject: mock features panel --- src/App.js | 3 ++- src/App.vue | 1 + src/components/features_panel/features_panel.js | 6 ++++++ src/components/features_panel/features_panel.vue | 26 ++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/components/features_panel/features_panel.js create mode 100644 src/components/features_panel/features_panel.vue (limited to 'src') diff --git a/src/App.js b/src/App.js index c455c18c..9d7ecea0 100644 --- a/src/App.js +++ b/src/App.js @@ -2,8 +2,9 @@ import UserPanel from './components/user_panel/user_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue' import Notifications from './components/notifications/notifications.vue' import UserFinder from './components/user_finder/user_finder.vue' -import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' +import FeaturesPanel from './components/features_panel/features_panel.vue' import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' +import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' import ChatPanel from './components/chat_panel/chat_panel.vue' export default { diff --git a/src/App.vue b/src/App.vue index fc446c57..8480d1b6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@
+ diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js new file mode 100644 index 00000000..19018fb4 --- /dev/null +++ b/src/components/features_panel/features_panel.js @@ -0,0 +1,6 @@ +const FeaturesPanel = { + computed: { + } +} + +export default FeaturesPanel diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue new file mode 100644 index 00000000..bcb700ed --- /dev/null +++ b/src/components/features_panel/features_panel.vue @@ -0,0 +1,26 @@ + + + + + -- cgit v1.2.3-70-g09d2 From 07ef43c7b5efb875eccdbdb328a2fd9b50c99c53 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Mon, 3 Sep 2018 14:55:40 +0900 Subject: debug --- src/App.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/App.js b/src/App.js index 9d7ecea0..bdd97b85 100644 --- a/src/App.js +++ b/src/App.js @@ -14,8 +14,9 @@ export default { NavPanel, Notifications, UserFinder, - WhoToFollowPanel, + FeaturesPanel, InstanceSpecificPanel, + WhoToFollowPanel, ChatPanel }, data: () => ({ -- cgit v1.2.3-70-g09d2 From 049e2397b156534add9472d3c16cf92ca5a88326 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Mon, 3 Sep 2018 15:23:09 +0900 Subject: update --- src/components/features_panel/features_panel.js | 5 +++++ src/components/features_panel/features_panel.vue | 11 +++++------ src/main.js | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js index 19018fb4..75a671f2 100644 --- a/src/components/features_panel/features_panel.js +++ b/src/components/features_panel/features_panel.js @@ -1,5 +1,10 @@ const FeaturesPanel = { computed: { + mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable }, + whoToFollow: function () { return this.$store.state.config.suggestionsEnabled }, + scopeOptions: function () { return this.$store.state.config.scopeOptionsEnabled }, + formattingOptions: function () { return this.$store.state.config.formattingOptionsEnabled }, + textlimit: function () { return this.$store.state.config.textlimit } } } diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index bcb700ed..92fdb1ff 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -8,12 +8,11 @@
diff --git a/src/main.js b/src/main.js index debd8703..64b223aa 100644 --- a/src/main.js +++ b/src/main.js @@ -225,4 +225,6 @@ window.fetch('/nodeinfo/2.0.json') const suggestions = data.metadata.suggestions store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web }) + + store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy }) }) -- cgit v1.2.3-70-g09d2 From 38b683b30cd8ffd2fc4ab444f1a4690dc1ed3808 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Mon, 3 Sep 2018 15:57:22 +0900 Subject: update --- src/App.js | 4 ++-- src/App.vue | 2 +- src/components/features_panel/features_panel.vue | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/App.js b/src/App.js index bdd97b85..be6548f3 100644 --- a/src/App.js +++ b/src/App.js @@ -2,8 +2,8 @@ import UserPanel from './components/user_panel/user_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue' import Notifications from './components/notifications/notifications.vue' import UserFinder from './components/user_finder/user_finder.vue' -import FeaturesPanel from './components/features_panel/features_panel.vue' import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' +import FeaturesPanel from './components/features_panel/features_panel.vue' import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' import ChatPanel from './components/chat_panel/chat_panel.vue' @@ -14,8 +14,8 @@ export default { NavPanel, Notifications, UserFinder, - FeaturesPanel, InstanceSpecificPanel, + FeaturesPanel, WhoToFollowPanel, ChatPanel }, diff --git a/src/App.vue b/src/App.vue index 8480d1b6..bfe1f760 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,8 +27,8 @@
- +
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index 92fdb1ff..5ec4d255 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -6,13 +6,13 @@ Features -
+
  • Media proxy
  • Who to follow
  • Scope options
  • Formatting options
    • -
  • Text limit={{textlimit}}
    • +
  • Text limit = {{textlimit}}
@@ -22,4 +22,7 @@ -- cgit v1.2.3-70-g09d2 From fa477dd41f78e17bb844342aa770ac8854fe3310 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Mon, 3 Sep 2018 16:02:06 +0900 Subject: show features panel only if not login --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/App.vue b/src/App.vue index bfe1f760..059460f9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,7 +28,7 @@ - + -- cgit v1.2.3-70-g09d2 From 36101abc224e80672b47090680db4bbe965e17f3 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 30 Aug 2018 20:30:04 +0300 Subject: Simplified image sensitivity label --- src/components/post_status_form/post_status_form.vue | 3 +-- src/i18n/messages.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 559ad016..42e9c65c 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -90,8 +90,7 @@
- - +
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 42e7e9d4..8a902127 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -393,8 +393,7 @@ const en = { account_not_locked_warning: 'Your account is not {0}. Anyone can follow you to view your follower-only posts.', account_not_locked_warning_link: 'locked', direct_warning: 'This post will only be visible to all the mentioned users.', - attachments_sensitive: 'Attachments marked sensitive', - attachments_not_sensitive: 'Attachments not marked sensitive', + attachments_sensitive: 'Mark attachments as sensitive', scope: { public: 'Public - Post to public timelines', unlisted: 'Unlisted - Do not post to public timelines', -- cgit v1.2.3-70-g09d2 From a6047e0ad5820e08308d3c7d5f54c14ba57fca5e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:12:18 +0300 Subject: Kinda went back to using align-items: stretch. Fixed error message floating. --- src/App.scss | 23 ++++++++++++++++++++--- src/components/notifications/notifications.scss | 4 ---- src/components/timeline/timeline.vue | 12 +++--------- 3 files changed, 23 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/App.scss b/src/App.scss index dd43c5ca..6ae4a1bb 100644 --- a/src/App.scss +++ b/src/App.scss @@ -325,18 +325,35 @@ main-router { background-size: cover; padding: .6em .6em; text-align: left; - font-size: 1.3em; - line-height: 24px; + line-height: 28px; background-color: $fallback--btn; background-color: var(--btn, $fallback--btn); align-items: baseline; .title { flex: 1 0 auto; + font-size: 1.3em; + } + + .alert { + white-space: nowrap; + text-overflow: ellipsis; + overflow-x: hidden; } button { - height: 100%; + flex-shrink: 0; + } + + button, .alert { + // height: 100%; + line-height: 21px; + min-height: 0; + box-sizing: border-box; + margin: 0; + margin-left: .25em; + min-width: 1px; + align-self: stretch; } } diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 4dbceede..a137ccd5 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -22,10 +22,6 @@ } .loadmore-error { - min-width: 6em; - text-align: center; - padding: 0 0.25em 0 0.25em; - margin: 0; color: $fallback--fg; color: var(--fg, $fallback--fg); } diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index e42c0c4b..2dd4376a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,12 +4,12 @@
{{title}}
-
{{$t('timeline.error_fetching')}}
+
{{$t('timeline.up_to_date')}}
@@ -58,7 +58,6 @@ .timeline { .loadmore-text { - font-size: 14px; opacity: 0.8; background-color: transparent; color: $fallback--faint; @@ -66,11 +65,6 @@ } .loadmore-error { - font-size: 14px; - min-width: 6em; - text-align: center; - padding: 0 0.25em 0 0.25em; - margin: 0; color: $fallback--fg; color: var(--fg, $fallback--fg); } -- cgit v1.2.3-70-g09d2 From 08b044c365527492b1f6d20f2f5a2acb125799b4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:18:59 +0300 Subject: Fixed non-masked image looking weird in chrome. --- src/App.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/App.scss b/src/App.scss index 6ae4a1bb..056a235e 100644 --- a/src/App.scss +++ b/src/App.scss @@ -248,6 +248,7 @@ nav { justify-content: center; flex: 0 0 auto; z-index: -1; + .mask { mask-repeat: no-repeat; mask-position: center; @@ -260,7 +261,10 @@ nav { left: 0; right: 0; } + img { + height: 100%; + object-fit: contain; display: block; flex: 0; } -- cgit v1.2.3-70-g09d2 From d4f9d21857ae1dffce0d4627e536038138e015a5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:23:53 +0300 Subject: Fix last place with usercard having wrong width --- src/components/user_panel/user_panel.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 3d4f873d..2d5cb500 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -14,8 +14,10 @@ -- cgit v1.2.3-70-g09d2 From 6e64324d37e5b89050f965c6912dabb743cad306 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:40:45 +0300 Subject: Fixed collapseMessageWithSubjectLocal always using instance-provided config. --- src/components/settings/settings.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index de12894b..8ef84b2a 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -6,21 +6,25 @@ import { filter, trim } from 'lodash' const settings = { data () { + const config = this.$store.state.config + return { - hideAttachmentsLocal: this.$store.state.config.hideAttachments, - hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, - hideNsfwLocal: this.$store.state.config.hideNsfw, - notificationVisibilityLocal: this.$store.state.config.notificationVisibility, - replyVisibilityLocal: this.$store.state.config.replyVisibility, - loopVideoLocal: this.$store.state.config.loopVideo, - loopVideoSilentOnlyLocal: this.$store.state.config.loopVideoSilentOnly, - muteWordsString: this.$store.state.config.muteWords.join('\n'), - autoLoadLocal: this.$store.state.config.autoLoad, - streamingLocal: this.$store.state.config.streaming, - pauseOnUnfocusedLocal: this.$store.state.config.pauseOnUnfocused, - hoverPreviewLocal: this.$store.state.config.hoverPreview, - collapseMessageWithSubjectLocal: this.$store.state.config.collapseMessageWithSubject, - stopGifs: this.$store.state.config.stopGifs, + hideAttachmentsLocal: config.hideAttachments, + hideAttachmentsInConvLocal: config.hideAttachmentsInConv, + hideNsfwLocal: config.hideNsfw, + notificationVisibilityLocal: config.notificationVisibility, + replyVisibilityLocal: config.replyVisibility, + loopVideoLocal: config.loopVideo, + loopVideoSilentOnlyLocal: config.loopVideoSilentOnly, + muteWordsString: config.muteWords.join('\n'), + autoLoadLocal: config.autoLoad, + streamingLocal: config.streaming, + pauseOnUnfocusedLocal: config.pauseOnUnfocused, + hoverPreviewLocal: config.hoverPreview, + collapseMessageWithSubjectLocal: typeof config.collapseMessageWithSubject === 'undefined' + ? config.defaultCollapseMessageWithSubject + : config.collapseMessageWithSubject, + stopGifs: config.stopGifs, loopSilentAvailable: // Firefox Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') || -- cgit v1.2.3-70-g09d2 From f9eb9e0b70a419bd293d6a334802c5af97a22d76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:49:46 +0300 Subject: small fix for non-square gif avatars --- src/components/still-image/still-image.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index e23f8bc1..1dcb7ce6 100644 --- a/src/components/still-image/still-image.vue +++ b/src/components/still-image/still-image.vue @@ -23,6 +23,7 @@ img { width: 100%; height: 100%; + object-fit: contain; } &.animated { -- cgit v1.2.3-70-g09d2 From dc0b47e8bda769a3df77a06632e696d54db750fb Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 23:30:07 +0300 Subject: fix collapse link being too small --- src/components/conversation/conversation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index e41929fd..5528fef6 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -3,7 +3,7 @@
{{ $t('timeline.conversation') }} - {{ $t('timeline.collapse') }} + {{ $t('timeline.collapse') }}
-- cgit v1.2.3-70-g09d2 From 65115bfc7f991b9203724eab67f73a34259cf6b2 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Tue, 4 Sep 2018 10:44:25 +0900 Subject: features panes supports chat & gopher --- src/components/features_panel/features_panel.js | 6 +++++- src/components/features_panel/features_panel.vue | 4 +++- src/main.js | 9 ++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js index 75a671f2..21d78e19 100644 --- a/src/components/features_panel/features_panel.js +++ b/src/components/features_panel/features_panel.js @@ -1,7 +1,11 @@ const FeaturesPanel = { computed: { - mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable }, + chat: function () { + return this.$store.state.config.chatAvailable && (!this.$store.state.chatDisabled) + }, + gopher: function () { return this.$store.state.config.gopherAvailable }, whoToFollow: function () { return this.$store.state.config.suggestionsEnabled }, + mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable }, scopeOptions: function () { return this.$store.state.config.scopeOptionsEnabled }, formattingOptions: function () { return this.$store.state.config.formattingOptionsEnabled }, textlimit: function () { return this.$store.state.config.textlimit } diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index 5ec4d255..5c532f1a 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -8,8 +8,10 @@
    -
  • Media proxy
    • +
  • Chat
    • +
  • Gopher
  • Who to follow
    • +
  • Media proxy
  • Scope options
  • Formatting options
  • Text limit = {{textlimit}}
    • diff --git a/src/main.js b/src/main.js index 64b223aa..58f520db 100644 --- a/src/main.js +++ b/src/main.js @@ -222,9 +222,12 @@ window.fetch('/instance/panel.html') window.fetch('/nodeinfo/2.0.json') .then((res) => res.json()) .then((data) => { - const suggestions = data.metadata.suggestions + const metadata = data.metadata + store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy }) + store.dispatch('setOption', { name: 'chatAvailable', value: data.metadata.chat }) + store.dispatch('setOption', { name: 'gopherAvailable', value: data.metadata.gopher }) + + const suggestions = metadata.suggestions store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web }) - - store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy }) }) -- cgit v1.2.3-70-g09d2 From 49ab19c342701bc08f5674302c8aab50186a1d5b Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Tue, 4 Sep 2018 10:59:02 +0900 Subject: features panel i18n --- src/components/features_panel/features_panel.vue | 16 ++++++++-------- src/i18n/messages.js | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index 5c532f1a..c191d66b 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -3,18 +3,18 @@
    - Features + {{$t('features_panel.title')}}
      -
    • Chat
      • -
    • Gopher
      • -
    • Who to follow
      • -
    • Media proxy
      • -
    • Scope options
      • -
    • Formatting options
      • -
    • Text limit = {{textlimit}}
      • +
    • {{$t('features_panel.chat')}}
      • +
    • {{$t('features_panel.gopher')}}
      • +
    • {{$t('features_panel.who_to_follow')}}
      • +
    • {{$t('features_panel.media_proxy')}}
      • +
    • {{$t('features_panel.scope_options')}}
      • +
    • {{$t('features_panel.formatting_options')}}
      • +
    • {{$t('features_panel.text_limit')}} = {{textlimit}}
    diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 42e7e9d4..76c093a3 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -419,6 +419,16 @@ const en = { who_to_follow: { who_to_follow: 'Who to follow', more: 'More' + }, + features_panel: { + title: 'Features', + chat: 'Chat', + gopher: 'Gopher', + who_to_follow: 'Who to follow', + media_proxy: 'Media proxy', + scope_options: 'Scope options', + formatting_options: 'Formatting options', + text_limit: 'Text limit' } } @@ -943,6 +953,16 @@ const ja = { who_to_follow: { who_to_follow: 'おすすめユーザー', more: 'くわしく' + }, + features_panel: { + title: 'ゆうこうなきのう', + chat: 'チャット', + gopher: 'Gopher', + who_to_follow: 'おすすめユーザー', + media_proxy: 'メディアプロクシ', + scope_options: 'こうかいはんい', + formatting_options: 'リッチテキスト', + text_limit: 'もじのかず' } } -- cgit v1.2.3-70-g09d2 From dbf24e1fbf3dde87e89ff0cee94323a23df72067 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Tue, 4 Sep 2018 11:15:00 +0900 Subject: Remove outdated settings --- src/main.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src') diff --git a/src/main.js b/src/main.js index debd8703..289cd857 100644 --- a/src/main.js +++ b/src/main.js @@ -114,9 +114,6 @@ window.fetch('/api/statusnet/config.json') var redirectRootNoLogin = (config.redirectRootNoLogin) var redirectRootLogin = (config.redirectRootLogin) var chatDisabled = (config.chatDisabled) - var showWhoToFollowPanel = (config.showWhoToFollowPanel) - var whoToFollowProvider = (config.whoToFollowProvider) - var whoToFollowLink = (config.whoToFollowLink) var showInstanceSpecificPanel = (config.showInstanceSpecificPanel) var scopeOptionsEnabled = (config.scopeOptionsEnabled) var formattingOptionsEnabled = (config.formattingOptionsEnabled) @@ -127,9 +124,6 @@ window.fetch('/api/statusnet/config.json') store.dispatch('setOption', { name: 'logo', value: logo }) store.dispatch('setOption', { name: 'logoMask', value: logoMask }) store.dispatch('setOption', { name: 'logoMargin', value: logoMargin }) - store.dispatch('setOption', { name: 'showWhoToFollowPanel', value: showWhoToFollowPanel }) - store.dispatch('setOption', { name: 'whoToFollowProvider', value: whoToFollowProvider }) - store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink }) store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled }) -- cgit v1.2.3-70-g09d2 From 8b94ea28eceb33e1f3f594f5d99ec0f4111b21ab Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Tue, 4 Sep 2018 14:50:02 +0900 Subject: remove formatting options --- src/components/features_panel/features_panel.js | 1 - src/components/features_panel/features_panel.vue | 1 - src/i18n/messages.js | 2 -- 3 files changed, 4 deletions(-) (limited to 'src') diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js index 21d78e19..80f5c966 100644 --- a/src/components/features_panel/features_panel.js +++ b/src/components/features_panel/features_panel.js @@ -7,7 +7,6 @@ const FeaturesPanel = { whoToFollow: function () { return this.$store.state.config.suggestionsEnabled }, mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable }, scopeOptions: function () { return this.$store.state.config.scopeOptionsEnabled }, - formattingOptions: function () { return this.$store.state.config.formattingOptionsEnabled }, textlimit: function () { return this.$store.state.config.textlimit } } } diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index c191d66b..445143e9 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -13,7 +13,6 @@
  • {{$t('features_panel.who_to_follow')}}
  • {{$t('features_panel.media_proxy')}}
  • {{$t('features_panel.scope_options')}}
    • -
  • {{$t('features_panel.formatting_options')}}
  • {{$t('features_panel.text_limit')}} = {{textlimit}}
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 76c093a3..f1dcfa46 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -427,7 +427,6 @@ const en = { who_to_follow: 'Who to follow', media_proxy: 'Media proxy', scope_options: 'Scope options', - formatting_options: 'Formatting options', text_limit: 'Text limit' } } @@ -961,7 +960,6 @@ const ja = { who_to_follow: 'おすすめユーザー', media_proxy: 'メディアプロクシ', scope_options: 'こうかいはんい', - formatting_options: 'リッチテキスト', text_limit: 'もじのかず' } } -- cgit v1.2.3-70-g09d2 From 5e1f0d941621d32657cdc2727b62f5a36443d25b Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Fri, 7 Sep 2018 16:18:01 +0000 Subject: Update messages.js Update the Occitan language - Fixed Linting --- src/i18n/messages.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 42e7e9d4..b260e664 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1200,10 +1200,10 @@ const oc = { links: 'Ligams', cBlue: 'Blau (Respondre, seguir)', cRed: 'Roge (Anullar)', - cOrange: 'Irange (Metre en favorit)', + cOrange: 'Irange (Aimar)', cGreen: 'Verd (Repartajar)', - inputRadius: 'Camps tèxte', btnRadius: 'Botons', + inputRadius: 'Camps tèxte', panelRadius: 'Panèls', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notificacions)', @@ -1222,7 +1222,20 @@ const oc = { follow_import: 'Importar los abonaments', import_followers_from_a_csv_file: 'Importar los seguidors d’un fichièr csv', follows_imported: 'Seguidors importats. Lo tractament pòt trigar una estona.', - follow_import_error: 'Error en important los seguidors' + follow_import_error: 'Error en important los seguidors', + delete_account: 'Suprimir lo compte', + delete_account_description: 'Suprimir vòstre compte e los messatges per sempre.', + delete_account_instructions: 'Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.', + delete_account_error: 'Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.', + follow_export: 'Exportar los abonaments', + follow_export_processing: 'Tractament, vos demandarem lèu de telecargar lo fichièr', + follow_export_button: 'Exportar vòstres abonaments dins un fichièr csv', + change_password: 'Cambiar lo senhal', + current_password: 'Senhal actual', + new_password: 'Nòu senhal', + confirm_new_password: 'Confirmatz lo nòu senhal', + changed_password: 'Senhal corrèctament cambiat', + change_password_error: 'Una error s’es producha en cambiant lo senhal.' }, notifications: { notifications: 'Notficacions', @@ -1248,6 +1261,7 @@ const oc = { }, post_status: { posting: 'Mandadís', + content_warning: 'Avís de contengut (opcional)', default: 'Escrivètz aquí vòstre estatut.' }, finder: { -- cgit v1.2.3-70-g09d2 From 385484566aa8a524ead77b3841be9af301bf0e5d Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 7 Sep 2018 16:22:59 +0000 Subject: Revert "Update messages.js" This reverts commit 5e1f0d941621d32657cdc2727b62f5a36443d25b --- src/i18n/messages.js | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index b260e664..42e7e9d4 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1200,10 +1200,10 @@ const oc = { links: 'Ligams', cBlue: 'Blau (Respondre, seguir)', cRed: 'Roge (Anullar)', - cOrange: 'Irange (Aimar)', + cOrange: 'Irange (Metre en favorit)', cGreen: 'Verd (Repartajar)', - btnRadius: 'Botons', inputRadius: 'Camps tèxte', + btnRadius: 'Botons', panelRadius: 'Panèls', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notificacions)', @@ -1222,20 +1222,7 @@ const oc = { follow_import: 'Importar los abonaments', import_followers_from_a_csv_file: 'Importar los seguidors d’un fichièr csv', follows_imported: 'Seguidors importats. Lo tractament pòt trigar una estona.', - follow_import_error: 'Error en important los seguidors', - delete_account: 'Suprimir lo compte', - delete_account_description: 'Suprimir vòstre compte e los messatges per sempre.', - delete_account_instructions: 'Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.', - delete_account_error: 'Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.', - follow_export: 'Exportar los abonaments', - follow_export_processing: 'Tractament, vos demandarem lèu de telecargar lo fichièr', - follow_export_button: 'Exportar vòstres abonaments dins un fichièr csv', - change_password: 'Cambiar lo senhal', - current_password: 'Senhal actual', - new_password: 'Nòu senhal', - confirm_new_password: 'Confirmatz lo nòu senhal', - changed_password: 'Senhal corrèctament cambiat', - change_password_error: 'Una error s’es producha en cambiant lo senhal.' + follow_import_error: 'Error en important los seguidors' }, notifications: { notifications: 'Notficacions', @@ -1261,7 +1248,6 @@ const oc = { }, post_status: { posting: 'Mandadís', - content_warning: 'Avís de contengut (opcional)', default: 'Escrivètz aquí vòstre estatut.' }, finder: { -- cgit v1.2.3-70-g09d2 From 5726be68307f0215470d2e5baea105718b5039fe Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 8 Sep 2018 05:16:25 +0300 Subject: fix --- src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.js b/src/main.js index debd8703..068563fd 100644 --- a/src/main.js +++ b/src/main.js @@ -120,7 +120,7 @@ window.fetch('/api/statusnet/config.json') var showInstanceSpecificPanel = (config.showInstanceSpecificPanel) var scopeOptionsEnabled = (config.scopeOptionsEnabled) var formattingOptionsEnabled = (config.formattingOptionsEnabled) - var collapseMessageWithSubject = (config.collapseMessageWithSubject) + var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject) store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'background', value: background }) @@ -133,7 +133,7 @@ window.fetch('/api/statusnet/config.json') store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled }) - store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject }) + store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject }) if (chatDisabled) { store.dispatch('disableChat') } -- cgit v1.2.3-70-g09d2 From 3a172529293e9669767d39d175e8748ace49bdd0 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Sun, 9 Sep 2018 14:34:51 +0900 Subject: use prime number step for Who to follow panel --- src/components/who_to_follow_panel/who_to_follow_panel.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js index 6766e561..ce60308f 100644 --- a/src/components/who_to_follow_panel/who_to_follow_panel.js +++ b/src/components/who_to_follow_panel/who_to_follow_panel.js @@ -3,9 +3,10 @@ import apiService from '../../services/api/api.service.js' function showWhoToFollow (panel, reply) { var users = reply var cn - var index = 0 - var random = Math.floor(Math.random() * 10) - for (cn = random; cn < users.length; cn = cn + 10) { + var index + var step = 7 + cn = Math.floor(Math.random() * step) + for (index = 0; index < 3; index++) { var user user = users[cn] var img @@ -46,11 +47,8 @@ function showWhoToFollow (panel, reply) { } }) } - index = index + 1 - if (index > 2) { - break - } } + cn = (cn + step) % users.length } function getWhoToFollow (panel) { -- cgit v1.2.3-70-g09d2