Commit Graph

9763 Commits

Author SHA1 Message Date
Claire 84aff598ea
Fix typo in SignatureVerification (#19209)
Fix regression from #15605
2022-09-21 14:48:35 +02:00
Eugen Rochko 7191db0e43
New Crowdin updates (#19167)
* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Czech)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations en.yml (Spanish)

* New translations en.yml (Turkish)

* New translations en.json (Thai)

* New translations en.json (Thai)

* New translations en.json (Dutch)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations activerecord.en.yml (Czech)

* New translations en.json (Thai)

* New translations en.yml (Czech)

* New translations en.json (Albanian)

* New translations en.yml (Albanian)

* New translations simple_form.en.yml (Albanian)

* New translations activerecord.en.yml (Albanian)

* New translations devise.en.yml (Albanian)

* New translations doorkeeper.en.yml (Albanian)

* New translations en.json (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Ukrainian)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.yml (Thai)

* New translations en.json (Bulgarian)

* New translations en.json (Bulgarian)

* New translations en.yml (Thai)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations en.json (Sinhala)

* New translations en.json (Sinhala)

* New translations en.json (Sinhala)

* New translations en.json (Sinhala)

* New translations en.json (Sinhala)

* New translations en.yml (Greek)

* New translations en.yml (Afrikaans)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.json (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Danish)

* New translations en.json (Greek)

* New translations en.json (Frisian)

* New translations en.yml (Frisian)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Finnish)

* New translations en.json (Irish)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.yml (Hungarian)

* New translations en.json (Afrikaans)

* New translations en.yml (French)

* New translations en.json (Hebrew)

* New translations en.json (French)

* New translations en.yml (German)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Tamil)

* New translations en.json (Dutch)

* New translations en.json (Romanian)

* New translations en.yml (Romanian)

* New translations en.json (Armenian)

* New translations en.json (Ido)

* New translations en.yml (Ido)

* New translations en.yml (Armenian)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Serbian (Cyrillic))

* New translations en.yml (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.json (Persian)

* New translations en.yml (Slovenian)

* New translations en.yml (Slovak)

* New translations en.yml (Dutch)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.json (Georgian)

* New translations en.yml (Georgian)

* New translations en.yml (Korean)

* New translations en.json (Lithuanian)

* New translations en.yml (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.yml (Macedonian)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Slovak)

* New translations en.json (Norwegian)

* New translations en.yml (Norwegian)

* New translations en.json (Punjabi)

* New translations en.yml (Punjabi)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Russian)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.json (Estonian)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Telugu)

* New translations en.json (Telugu)

* New translations en.yml (Malay)

* New translations en.json (Malay)

* New translations en.yml (Hindi)

* New translations en.json (Hindi)

* New translations en.yml (Latvian)

* New translations en.yml (Estonian)

* New translations en.json (English, United Kingdom)

* New translations en.yml (Kazakh)

* New translations en.yml (Bengali)

* New translations en.json (Kazakh)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.json (Spanish, Mexico)

* New translations en.json (Marathi)

* New translations en.yml (Marathi)

* New translations en.json (Croatian)

* New translations en.yml (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Breton)

* New translations en.yml (Asturian)

* New translations en.json (Asturian)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Kannada)

* New translations en.json (Kannada)

* New translations en.yml (Cornish)

* New translations en.json (Cornish)

* New translations en.yml (Sinhala)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Breton)

* New translations en.yml (Malayalam)

* New translations en.json (Malayalam)

* New translations en.yml (Tatar)

* New translations en.json (Tatar)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Uyghur)

* New translations en.json (Uyghur)

* New translations en.yml (Esperanto)

* New translations en.yml (Welsh)

* New translations en.json (Welsh)

* New translations en.json (Occitan)

* New translations en.yml (Occitan)

* New translations en.json (Sanskrit)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Silesian)

* New translations en.json (Silesian)

* New translations en.yml (Taigi)

* New translations en.json (Taigi)

* New translations en.yml (Kabyle)

* New translations en.json (Kabyle)

* New translations en.yml (Sanskrit)

* New translations en.yml (Sardinian)

* New translations en.json (Serbian (Latin))

* New translations en.json (Sardinian)

* New translations en.yml (Corsican)

