about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-01-17fix locale issueStarfall
2023-01-17Merge remote-tracking branch 'glitch/main'Starfall
2023-01-15Merge pull request #2081 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-01-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
2023-01-14Change confirm prompt for relationships management (#19411)Jeong Arm
* Change confirm prompt for relationships management * Add Korean translations * Apply suggestions from code review Co-authored-by: TobyWilkes <tobylwilkes@gmail.com> Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
2023-01-13Implement tootctl accounts prune (#18397)Jeong Arm
* Implement tootctl accounts prune * Optimise query Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13Allow admins to toggle public statistics API (#22833)Darius Kazemi
* Allow admins to toggle public statistics API * Normalize i18n Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13Add `tootctl accounts migrate` (#22330)Claire
* Add tootctl accounts replay-migration Fixes #22281 * Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
2023-01-13Add peers API endpoint toggle to Server Settings (#22810)Darius Kazemi
* 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-13Allow changing hide_collections setting with the api (#22790)Carl Schwan
* 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-13Don't crash on unobtainable avatars (#22462)David Freedman
2023-01-13Remove title from mailer layout (#23078)nametoolong
2023-01-13Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-01-13Change wording of admin report handling actions (#18388)Claire
* 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-13Fix crash when marking statuses as sensitive while some statuses are deleted ↵Claire
(#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-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-13Fix incorrect env file generation in mastodon:setup (#23072)Claire
Regression from #23012
2023-01-12[Glitch] Remove hardcoded width from dropdown overlaysClaire
Port f4a6365f55c3b16494337e0880b42108cc4a171a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-12Remove hardcoded width from dropdown overlays (#23062)Claire
* Remove hardcoded width from dropdown overlays * Fix emoji picker position
2023-01-12Change wording of the OAuth scopes descriptions (#22491)Claire
- change `all` from “Everything” to “Full access to your Mastodon account” - change `follow` from “Relationships” to “Follows, Mutes and Blocks”
2023-01-12[Glitch] Fix dropdown menu positions when scrollingPeter Simonsson
Port fd33bcb3b25d3eaf593ade0aa8709a1184fc254e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-11Fix sanitizer parsing link text as HTML when stripping unsupported links ↵Claire
(#22558)
2023-01-11fix: allow verification when page size exceeds 1MB (using HTML5 parser) (#22879)Markus Unterwaditzer
* 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-11Fix dropdown menu positions when scrolling (#22916)Peter Simonsson
* 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-11Fix/remove calling private method with send in model (#22951)Kaspar V
* 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-11Fix `$` not being escaped in `.env.production` file generated by ↵Claire
`mastodon:setup` (#23012) * Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup` * Improve robustness of dotenv escaping
2023-01-11Change trending tags admin interface to always show batch actions (#23013)Claire
Fixes #22565
2023-01-11Bump ws from 8.11.0 to 8.12.0 (#23023)dependabot[bot]
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-11Bump @babel/core from 7.20.7 to 7.20.12 (#23020)dependabot[bot]
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-11Bump prettier from 2.8.1 to 2.8.2 (#23022)dependabot[bot]
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-11Bump immutable from 4.2.1 to 4.2.2 (#23021)dependabot[bot]
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-11Bump postcss from 8.4.20 to 8.4.21 (#23019)dependabot[bot]
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-11Bump jsdom from 20.0.3 to 21.0.0 (#23018)dependabot[bot]
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-11Bump utf-8-validate from 5.0.10 to 6.0.0 (#23017)dependabot[bot]
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-11New Crowdin updates (#22953)Eugen Rochko
* 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-10Merge pull request #2077 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-01-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-10Fix CSRF protection (#23037)Claire
Fix regression from #23014
2023-01-10[Glitch] Fix footer link circle dividers' screen reader accessibility by ↵Holden Foreman
adding aria-hidden Port 2bcb081ce8ab42649932404f3a13f69a0b582af9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-10[Glitch] Add variable autoFocus to videoAkira Ouchi
Port 2195f21524270e50c00a6292f77dfe39342ff482 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.
2023-01-10Change referrer-policy to no-referrer application-wide (#23014)Claire
2023-01-09Fix footer link circle dividers' screen reader accessibility by adding ↵Holden Foreman
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-09Add variable autoFocus to video (#15281) (#22778)Akira Ouchi
* add variable autoFocus to video * set autoFocus in video_modal.js
2023-01-09Correct hashtag warning (#22827)n0toose
Posts with any visibility setting that is not 'Public' are prevented from being listed under any hashtag.
2023-01-06feat(puma): enable setting min puma threads in addition to max (#21048)Jim Myhrberg
2023-01-06Fix account search not returning followed accounts first (#22956)Darius Kazemi
* 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-05Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
generated by cgit-pink (git 2.37.1) at 2024-11-28 17:06:49 +0000