Merge pull request #250 from chriswmartin/fav-confirm-modal

add favourite confirmation modal
2017-12-10 23:10:19 -05:00
parent 01a3461bef 0466aa8d08
commit 08b0861b96
18 changed files with 152 additions and 18 deletions
--- a/app/javascript/flavours/glitch/locales/en.js
+++ b/app/javascript/flavours/glitch/locales/en.js
@@ -34,6 +34,8 @@ const messages = {
  'status.collapse': 'Collapse',
  'status.uncollapse': 'Uncollapse',

+  'favourite_modal.combo': 'You can press {combo} to skip this next time',
+
  'home.column_settings.show_direct': 'Show DMs',

  'notification.markForDeletion': 'Mark for deletion',