* New translations en.json (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.json (Dutch)

* New translations en.json (Danish)

* New translations en.json (Korean)

* New translations en.yml (Dutch)

* New translations en.json (Spanish, Argentina)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-09-21 11:10:02 +09:00
Eugen Rochko 50948b46aa
Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
Claire 7b38cb88ca
Fix ProcessMentionService swallowing unprocessed mentions to unconfirmed/unapproved users (#19191) 2022-09-20 23:49:00 +02:00
Claire 1145dbd327
Improve error reporting and logging when processing remote accounts (#15605)
* Add a more descriptive PrivateNetworkAddressError exception class

* Remove unnecessary exception class to rescue clause

* Remove unnecessary include to JsonLdHelper

* Give more neutral error message when too many webfinger redirects

* Remove unnecessary guard condition

* Rework how “ActivityPub::FetchRemoteAccountService” handles errors

Add “suppress_errors” keyword argument to avoid raising errors in
ActivityPub::FetchRemoteAccountService#call (default/previous behavior).

* Rework how “ActivityPub::FetchRemoteKeyService” handles errors

Add “suppress_errors” keyword argument to avoid raising errors in
ActivityPub::FetchRemoteKeyService#call (default/previous behavior).

* Fix Webfinger::RedirectError not being a subclass of Webfinger::Error

* Add suppress_errors option to ResolveAccountService

Defaults to true (to preserve previous behavior). If set to false,
errors will be raised instead of caught, allowing the caller to be
informed of what went wrong.

* Return more precise error when failing to fetch account signing AP payloads

* Add tests

* Fixes

* Refactor error handling a bit

* Fix various issues

* Add specific error when provided Digest is not 256 bits of base64-encoded data

* Please CodeClimate

* Improve webfinger error reporting
2022-09-20 23:30:26 +02:00
trwnh 526b4b3677
Fix breaking change in admin account API (#19176)
* Fix breaking change in admin account API

Ensure that `ip` is a String value and not returning a raw database entry

* please rubocop
2022-09-15 15:35:06 +02:00
dependabot[bot] 4793950136
Bump jest from 28.1.3 to 29.0.3 (#19162)
* Bump babel-jest from 28.1.3 to 29.0.3

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump jest-environment-jsdom from 28.1.3 to 29.0.3

Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump jest from 28.1.3 to 29.0.3

Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-11 23:11:10 +09:00
Eugen Rochko b312f35d24
New Crowdin updates (#19049)
* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Croatian)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations en.yml (Malay)

* New translations en.yml (Corsican)

* New translations en.yml (Sardinian)

* New translations en.yml (Kabyle)

* New translations en.yml (Ido)

* New translations simple_form.en.yml (Ido)

* New translations en.yml (Ukrainian)

* New translations en.yml (Spanish)

* New translations en.yml (Ido)

* New translations simple_form.en.yml (Ido)

* New translations en.yml (Portuguese)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Danish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Latvian)

* New translations en.yml (Latvian)

* New translations en.yml (Hungarian)

* New translations en.yml (Polish)

* New translations en.yml (Turkish)

* New translations en.yml (Italian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.yml (Icelandic)

* New translations en.json (Galician)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations activerecord.en.yml (Portuguese, Brazilian)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Norwegian)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Armenian)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Georgian)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Polish)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Slovak)

* New translations simple_form.en.yml (Slovenian)

* New translations simple_form.en.yml (Albanian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Swedish)

* New translations simple_form.en.yml (Turkish)

* New translations simple_form.en.yml (Ukrainian)

* New translations simple_form.en.yml (Basque)

* New translations en.yml (Finnish)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Russian)

* New translations en.yml (Slovak)

* New translations en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Frisian)

* New translations simple_form.en.yml (Romanian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Afrikaans)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Bulgarian)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Sardinian)

* New translations simple_form.en.yml (Sinhala)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Asturian)

* New translations simple_form.en.yml (Occitan)

* New translations simple_form.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Corsican)

* New translations simple_form.en.yml (Malayalam)

* New translations simple_form.en.yml (Kabyle)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Ukrainian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations simple_form.en.yml (Breton)

* New translations simple_form.en.yml (Tatar)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (Indonesian)

* New translations simple_form.en.yml (Persian)

* New translations simple_form.en.yml (Tamil)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Bengali)

* New translations simple_form.en.yml (Croatian)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Kazakh)

* New translations simple_form.en.yml (Estonian)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Welsh)

* New translations simple_form.en.yml (Esperanto)

* New translations en.yml (Arabic)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Persian)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations en.yml (Welsh)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Turkish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Greek)

* New translations en.yml (Basque)

* New translations en.yml (Hebrew)

* New translations en.yml (Hungarian)

* New translations en.yml (Italian)

* New translations en.yml (Korean)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Slovenian)

* New translations en.yml (Albanian)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Ido)

* New translations en.yml (Sardinian)

* New translations en.yml (Corsican)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Sinhala)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations en.yml (Vietnamese)

* New translations en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Latvian)

* New translations en.yml (Latvian)

* New translations en.json (Asturian)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations activerecord.en.yml (Russian)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Hungarian)

* New translations en.yml (Spanish)

* New translations en.yml (Hungarian)

* New translations doorkeeper.en.yml (Russian)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Portuguese)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Czech)

* New translations en.json (Russian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Danish)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Slovenian)

* New translations en.yml (Slovenian)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Italian)

* New translations en.yml (Italian)

* New translations simple_form.en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (German)

* New translations en.yml (Catalan)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.json (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.json (Hebrew)

* New translations simple_form.en.yml (Hebrew)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Bulgarian)

* New translations en.json (Bulgarian)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.yml (Ido)

* New translations simple_form.en.yml (Ido)

* New translations en.yml (Ido)

* New translations en.json (Ido)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations en.json (German)

* New translations devise.en.yml (German)

* New translations doorkeeper.en.yml (German)

* New translations en.json (Tamil)

