Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
This commit is contained in:
@@ -612,6 +612,10 @@
|
||||
"defaultMessage": "Copy link to status",
|
||||
"id": "status.copy"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide toot",
|
||||
"id": "status.hide"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block domain {domain}",
|
||||
"id": "account.block_domain"
|
||||
@@ -678,6 +682,10 @@
|
||||
"defaultMessage": "Filtered",
|
||||
"id": "status.filtered"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show anyway",
|
||||
"id": "status.show_filter_reason"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Pinned post",
|
||||
"id": "status.pinned"
|
||||
|
||||
Reference in New Issue
Block a user