diff options
| author | Henry Jameson <me@hjkos.com> | 2018-09-09 15:55:43 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-09-09 15:55:43 +0300 |
| commit | 0656e0ef324ae8361a872908bb1b26a3d4ad4129 (patch) | |
| tree | e4c0cf6f8ac98da1204d500d9cfdc04cd7d36f27 /src/App.vue | |
| parent | e6adddbba69cbcc71d3f3ba3d0734b7fefbc44d4 (diff) | |
| parent | ed6abeacadc2bced05f3221b2c57ba488f0ae800 (diff) | |
Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop: (21 commits)
use prime number step for Who to follow panel
fix
Revert "Update messages.js"
Update messages.js Update the Occitan language - Fixed Linting
remove formatting options
Remove outdated settings
features panel i18n
features panes supports chat & gopher
fix collapse link being too small
small fix for non-square gif avatars
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
Fix last place with usercard having wrong width
Fixed non-masked image looking weird in chrome.
Kinda went back to using align-items: stretch. Fixed error message floating.
Simplified image sensitivity label
show features panel only if not login
update
debug
update
debug
...
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/App.vue b/src/App.vue index fc446c57..059460f9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,6 +28,7 @@ <user-panel></user-panel> <nav-panel></nav-panel> <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> + <features-panel v-if="!currentUser"></features-panel> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> <notifications v-if="currentUser"></notifications> </div> |