* New translations en.json (Tamil)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-09-11 22:19:58 +09:00
Claire 2750a7a0e6
Fix REST API sometimes returning HTML on error (#19135)
Fixes #19115
2022-09-08 09:44:36 +02:00
Mélanie Chauvel 9d7c323abd
Make composers button all aligned and the same size (#1843) 2022-09-07 19:37:46 +02:00
Claire 2a46fcc3ed
Fix regexp filtering in pinned community/public TLs (#1840) 2022-09-02 11:57:06 +02:00
Claire 156c6ea36c
Fix position of “expand” icon in media modal on glitch-soc (#1838) 2022-08-31 16:23:10 +02:00
Claire 0fece174f6
Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)
I failed to account for glitch-soc's theming system when merging
from upstream.
2022-08-31 11:55:27 +02:00
Claire 0495302f1c
Fix local settings navigation (#1836)
The “filters” page was removed, but not from the navigation, which would offset
everything.
2022-08-30 10:57:27 +02:00
Claire 90917b305a
Fix WebUI error in development mode (#19078)
Caused by using JSX features without importing React
2022-08-29 10:02:40 +02:00
Claire bbb45568ad
Fix WebUI error in development mode (#1835)
Caused by using JSX features without importing React

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-29 08:23:05 +02:00
Claire 7a02c1d9ba
Add regexp filter field to public timeline column settings (#1834)
* Add regexp filter field to public timeline column settings

This has accidentally been removed while porting an upstream change years ago.

* Remove dead code

* Fix regexp filter not working for local and public TLs when using non-default settings
2022-08-28 22:21:55 +02:00
Yamagishi Kazutoshi 54ae7a221e [Glitch] Replace to `workbox-webpack-plugin` from `offline-plugin`
Port 81e1cc5fec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28 11:41:21 +02:00
Claire 6c7bb926d8 Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)"
This reverts commit af396fa35f.
2022-08-28 11:31:39 +02:00
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
Eugen Rochko 546672e292
Change "Allow trends without prior review" setting to include statuses (#17977)
* Change "Allow trends without prior review" setting to include posts

* Fix i18n-tasks
2022-08-28 04:00:39 +02:00
Eugen Rochko c57907737a
Change search API to be accessible without being logged in (#18963)
But with the resolve option turned off
2022-08-28 03:45:19 +02:00
Eugen Rochko c99c106ef0
Change following and followers API to be accessible without being logged in (#18964) 2022-08-28 03:45:07 +02:00
Eugen Rochko 2a7766dcc9
Add admin API for managing e-mail domain blocks (#19066) 2022-08-28 03:37:55 +02:00
Eugen Rochko c556c3a0d1
Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
Eugen Rochko b399d79545
Add admin API for managing IP blocks (#19065) 2022-08-27 20:56:47 +02:00
Jeong Arm 54d9a9c18a
Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
Claire c7147bab90
Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062)
Fixes #19060
2022-08-27 00:45:54 +02:00
Shlee 1fac99e842
Add rel="noopener" to links to remote profiles (#19014)
* Update timeline_hint.js

* Update timeline_hint.js
2022-08-26 02:12:46 +02:00
Eugen Rochko 1d84cbeaab
Fix "select all matching items" being offered when all items are on the page (#19054) 2022-08-26 02:11:23 +02:00
Eugen Rochko af396fa35f
Remove preference to aggregate reblogs in home/list feeds (#18112) 2022-08-25 23:38:36 +02:00
Eugen Rochko 0b3e4fd5de
Remove digest e-mails (#17985)
* Remove digest e-mails

* Remove digest-related code
2022-08-25 23:38:22 +02:00
Eugen Rochko 5b0e8cc92b
Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
Eugen Rochko d696f729f1
Add meta tag for official iOS app (#16599) 2022-08-25 23:27:10 +02:00
Eugen Rochko 0396acf39e
Add audit log entries for user roles (#19040)
* Refactor audit log schema

* Add audit log entries for user roles
2022-08-25 20:39:40 +02:00
Yamagishi Kazutoshi 81e1cc5fec
Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
Claire d99f91bceb [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
Port 55bef1e34f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 18:19:09 +02:00
Claire 43a1bfd05d [Glitch] Fix “Filter this post” potentially listing deleted filters
Port 2cae5f5b8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 18:18:34 +02:00
Claire 3ff340c790 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 17:49:14 +02:00
Claire 55bef1e34f
Fix quickly switching notification filters resulting in empty or incorrect list (#19052)
Follow-up to #18960

The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.

This commit cancels the first request if it is still running, before issuing
the second one.
2022-08-25 17:36:54 +02:00
Claire 2cae5f5b8d
Fix “Filter this post” potentially listing deleted filters (#19051) 2022-08-25 17:36:35 +02:00
Eugen Rochko 3efa8da2d6
New Crowdin updates (#18972)
* New translations en.json (Hindi)

* New translations en.json (Malay)

* New translations en.json (Telugu)

* New translations en.json (English, United Kingdom)

* New translations en.json (Uyghur)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.json (Dutch)

* New translations en.json (Portuguese)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Traditional)

* New translations en.json (Chinese Simplified)

* New translations en.json (Danish)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Korean)

* New translations en.json (Catalan)

* New translations en.json (Hungarian)

* New translations en.json (Slovenian)

* New translations en.json (Galician)

* New translations en.json (Greek)

* New translations en.json (Polish)

* New translations en.json (Turkish)

* New translations devise.en.yml (Turkish)

* New translations doorkeeper.en.yml (Turkish)

* New translations en.json (Albanian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Icelandic)

* New translations en.json (Latvian)

* New translations en.json (Spanish)

* New translations en.json (German)

* New translations en.json (Italian)

* New translations en.json (Ido)

* New translations en.json (Russian)

* New translations en.json (Vietnamese)

* New translations en.yml (Esperanto)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Thai)

* New translations en.json (Russian)

* New translations en.json (Chinese Simplified)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Turkish)

* New translations simple_form.en.yml (Norwegian)

* New translations simple_form.en.yml (Polish)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Slovak)

* New translations simple_form.en.yml (Slovenian)

* New translations simple_form.en.yml (Albanian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Swedish)

* New translations simple_form.en.yml (Ukrainian)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (Indonesian)

* New translations simple_form.en.yml (Persian)

* New translations simple_form.en.yml (Tamil)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Romanian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Afrikaans)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Bulgarian)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Frisian)

* New translations simple_form.en.yml (Basque)

* New translations simple_form.en.yml (Hebrew)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Armenian)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Georgian)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Asturian)

* New translations simple_form.en.yml (Occitan)

* New translations simple_form.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Corsican)

* New translations simple_form.en.yml (Breton)

* New translations simple_form.en.yml (Sardinian)

* New translations simple_form.en.yml (Kabyle)

* New translations simple_form.en.yml (Ido)

* New translations simple_form.en.yml (Sinhala)

* New translations simple_form.en.yml (Malayalam)

* New translations simple_form.en.yml (Bengali)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Croatian)

* New translations simple_form.en.yml (Kazakh)

* New translations simple_form.en.yml (Estonian)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Tatar)

* New translations simple_form.en.yml (Welsh)

* New translations simple_form.en.yml (Esperanto)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Korean)

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Albanian)

* New translations en.yml (Korean)

* New translations en.yml (Lithuanian)

* New translations en.yml (Macedonian)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Punjabi)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Slovenian)

* New translations en.yml (Serbian (Cyrillic))

* New translations en.yml (Italian)

* New translations en.yml (Swedish)

* New translations en.yml (Turkish)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Georgian)

* New translations en.yml (Armenian)

* New translations en.yml (Spanish)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations en.yml (Russian)

* New translations en.yml (Slovak)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Romanian)

