Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00
parent b8791ae79b a3e53bd442
commit 7a1ca8b0df
82 changed files with 419 additions and 260 deletions
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -105,7 +105,7 @@ export default class StatusList extends ImmutablePureComponent {
  }

  handleKeyDown = (e) => {
-    if (['PageDown', 'PageUp', 'End', 'Home'].includes(e.key)) {
+    if (['PageDown', 'PageUp'].includes(e.key) || (e.ctrlKey && ['End', 'Home'].includes(e.key))) {
      const article = (() => {
        switch (e.key) {
        case 'PageDown':