diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-04 09:56:45 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-04 09:56:45 +0300 |
| commit | 7a13c530c76586a56309bfd2347374ece345ad08 (patch) | |
| tree | e62868d2e10c49e00f7c65057323931c469afb1b /src/components/settings/settings.vue | |
| parent | 6b3489a4d30b6530091919b4c44617a3294ffdd2 (diff) | |
| parent | 480f617c098c831e095a686abb319f4e467e15e4 (diff) | |
Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop:
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 4a236d23..de506e4d 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -64,6 +64,12 @@ </label> </li> <li> + <input type="checkbox" id="subjectHide" v-model="alwaysShowSubjectInputLocal"> + <label for="subjectHide"> + {{$t('settings.subject_input_always_show')}} {{$t('settings.instance_default', { value: alwaysShowSubjectInputDefault })}} + </label> + </li> + <li> <div> {{$t('settings.subject_line_behavior')}} <label for="subjectLineBehavior" class="select"> |