* New translations en.yml (French)

* New translations en.yml (Afrikaans)

* New translations en.yml (Hungarian)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Greek)

* New translations en.yml (Frisian)

* New translations en.yml (Basque)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Cornish)

* New translations en.yml (Kannada)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Asturian)

* New translations en.yml (Occitan)

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Corsican)

* New translations en.yml (Breton)

* New translations en.yml (Sardinian)

* New translations en.yml (Sanskrit)

* New translations en.yml (Kabyle)

* New translations en.yml (Ido)

* New translations en.yml (Taigi)

* New translations en.yml (Silesian)

* New translations en.yml (Sinhala)

* New translations en.yml (Malayalam)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Latvian)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations en.yml (Marathi)

* New translations en.yml (Croatian)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Hindi)

* New translations en.yml (Tatar)

* New translations en.yml (Malay)

* New translations en.yml (Telugu)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Welsh)

* New translations en.yml (Uyghur)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Galician)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Swedish)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Slovenian)

* New translations en.yml (Polish)

* New translations en.yml (Slovenian)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Polish)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Spanish)

* New translations en.yml (Danish)

* New translations en.yml (Korean)

* New translations en.yml (Vietnamese)

* New translations en.yml (Icelandic)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-25 19:40:19 +09:00
Claire 2b03e21d36 Fix glitch-soc-specific timeline filtering logic 2022-08-25 11:53:16 +02:00
Claire 3844f15da0 Remove obsolete filter local settings 2022-08-25 09:52:13 +02:00
Claire 0b733ca790 [Glitch] Add ability to filter individual posts
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Takeshi Umeda 28f0dfc0b4 [Glitch] Fix case where boolean was passed to onFilter on StatusActionBar
Port 66b8abf218 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire 93b6ad2c6c [Glitch] Remove dead code in WebUI filtering code
Port a233a9bfb5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire bbafe28fbc [Glitch] Fix reblogged statuses being erroneously shown as filtered
Port 3c24f19afe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire a15fe32e61 [Glitch] Revamp post filtering system
Port front-end changes from 02851848e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:40:45 +02:00
Claire 448ed92f76 [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
Port afb8bc97d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:16:43 +02:00
Claire 3c80b62045 [Glitch] Fix media modal link button
Port ba745ca99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:14:00 +02:00
Takeshi Umeda 68564a622c [Glitch] Fix action type for unfollowHashtag
Port 5d70a16a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:11:55 +02:00
Claire 2d1d4210f9 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
Jeong Arm 861b35dd54
Support "http_hidden_proxy" ENV var for hidden service only proxy (#18427)
* Support "http_hidden_proxy" ENV var for hidden service only proxy

* Fallback to http_proxy if http_hidden_proxy is not set
2022-08-25 04:41:14 +02:00
Jeong Arm 42ff4dce41
Use type="color" on badge color input field (#18825)
This informs browser to use interactive color picker
2022-08-25 04:38:34 +02:00
Takeshi Umeda 5d70a16a14
Fix action type for unfollowHashtag (#18924) 2022-08-25 04:38:01 +02:00
Takeshi Umeda 66b8abf218
Fix case where boolean was passed to onFilter on StatusActionBar (#18923) 2022-08-25 04:37:40 +02:00
Claire 03241d884e
Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmation (#18642)
Fixes #18620
2022-08-25 04:31:10 +02:00
Claire ba745ca99a
Fix media modal link button (#18877)
Fixes regression from #18697
2022-08-25 04:30:53 +02:00
Claire afb8bc97d0
Fix quickly switching notification filters resulting in empty or incorrect list (#18960) 2022-08-25 04:29:00 +02:00
Claire 50487db122
Add ability to filter individual posts (#18945)
* Add database table for status-specific filters

* Add REST endpoints, entities and attributes

* Show status filters in /filters interface

* Perform server-side filtering for individual posts filters

* Fix filtering on context mismatch

* Refactor `toServerSideType` by moving it to its own module

* Move loupe and delete icons to their own module

* Add ability to filter individual posts from WebUI

* Replace keyword list by warnings (expired, context mismatch)

* Refactor server-side filtering code

* Add tests
2022-08-25 04:27:47 +02:00
Eugen Rochko 0412a4d03e
Change e-mail domain blocks to match subdomains of blocked domains (#18979) 2022-08-24 19:00:55 +02:00
Eugen Rochko d83faa1a89
Add ability to block sign-ups from IP (#19037) 2022-08-24 19:00:37 +02:00
Shlee 8a93dd3d83 [Glitch] Update notifications.js
Port d92ce31c92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-21 14:44:58 +02:00
Claire 0b37299775 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-21 14:39:25 +02:00
Jeong Arm d415f1116b
Fix /admin/accounts/ order parameter (#18996) 2022-08-17 22:07:30 +01:00
Mashiro 656ac99ef0
Fix ambiguous column names in `tootctl search deploy` (#18993) 2022-08-17 22:07:12 +01:00
Shlee d92ce31c92
Update notifications.js (#18977) 2022-08-15 20:33:05 +02:00
Jeong Arm 6aa83b13ba
Properly delete remote account's avatar/header when fetch/update (#18973) 2022-08-15 20:32:21 +02:00
Rens Groothuijsen 41fa50ac86 [Glitch] Add warning for sensitive audio posts
Port e6979aa6d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-15 14:57:57 +02:00
Claire e2a7a458d6 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-15 14:33:05 +02:00
Eugen Rochko aa33c7f26e
New Crowdin updates (#18905)
* New translations doorkeeper.en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations devise.en.yml (Urdu (Pakistan))

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Bengali)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations devise.en.yml (Spanish, Argentina)

* New translations doorkeeper.en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations activerecord.en.yml (Spanish, Mexico)

* New translations devise.en.yml (Spanish, Mexico)

* New translations doorkeeper.en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations activerecord.en.yml (Bengali)

* New translations doorkeeper.en.yml (Tamil)

* New translations devise.en.yml (Bengali)

* New translations en.yml (Marathi)

* New translations activerecord.en.yml (Marathi)

* New translations doorkeeper.en.yml (Marathi)

* New translations devise.en.yml (Thai)

* New translations en.yml (Croatian)

* New translations simple_form.en.yml (Croatian)

* New translations en.yml (Spanish, Argentina)

* New translations devise.en.yml (Tamil)

* New translations devise.en.yml (Vietnamese)

* New translations devise.en.yml (Portuguese, Brazilian)

* New translations doorkeeper.en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Galician)

* New translations devise.en.yml (Galician)

* New translations doorkeeper.en.yml (Galician)

* New translations devise.en.yml (Icelandic)

* New translations doorkeeper.en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations activerecord.en.yml (Portuguese, Brazilian)

* New translations doorkeeper.en.yml (Portuguese, Brazilian)

* New translations activerecord.en.yml (Tamil)

* New translations simple_form.en.yml (Indonesian)

* New translations devise.en.yml (Indonesian)

* New translations doorkeeper.en.yml (Indonesian)

* New translations en.yml (Persian)

* New translations simple_form.en.yml (Persian)

* New translations activerecord.en.yml (Persian)

* New translations devise.en.yml (Persian)

* New translations doorkeeper.en.yml (Persian)

* New translations en.yml (Tamil)

* New translations simple_form.en.yml (Tamil)

* New translations activerecord.en.yml (Croatian)

* New translations devise.en.yml (Croatian)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Telugu)

* New translations doorkeeper.en.yml (Hindi)

* New translations devise.en.yml (English, United Kingdom)

* New translations en.yml (Welsh)

* New translations simple_form.en.yml (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations devise.en.yml (Welsh)

* New translations doorkeeper.en.yml (Welsh)

* New translations simple_form.en.yml (Esperanto)

* New translations activerecord.en.yml (Esperanto)

* New translations en.yml (Malay)

* New translations devise.en.yml (Hindi)

* New translations doorkeeper.en.yml (Croatian)

* New translations en.yml (Estonian)

* New translations en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations activerecord.en.yml (Norwegian Nynorsk)

* New translations devise.en.yml (Norwegian Nynorsk)

* New translations doorkeeper.en.yml (Norwegian Nynorsk)

* New translations en.yml (Kazakh)

* New translations simple_form.en.yml (Kazakh)

* New translations activerecord.en.yml (Kazakh)

* New translations devise.en.yml (Kazakh)

* New translations doorkeeper.en.yml (Kazakh)

* New translations simple_form.en.yml (Estonian)

* New translations activerecord.en.yml (Hindi)

* New translations activerecord.en.yml (Estonian)

* New translations devise.en.yml (Estonian)

* New translations doorkeeper.en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations simple_form.en.yml (Latvian)

* New translations activerecord.en.yml (Latvian)

* New translations devise.en.yml (Latvian)

* New translations doorkeeper.en.yml (Latvian)

* New translations en.yml (Hindi)

* New translations devise.en.yml (Esperanto)

* New translations doorkeeper.en.yml (Esperanto)

* New translations activerecord.en.yml (Sinhala)

* New translations devise.en.yml (Sinhala)

* New translations doorkeeper.en.yml (Sinhala)

* New translations en.yml (Cornish)

* New translations en.yml (Kannada)

* New translations en.yml (Sinhala)

* New translations devise.en.yml (Kannada)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations devise.en.yml (Scottish Gaelic)

* New translations doorkeeper.en.yml (Scottish Gaelic)

* New translations en.yml (Asturian)

* New translations simple_form.en.yml (Asturian)

* New translations activerecord.en.yml (Asturian)

* New translations simple_form.en.yml (Sinhala)

* New translations doorkeeper.en.yml (Breton)

* New translations en.yml (Uyghur)

* New translations simple_form.en.yml (Tatar)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)

* New translations devise.en.yml (Chinese Traditional, Hong Kong)

* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Tatar)

* New translations activerecord.en.yml (Tatar)

* New translations devise.en.yml (Breton)

* New translations devise.en.yml (Tatar)

* New translations doorkeeper.en.yml (Tatar)

* New translations en.yml (Malayalam)

* New translations simple_form.en.yml (Malayalam)

* New translations activerecord.en.yml (Malayalam)

* New translations devise.en.yml (Malayalam)

* New translations doorkeeper.en.yml (Malayalam)

* New translations en.yml (Breton)

* New translations simple_form.en.yml (Breton)

* New translations activerecord.en.yml (Breton)

* New translations devise.en.yml (Asturian)

* New translations doorkeeper.en.yml (Asturian)

* New translations simple_form.en.yml (Kabyle)

* New translations activerecord.en.yml (Sardinian)

* New translations devise.en.yml (Sardinian)

* New translations doorkeeper.en.yml (Sardinian)

* New translations en.yml (Sanskrit)

* New translations en.yml (Kabyle)

* New translations activerecord.en.yml (Kabyle)

* New translations en.yml (Sardinian)

* New translations devise.en.yml (Kabyle)

* New translations doorkeeper.en.yml (Kabyle)

* New translations en.yml (Ido)

* New translations simple_form.en.yml (Ido)

* New translations devise.en.yml (Ido)

* New translations doorkeeper.en.yml (Ido)

* New translations en.yml (Taigi)

* New translations simple_form.en.yml (Sardinian)

* New translations doorkeeper.en.yml (Corsican)

* New translations en.yml (Occitan)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Occitan)

* New translations activerecord.en.yml (Occitan)

* New translations devise.en.yml (Occitan)

* New translations doorkeeper.en.yml (Occitan)

* New translations en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Serbian (Latin))

* New translations activerecord.en.yml (Serbian (Latin))

* New translations devise.en.yml (Serbian (Latin))

* New translations doorkeeper.en.yml (Serbian (Latin))

* New translations en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations devise.en.yml (Corsican)

* New translations devise.en.yml (Kurmanji (Kurdish))

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations activerecord.en.yml (Sorani (Kurdish))

* New translations devise.en.yml (Sorani (Kurdish))

* New translations doorkeeper.en.yml (Sorani (Kurdish))

* New translations en.yml (Corsican)

* New translations simple_form.en.yml (Corsican)

* New translations activerecord.en.yml (Corsican)

* New translations en.yml (Silesian)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations activerecord.en.yml (Standard Moroccan Tamazight)

* New translations devise.en.yml (Standard Moroccan Tamazight)

* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Vietnamese)

* New translations en.yml (Esperanto)

* New translations simple_form.en.yml (Esperanto)

* New translations simple_form.en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (Ido)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.json (Hebrew)

* New translations en.json (Hebrew)

* New translations en.yml (Hebrew)

* New translations activerecord.en.yml (German)

* New translations en.yml (Hebrew)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations doorkeeper.en.yml (Scottish Gaelic)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (Spanish)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations activerecord.en.yml (German)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Dutch)

* New translations en.yml (Dutch)

* New translations devise.en.yml (Dutch)

* New translations en.json (Dutch)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Slovak)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations activerecord.en.yml (Finnish)

* New translations doorkeeper.en.yml (Finnish)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations en.yml (German)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Russian)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations activerecord.en.yml (Norwegian Nynorsk)

* New translations devise.en.yml (Norwegian Nynorsk)

* New translations doorkeeper.en.yml (Norwegian Nynorsk)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Albanian)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations activerecord.en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Esperanto)

* New translations en.json (Slovak)

* New translations en.yml (Slovak)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-15 07:39:44 +09:00
Rens Groothuijsen e6979aa6d4
Add warning for sensitive audio posts (#17885) 2022-08-13 15:39:05 +02:00
Claire 3a9e3c1248 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-01 17:47:02 +02:00
prplecake 991349e6e2
[Glitch] Add ability to follow hashtags in web UI 2022-07-30 20:00:00 -05:00
prplecake bcb958c264
Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags 2022-07-30 18:54:55 -05:00
Eugen Rochko 4b36e47474
New Crowdin updates (#18855)
* New translations en.json (Hebrew)

* New translations en.json (Indonesian)

* New translations activerecord.en.yml (Hebrew)

* New translations activerecord.en.yml (Indonesian)

* New translations en.yml (Hebrew)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Hebrew)

* New translations activerecord.en.yml (Hebrew)

* New translations en.yml (Hebrew)

* New translations devise.en.yml (Hebrew)

* New translations en.json (Chinese Simplified)

* New translations en.json (Galician)

* New translations en.json (Punjabi)

* New translations en.json (Irish)

* New translations en.json (Hungarian)

* New translations en.json (Armenian)

* New translations en.json (Italian)

* New translations en.json (Georgian)

* New translations en.json (Korean)

* New translations en.json (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.json (Norwegian)

* New translations en.json (Polish)

* New translations en.json (Basque)

* New translations en.json (Russian)

* New translations en.json (Slovak)

* New translations en.json (Slovenian)

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Traditional)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Icelandic)

* New translations en.json (Finnish)

* New translations en.json (Frisian)

* New translations en.json (Hebrew)

* New translations en.json (Greek)

* New translations en.json (Albanian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Japanese)

* New translations en.json (Dutch)

* New translations en.json (Portuguese)

* New translations en.json (Chinese Simplified)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Romanian)

* New translations en.json (Afrikaans)

* New translations en.json (Arabic)

* New translations en.json (Bulgarian)

* New translations en.json (Catalan)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Sinhala)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Indonesian)

