• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head · f8fe64a6
    Lin Jen-Shin authored
    * upstream/master: (58 commits)
      Fix icon name error
      Rewrite system note helper
      Change edit icon
      Leave icon area blank if legacy note; remove diamond icon
      Fix positioning of note icons
      Fix newline errors
      Add remaining system note icons
      Add system notes icon helper; add icons
      Fixed specs Updated JS that was causing the hints to appear & then disappear
      Update tests
      Fix broken spinach test
      Reuse code
      Improve shortcuts code
      Adds ShortcutsDashboardNavigation to globals comment since its a global variable
      Fix shortcut specs
      Reorganize shortcut help menu
      Change todos shortcut to shift
      Change shortcuts
      Switch global shortcuts to shift; reuse key styles from help menu
      Map bindings to lowercase letters; only show key bindings when using keyboard shortcut
      ...
    f8fe64a6
project.rb 41.8 KB