tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
This commit is contained in:
Thibaut Girka
2019-05-10 17:09:12 +02:00
parent 3191c3b349 780d99c204
commit 68629f2773
40 changed files with 669 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -180,10 +180,6 @@
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
},
{
"defaultMessage": "Click to view",
"id": "status.sensitive_toggle"
}
],
"path": "app/javascript/mastodon/components/media_gallery.json"
@ -1096,6 +1092,10 @@
{
"defaultMessage": "Media is not marked as sensitive",
"id": "compose_form.sensitive.unmarked"
},
{
"defaultMessage": "Mark media as sensitive",
"id": "compose_form.sensitive.hide"
}
],
"path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json"
@ -2262,6 +2262,10 @@
{
"defaultMessage": "Next",
"id": "lightbox.next"
},
{
"defaultMessage": "View context",
"id": "lightbox.view_context"
}
],
"path": "app/javascript/mastodon/features/ui/components/media_modal.json"
@ -2354,6 +2358,15 @@
],
"path": "app/javascript/mastodon/features/ui/components/upload_area.json"
},
{
"descriptors": [
{
"defaultMessage": "View context",
"id": "lightbox.view_context"
}
],
"path": "app/javascript/mastodon/features/ui/components/video_modal.json"
},
{
"descriptors": [
{
@ -2408,10 +2421,6 @@
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
},
{
"defaultMessage": "Click to view",
"id": "status.sensitive_toggle"
}
],
"path": "app/javascript/mastodon/features/video/index.json"