* New translations en.json (Esperanto)

* New translations en.json (Thai)

* New translations en.json (Welsh)

* New translations en.json (Persian)

* New translations en.json (Sorani (Kurdish))

* New translations en.json (Cornish)

* New translations en.json (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.json (Occitan)

* New translations en.json (Serbian (Latin))

* New translations en.json (Corsican)

* New translations en.json (Malayalam)

* New translations en.json (Sardinian)

* New translations en.json (Sanskrit)

* New translations en.json (Kabyle)

* New translations en.json (Ido)

* New translations en.json (Taigi)

* New translations en.json (Silesian)

* New translations en.json (Breton)

* New translations en.json (Tatar)

* New translations en.json (Tamil)

* New translations en.json (Kazakh)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.json (Marathi)

* New translations en.json (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Estonian)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Latvian)

* New translations en.json (Hindi)

* New translations en.json (Malay)

* New translations en.json (Telugu)

* New translations en.json (English, United Kingdom)

* New translations en.json (Uyghur)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Thai)

* New translations activerecord.en.yml (Thai)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Chinese Traditional)

* New translations en.json (Galician)

* New translations en.json (Greek)

* New translations en.json (Hungarian)

* New translations activerecord.en.yml (Chinese Simplified)

* New translations en.json (Polish)

