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

Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
This commit is contained in:
Thibaut Girka
2019-01-10 19:12:10 +01:00
239 changed files with 3222 additions and 1433 deletions

View File

@@ -302,6 +302,14 @@
{
"defaultMessage": "Embed",
"id": "status.embed"
},
{
"defaultMessage": "Open moderation interface for @{name}",
"id": "status.admin_account"
},
{
"defaultMessage": "Open this status in the moderation interface",
"id": "status.admin_status"
}
],
"path": "app/javascript/mastodon/components/status_action_bar.json"
@@ -594,6 +602,10 @@
"defaultMessage": "Add or Remove from lists",
"id": "account.add_or_remove_from_list"
},
{
"defaultMessage": "Open moderation interface for @{name}",
"id": "status.admin_account"
},
{
"defaultMessage": "Information below may reflect the user's profile incompletely.",
"id": "account.disclaimer_full"
@@ -1926,6 +1938,14 @@
{
"defaultMessage": "Embed",
"id": "status.embed"
},
{
"defaultMessage": "Open moderation interface for @{name}",
"id": "status.admin_account"
},
{
"defaultMessage": "Open this status in the moderation interface",
"id": "status.admin_status"
}
],
"path": "app/javascript/mastodon/features/status/components/action_bar.json"