Claire
8cb9cfb0ab
Add tootctl accounts migrate ( #22330 )
...
* Add tootctl accounts replay-migration
Fixes #22281
* Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
2023-01-13 17:00:23 +01:00
Darius Kazemi
2fa96eee25
Add peers API endpoint toggle to Server Settings ( #22810 )
...
* Add peers endpoint toggle to Server Settings
This places the toggle under "Discovery" and expands the hint text to explain further what the endpoint is used for. Added a "Recommended" tag since it was recommended in v3 before it was removed.
Fixes https://github.com/mastodon/mastodon/issues/22222
* i18n normalize step
2023-01-13 16:43:17 +01:00
Carl Schwan
27751cd101
Allow changing hide_collections setting with the api ( #22790 )
...
* Allow changing hide_collections setting with the api
This is currently only possible with app/controllers/settings/profiles_controller.rb
and is the only difference in the allowed parameter between the two controllers
* Fix the lint issue
* Use normal indent
2023-01-13 16:40:21 +01:00
David Freedman
4d0985ce9c
Don't crash on unobtainable avatars ( #22462 )
2023-01-13 16:40:06 +01:00
nametoolong
e9516a38fe
Remove title from mailer layout ( #23078 )
2023-01-13 15:12:26 +01:00
Claire
e5b34ec365
Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-13 12:26:34 +01:00
Claire
703aab807c
Change wording of admin report handling actions ( #18388 )
...
* Change admin report handling UI to display appropriate text for remote reports
Change from “Decide which action to take to resolve this report. If you take a
punitive action against the reported account, an e-mail notification will be
sent to them, except when the Spam category is selected.” to “Decide which
action to take to resolve this report. This will only affect how your server
communicates with this remote account and handle its content.”
* Reword admin actions descriptions to make clear which admin actions close reports
2023-01-13 11:03:14 +01:00
Claire
64952cef52
Fix crash when marking statuses as sensitive while some statuses are deleted ( #22134 )
...
* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments
* Fix crash when marking statuses as sensitive while some statuses are deleted
Fixes #21910
* Fix multiple strikes being created for a single report when selecting “Mark as sensitive”
* Add tests
2023-01-13 10:46:52 +01:00
Claire
138f3f1e8c
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-13 10:31:52 +01:00
Claire
aadf68654a
Fix incorrect env file generation in mastodon:setup ( #23072 )
...
Regression from #23012
2023-01-13 10:17:07 +01:00
Claire
05e9c71cfc
[Glitch] Remove hardcoded width from dropdown overlays
...
Port ff5f21d505
2023-01-12 17:48:10 +01:00
Claire
97cb17d6a2
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-12 17:47:42 +01:00
Claire
ff5f21d505
Remove hardcoded width from dropdown overlays ( #23062 )
...
* Remove hardcoded width from dropdown overlays
* Fix emoji picker position
2023-01-12 16:43:02 +01:00
Claire
1d60edd82a
Change wording of the OAuth scopes descriptions ( #22491 )
...
- change `all` from “Everything” to “Full access to your Mastodon account”
- change `follow` from “Relationships” to “Follows, Mutes and Blocks”
2023-01-12 14:11:55 +01:00
Peter Simonsson
37cd05b115
[Glitch] Fix dropdown menu positions when scrolling
...
Port 9d20c31f9c
2023-01-12 11:18:22 +01:00
Claire
43b9c4c0a7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Minor upstream refactor moved hook definitions around,
and glitch-soc has an extra `before_create`.
Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
Minor upstream refactor changed a block in which glitch-soc
had one extra call to handle direct timelines.
Adapted changes to keep glitch-soc's extra call.
2023-01-12 10:15:46 +01:00
Claire
614dd22095
Fix sanitizer parsing link text as HTML when stripping unsupported links ( #22558 )
2023-01-11 22:21:10 +01:00
Markus Unterwaditzer
b7f37e68ad
fix: allow verification when page size exceeds 1MB (using HTML5 parser) ( #22879 )
...
* fix: allow verification when page size exceeds 1MB
Truncates the page after 1MB instead
Closes #15316
* switch to HTML5 parser, fix rubocop errors
* undo rubocop fixes
Co-authored-by: Chris Zubak-Skees <chriszs@gmail.com>
2023-01-11 21:59:13 +01:00
Peter Simonsson
9d20c31f9c
Fix dropdown menu positions when scrolling ( #22916 )
...
* Update react-overlays to latest version
* Fix breaking changes in dropdown menus
* Use react-overlays built-in arrow positioning feature
* Re-implemented `.dropdown-menu__arrow` to have a defined width and height to improve positioning
* Moved wrapping div (`.dropdown-menu` from `DropdownMenu` to `Dropdown`)
* Wrap button in a span to solve issue with ref
* Temporarily remove animations
* Fix breaking changes in emoji picker
* Wrap EmojiPickerMenu in a div where react-overlays’ ref is added
* Fix breaking changes in language dropdown
* Fix breaking changes in privacy dropdown
* Fix breaking changes in search form
* Add animations back using `@keyframes`
* Fix arrow color in light theme
* Fix linting issue
* Remove unused `mounted` state
* Remove `placement` state from components and redux
And remove the placement state from props of the menu components.
* Remove abolution position to fix flip issue
* Remove z-index to fix modals and overlay positions
* Fix lint issues
* Set placement in privacy and language components
Copy the placement state into the `PrivacyDropdown` and `LanguageDropdown` components, to apply correct styling to the buttons depending on which placement the Overlay has.
* Move `placement` state to correct component
2023-01-11 21:58:46 +01:00
Kaspar V
1cd04e5d77
Fix/remove calling private method with send in model ( #22951 )
...
* fix(status): remove send usage for private unlink_from_conversations
- make unlink_from_conversations public method
- rename unlink_from_conversations to unlink_from_conversations!
- fix send call on private method in statuses_vacuum and batched_remove_status_service
* fix(feeds_vacuum): replace find_in_batches with in_batches
because active record query results should be a little more efficient than
itterating with map and each. Postgres can grasp such lists of ids much quicker
than ruby can.
Will probably make allmost no difference, but cannot hurt either.
2023-01-11 21:57:24 +01:00
Claire
fdea93b6be
Fix $ not being escaped in .env.production file generated by mastodon:setup ( #23012 )
...
* Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup`
* Improve robustness of dotenv escaping
2023-01-11 21:53:11 +01:00
Claire
29c09ab523
Change trending tags admin interface to always show batch actions ( #23013 )
...
Fixes #22565
2023-01-11 21:51:43 +01:00
dependabot[bot]
f0dee1e988
Bump ws from 8.11.0 to 8.12.0 ( #23023 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.11.0 to 8.12.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.11.0...8.12.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
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>
2023-01-11 22:02:06 +09:00
dependabot[bot]
1a9c66acd8
Bump @babel/core from 7.20.7 to 7.20.12 ( #23020 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.20.7 to 7.20.12.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.20.12/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2023-01-11 21:50:01 +09:00
dependabot[bot]
29e856ffe7
Bump prettier from 2.8.1 to 2.8.2 ( #23022 )
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/prettier/prettier/releases )
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prettier/prettier/compare/2.8.1...2.8.2 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-patch
...
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>
2023-01-11 21:49:39 +09:00
dependabot[bot]
24b139da97
Bump immutable from 4.2.1 to 4.2.2 ( #23021 )
...
Bumps [immutable](https://github.com/immutable-js/immutable-js ) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/immutable-js/immutable-js/releases )
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md )
- [Commits](https://github.com/immutable-js/immutable-js/compare/v4.2.1...v4.2.2 )
---
updated-dependencies:
- dependency-name: immutable
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2023-01-11 21:47:00 +09:00
dependabot[bot]
b0e5ac153f
Bump postcss from 8.4.20 to 8.4.21 ( #23019 )
...
Bumps [postcss](https://github.com/postcss/postcss ) from 8.4.20 to 8.4.21.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.4.20...8.4.21 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2023-01-11 21:46:07 +09:00
dependabot[bot]
f4d469bd6b
Bump jsdom from 20.0.3 to 21.0.0 ( #23018 )
...
Bumps [jsdom](https://github.com/jsdom/jsdom ) from 20.0.3 to 21.0.0.
- [Release notes](https://github.com/jsdom/jsdom/releases )
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md )
- [Commits](https://github.com/jsdom/jsdom/compare/20.0.3...21.0.0 )
---
updated-dependencies:
- dependency-name: jsdom
dependency-type: direct:production
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>
2023-01-11 21:45:37 +09:00
dependabot[bot]
bd562db397
Bump utf-8-validate from 5.0.10 to 6.0.0 ( #23017 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.10 to 6.0.0.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.10...v6.0.0 )
---
updated-dependencies:
- dependency-name: utf-8-validate
dependency-type: direct:production
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>
2023-01-11 21:44:07 +09:00
Eugen Rochko
5715763495
New Crowdin updates ( #22953 )
...
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Belarusian)
* New translations en.json (Vietnamese)
* New translations en.json (Asturian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Danish)
* New translations en.json (Arabic)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Galician)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Hungarian)
* New translations en.yml (Russian)
* New translations en.json (Turkish)
* New translations devise.en.yml (Estonian)
* New translations en.json (Catalan)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations en.json (Finnish)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Czech)
* New translations en.json (Thai)
* New translations en.json (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Finnish)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* 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 (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* 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 Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* 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 (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* 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 (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Corsican)
* 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 (Standard Moroccan Tamazight)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Irish)
* New translations en.json (Latvian)
* New translations en.json (Spanish)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Belarusian)
* New translations en.json (Catalan)
* New translations en.json (Finnish)
* New translations en.json (Faroese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Finnish)
* New translations en.json (Dutch)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (German)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Portuguese)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Thai)
* New translations en.json (Estonian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Bulgarian)
* New translations en.json (Swedish)
* New translations en.json (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Portuguese)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Danish)
* New translations en.json (French)
* New translations en.json (Albanian)
* New translations en.yml (French)
* New translations en.yml (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.json (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Vietnamese)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Norwegian)
* New translations en.json (Norwegian Nynorsk)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Slovak)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Welsh)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Croatian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Portuguese)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-11 21:41:34 +09:00
Claire
8752cd2ff2
Merge pull request #2077 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-10 17:10:11 +01:00
Claire
d809d004b5
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-10 14:43:38 +01:00
Claire
7793096d58
Fix CSRF protection ( #23037 )
...
Fix regression from #23014
2023-01-10 14:33:40 +01:00
Holden Foreman
ef26a0bb9a
[Glitch] Fix footer link circle dividers' screen reader accessibility by adding aria-hidden
...
Port c2b8b81052
2023-01-10 09:39:19 +01:00
Akira Ouchi
54b6e2ce08
[Glitch] Add variable autoFocus to video
...
Port f57a144941
2023-01-10 09:39:19 +01:00
Claire
da32ef30ae
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed headers, and we have different ones.
Ported upstream's change.
2023-01-10 09:39:15 +01:00
Claire
99ecd6a106
Change referrer-policy to no-referrer application-wide ( #23014 )
2023-01-10 05:18:43 +01:00
Holden Foreman
c2b8b81052
Fix footer link circle dividers' screen reader accessibility by adding aria-hidden ( #22576 )
...
* Fix footer link circle dividers' screen reader accessibility by adding aria-hidden
* Remove a circle erroneously added in prev commit, and make code more DRY
2023-01-09 03:54:03 +01:00
Akira Ouchi
f57a144941
Add variable autoFocus to video ( #15281 ) ( #22778 )
...
* add variable autoFocus to video
* set autoFocus in video_modal.js
2023-01-09 03:52:37 +01:00
n0toose
bc41a73de0
Correct hashtag warning ( #22827 )
...
Posts with any visibility setting that is not 'Public' are prevented
from being listed under any hashtag.
2023-01-09 03:18:20 +01:00
Jim Myhrberg
a7218678f0
feat(puma): enable setting min puma threads in addition to max ( #21048 )
2023-01-06 07:55:58 +01:00
Darius Kazemi
b8408d85ea
Fix account search not returning followed accounts first ( #22956 )
...
* Make autosuggest for mentions return followed accounts first
This makes it so that (when elasticsearch is disabled) when a user types '@foo' in the compose box, they are first going to get accounts they follow ordered by the ranking algorithm, and then second they will get accounts they do not follow, also ordered by the ranking algorithm.
This makes behavior more consistent with user expectation and also with results when elasticsearch is enabled.
* Fix ranking order to correct direction
* One more fixup per @gargron suggestion
* Tweak to ranking to no longer include following modifier
2023-01-06 07:35:52 +01:00
Claire
0ab70a25e5
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-05 18:44:15 +01:00
Eugen Rochko
8dd07bf99a
New Crowdin updates ( #22901 )
...
* New translations en.json (Norwegian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Finnish)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Bulgarian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Finnish)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Esperanto)
* New translations en.json (Estonian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* 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 (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* 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 Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* 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 (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* 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 (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* 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 (Standard Moroccan Tamazight)
* Normalize
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Dutch)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Indonesian)
* New translations en.json (Latvian)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Serbian (Latin))
* New translations simple_form.en.yml (Galician)
* New translations en.json (Danish)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-06 01:03:53 +09:00
Claire
e08ebf920d
[Glitch] Add dropdown menu item to open admin interface for remote domains
...
Port c78d61f21a
2023-01-05 16:31:20 +01:00
Sean Whalen
a1eb5ed7b3
[Glitch] Replace hide toot with hide post
...
Port ca1fd89dfc
2023-01-05 15:15:27 +01:00
Holden Foreman
67b5d82b42
[Glitch] Add aria-hidden to content warning field when dimmed so that it is not confusing to screen reader users
...
Port 4515ec2696
2023-01-05 15:14:04 +01:00
Holden Foreman
786ab56927
[Glitch] Add aria-hidden to 'Hide image' button in MediaGallery since the button is useless to screen reader users
...
Port fffb5e0287
2023-01-05 15:12:33 +01:00
Jed Fox
b5d89ddcb3
[Glitch] Improve the contrast of the chart in “poll has ended” notifications
...
Port f84a12abdb
2023-01-05 15:11:23 +01:00
TAKAHASHI Shuuji
114f6bcd46
Remove object-fit polyfill for the old Microsoft Edge
...
Port 9d3270bdf6
2023-01-05 15:10:31 +01:00