* New translations en.json (Latvian)

* New translations en.json (Albanian)

* New translations simple_form.en.yml (Turkish)

* New translations activerecord.en.yml (Turkish)

* New translations en.json (Russian)

* New translations en.json (Turkish)

* New translations en.json (Portuguese)

* New translations en.json (Spanish)

* New translations en.json (Danish)

* New translations en.json (Russian)

* New translations en.json (Slovak)

* New translations en.json (Slovenian)

* New translations en.json (Ukrainian)

* New translations en.json (Portuguese)

* New translations en.json (Italian)

* New translations en.json (Polish)

* New translations en.json (Swedish)

* New translations en.json (Ukrainian)

* New translations en.json (Tamil)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Kabyle)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Ido)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Hebrew)

* New translations simple_form.en.yml (Hebrew)

* New translations en.yml (Hebrew)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.yml (Polish)

* New translations simple_form.en.yml (Polish)

* New translations activerecord.en.yml (Polish)

* New translations en.json (Korean)

* New translations en.json (Spanish)

* New translations en.json (Hindi)

* New translations en.json (Vietnamese)

* New translations activerecord.en.yml (Vietnamese)

* New translations en.json (Hindi)

* New translations en.json (German)

* New translations en.json (German)

* New translations en.yml (Esperanto)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.json (Esperanto)

