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

add favourite confirmation modal
This commit is contained in:
beatrix authored and GitHub committed 2017-12-10 23:10:19 -05:00
commit 08b0861b96
18 files changed
+152 -18

No files matched your search

@@ -1293,6 +1293,19 @@
],
"path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
},
{
"descriptors": [
{
"defaultMessage": "Favourite",
"id": "status.favourite"
},
{
"defaultMessage": "You can press {combo} to skip this next time",
"id": "favourite_modal.combo"
}
],
"path": "app/javascript/mastodon/features/ui/components/favourite_modal.json"
},
{
"descriptors": [
{
@@ -1601,4 +1614,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]