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/App.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/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 7284c0d7..8ba4eb1f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ </div> <div class='item right'> <user-finder class="nav-icon" @toggled="onFinderToggled"></user-finder> - <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link> + <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> </div> |