* New translations activerecord.en.yml (French)

* New translations en.json (French)

* New translations en.json (French)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations activerecord.en.yml (Thai)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations activerecord.en.yml (Thai)

* New translations en.json (Thai)

* New translations activerecord.en.yml (Thai)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations doorkeeper.en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-30 22:09:18 +09:00
Mélanie Chauvel f174ce1048
Use slightly more margin between post buttons (under compose box) (#1816) 2022-07-27 19:17:15 +02:00
Claire 18346f4044 Add option to share CW toggle state across instances of a post 2022-07-25 11:57:09 +02:00
Claire eacde1a130 Regroup CW unfolding settings in their own section 2022-07-24 17:28:47 +02:00
Claire a5f81e1abd Improve interaction between out-of-CW attachments and collapsed toots 2022-07-24 13:16:03 +02:00
Claire db5b44330d Add explanation for some options in the local settings dialog 2022-07-24 11:11:38 +02:00
Claire 3f4e27ab6f Add local setting toggle to move media attachments outside CWs
Fixes #1812
2022-07-24 11:10:49 +02:00
Eugen Rochko 1ceebf2710 [Glitch] Change hashtag numbers to have clearer labels in web UI
Port f5d8501138 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:41:39 +02:00
Yamagishi Kazutoshi 969d805e86 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:39:57 +02:00
Eugen Rochko 9608e720a4
Add ability to follow hashtags in web UI (#18862) 2022-07-22 15:52:06 +02:00
Claire d799fe2082 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-22 09:58:35 +02:00
Eugen Rochko 76ff452306
Fix unicode regression in #18809 (#18863) 2022-07-22 03:17:56 +02:00
Eugen Rochko f5d8501138
Change hashtag numbers to have clearer labels in web UI (#18864) 2022-07-22 03:17:41 +02:00
Claire 726931fe4a
Fix /api/v1/tags/:id route constraints (#18854)
The constraint was applied prior to decoding, and rejected anything containing
the '%' character, which would be used for anything with non-ASCII unicode
characters.
2022-07-20 17:06:52 +02:00
Eugen Rochko f8b3e36929
New Crowdin updates (#18810)
* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Esperanto)

* New translations en.json (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations activerecord.en.yml (Chinese Simplified)

* New translations en.json (Thai)

* New translations en.json (Thai)

* New translations simple_form.en.yml (Thai)

* New translations activerecord.en.yml (Thai)

* New translations doorkeeper.en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations activerecord.en.yml (Dutch)

* New translations activerecord.en.yml (Turkish)

* New translations activerecord.en.yml (Polish)

* New translations activerecord.en.yml (Portuguese)

* New translations activerecord.en.yml (Russian)

* New translations activerecord.en.yml (Slovak)

* New translations activerecord.en.yml (Slovenian)

* New translations activerecord.en.yml (Albanian)

* New translations activerecord.en.yml (Serbian (Cyrillic))

* New translations activerecord.en.yml (Swedish)

* New translations activerecord.en.yml (Ukrainian)

* New translations activerecord.en.yml (Chinese Traditional)

* New translations activerecord.en.yml (Vietnamese)

* New translations activerecord.en.yml (Galician)

* New translations activerecord.en.yml (Icelandic)

* New translations activerecord.en.yml (Indonesian)

* New translations activerecord.en.yml (Persian)

* New translations activerecord.en.yml (Tamil)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations activerecord.en.yml (Norwegian)

* New translations activerecord.en.yml (Portuguese, Brazilian)

* New translations activerecord.en.yml (German)

* New translations activerecord.en.yml (Sinhala)

* New translations activerecord.en.yml (Romanian)

* New translations activerecord.en.yml (French)

* New translations activerecord.en.yml (Spanish)

* New translations activerecord.en.yml (Afrikaans)

* New translations activerecord.en.yml (Arabic)

* New translations activerecord.en.yml (Bulgarian)

* New translations activerecord.en.yml (Catalan)

* New translations activerecord.en.yml (Czech)

* New translations activerecord.en.yml (Danish)

* New translations activerecord.en.yml (Greek)

* New translations activerecord.en.yml (Korean)

* New translations activerecord.en.yml (Frisian)

* New translations activerecord.en.yml (Basque)

* New translations activerecord.en.yml (Finnish)

* New translations activerecord.en.yml (Hebrew)

* New translations activerecord.en.yml (Hungarian)

* New translations activerecord.en.yml (Armenian)

* New translations activerecord.en.yml (Italian)

* New translations activerecord.en.yml (Japanese)

* New translations activerecord.en.yml (Georgian)

* New translations activerecord.en.yml (Spanish, Mexico)

* New translations activerecord.en.yml (Bengali)

* New translations activerecord.en.yml (Sorani (Kurdish))

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Asturian)

* New translations activerecord.en.yml (Occitan)

* New translations activerecord.en.yml (Serbian (Latin))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Corsican)

* New translations activerecord.en.yml (Breton)

* New translations activerecord.en.yml (Sardinian)

* New translations activerecord.en.yml (Kabyle)

* New translations activerecord.en.yml (Ido)

* New translations activerecord.en.yml (Malayalam)

* New translations activerecord.en.yml (Marathi)

* New translations activerecord.en.yml (Hindi)

* New translations activerecord.en.yml (Croatian)

* New translations activerecord.en.yml (Norwegian Nynorsk)

* New translations activerecord.en.yml (Kazakh)

* New translations activerecord.en.yml (Estonian)

* New translations activerecord.en.yml (Latvian)

* New translations activerecord.en.yml (Tatar)

* New translations activerecord.en.yml (Welsh)

* New translations activerecord.en.yml (Esperanto)

* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)

* New translations activerecord.en.yml (Standard Moroccan Tamazight)

* New translations activerecord.en.yml (Catalan)

* New translations activerecord.en.yml (Danish)

* New translations activerecord.en.yml (Greek)

* New translations activerecord.en.yml (Latvian)

* New translations en.yml (Polish)

* New translations simple_form.en.yml (Polish)

* New translations activerecord.en.yml (Afrikaans)

* New translations activerecord.en.yml (Korean)

* New translations activerecord.en.yml (Polish)

* New translations en.yml (Esperanto)

* New translations activerecord.en.yml (Russian)

* New translations activerecord.en.yml (Italian)

* New translations activerecord.en.yml (Ukrainian)

* New translations activerecord.en.yml (Slovenian)

* New translations activerecord.en.yml (Portuguese)

* New translations activerecord.en.yml (Chinese Traditional)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations activerecord.en.yml (Galician)

* New translations activerecord.en.yml (Polish)

* New translations activerecord.en.yml (Hungarian)

* New translations activerecord.en.yml (Albanian)

* New translations en.yml (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations activerecord.en.yml (Icelandic)

* New translations en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations devise.en.yml (Korean)

* New translations activerecord.en.yml (Ido)

* New translations activerecord.en.yml (Spanish)

* New translations activerecord.en.yml (Chinese Simplified)

* Run `bundle exec i18n-tasks normalize`

* Fix syntax

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-20 21:21:57 +09:00
Yamagishi Kazutoshi d5ca204e89
Bump react-redux-loading-bar from 4.0.8 to 5.0.4 (#18562) 2022-07-20 20:56:44 +09:00
Jeong Arm 7205098ccf [Glitch] Fix badge color not affected
Port f248d95be2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-19 16:11:40 +02:00
Claire 3a516acfc2 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-19 16:08:59 +02:00
Jeong Arm f248d95be2
Fix badge color not affected (#18826)
* Fix badge color not affected

* Generate user role css
2022-07-19 01:06:11 +02:00
Jeremy Kescher ec83e2a35e
Fix missing scope for current_user in _sidebar.html.haml (#18822)
Fixes https://github.com/mastodon/mastodon/issues/18821

Fix suggested by https://miaow.gay/@meganeko/108665430982072358
2022-07-18 08:41:50 +02:00
Jeong Arm ad489f865a
Fix custom.css html escaped (#18824) 2022-07-18 08:41:08 +02:00
Claire cd87d7dcef 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.
2022-07-17 22:07:20 +02:00
Eugen Rochko c3f0621a59
Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
Claire ecb3bb3256
Add support for editing labelling of one's own role (#18812)
Still disallow edition of rank or permissions
2022-07-17 13:37:30 +02:00