Merge tag 'v1.6.0rc3' into sync/upstream

2017-09-09 14:28:08 -05:00
parent b9f7bc149b 11bddd31ce
commit 514fc908a3
87 changed files with 947 additions and 285 deletions
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -77,6 +77,7 @@ export default class Favourites extends ImmutablePureComponent {
          onClick={this.handleHeaderClick}
          pinned={pinned}
          multiColumn={multiColumn}
+          showBackButton
        />

        <StatusList
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -124,6 +124,7 @@ export default class Notifications extends React.PureComponent {
    const scrollContainer = (
      <ScrollableList
        scrollKey={`notifications-${columnId}`}
+        trackScroll={!pinned}
        isLoading={isLoading}
        hasMore={hasMore}
        emptyMessage={emptyMessage}