about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-09-07Make composers button all aligned and the same size (#1843)Mélanie Chauvel
2022-09-02Fix regexp filtering in pinned community/public TLs (#1840)Claire
2022-09-02Fix audio always being re-encoded even for passthrough-eligible media (#1839)Una
2022-09-01Bump workbox-precaching from 6.5.3 to 6.5.4 (#19083)dependabot[bot]
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-precaching 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>
2022-09-01Bump workbox-window from 6.5.3 to 6.5.4 (#19088)dependabot[bot]
Bumps [workbox-window](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-window 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>
2022-09-01Bump workbox-strategies from 6.5.3 to 6.5.4 (#19089)dependabot[bot]
Bumps [workbox-strategies](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-strategies 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>
2022-09-01Bump eslint-plugin-promise from 6.0.0 to 6.0.1 (#19087)dependabot[bot]
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases) - [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md) - [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits) --- updated-dependencies: - dependency-name: eslint-plugin-promise 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>
2022-09-01Bump workbox-expiration from 6.5.3 to 6.5.4 (#19091)dependabot[bot]
Bumps [workbox-expiration](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-expiration 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>
2022-09-01Bump workbox-routing from 6.5.3 to 6.5.4 (#19092)dependabot[bot]
Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-routing 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>
2022-09-01Bump rails from 6.1.6 to 6.1.6.1 (#18831)dependabot[bot]
Bumps [rails](https://github.com/rails/rails) from 6.1.6 to 6.1.6.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.1.6...v6.1.6.1) --- updated-dependencies: - dependency-name: rails 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>
2022-09-01Bump sidekiq from 6.5.5 to 6.5.6 (#19081)dependabot[bot]
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.5 to 6.5.6. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v6.5.5...v6.5.6) --- updated-dependencies: - dependency-name: sidekiq 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>
2022-09-01Bump eslint-plugin-react from 7.30.1 to 7.31.1 (#19082)dependabot[bot]
Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.30.1 to 7.31.1. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.30.1...v7.31.1) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development 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>
2022-09-01Bump workbox-webpack-plugin from 6.5.3 to 6.5.4 (#19093)dependabot[bot]
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-webpack-plugin 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>
2022-08-31Fix position of “expand” icon in media modal on glitch-soc (#1838)Claire
2022-08-31Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)Claire
I failed to account for glitch-soc's theming system when merging from upstream.
2022-08-30Fix local settings navigation (#1836)Claire
The “filters” page was removed, but not from the navigation, which would offset everything.
2022-08-29Fix WebUI error in development mode (#19078)Claire
Caused by using JSX features without importing React
2022-08-29Fix WebUI error in development mode (#1835)Claire
Caused by using JSX features without importing React Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28Add regexp filter field to public timeline column settings (#1834)Claire
* 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-28Fix typos (#18604)luzpaz
* Fix typos Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,pixelx,ro` * Follow-up typo fix
2022-08-28Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-08-28[Glitch] Replace to `workbox-webpack-plugin` from `offline-plugin`Yamagishi Kazutoshi
Port 81e1cc5fece9a431c28ca648c2dd4b1b5f643f13 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)"Claire
This reverts commit af396fa35f589e1f759c7a3a0dad7932f1862309.
2022-08-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-28Change "Allow trends without prior review" setting to include statuses (#17977)Eugen Rochko
* Change "Allow trends without prior review" setting to include posts * Fix i18n-tasks
2022-08-28Change search API to be accessible without being logged in (#18963)Eugen Rochko
But with the resolve option turned off
2022-08-28Change following and followers API to be accessible without being logged in ↵Eugen Rochko
(#18964)
2022-08-28Add admin API for managing e-mail domain blocks (#19066)Eugen Rochko
2022-08-28Add admin API for managing canonical e-mail blocks (#19067)Eugen Rochko
2022-08-27Add admin API for managing IP blocks (#19065)Eugen Rochko
2022-08-27Fix crash when adding a new filter (#18894)Claire
Fixes #18742
2022-08-27Update docker-compose.yml (#19063)Shlee
2022-08-27Fix react warning on notifications column (#1832)Jeong Arm
2022-08-27Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062)Claire
Fixes #19060
2022-08-26Add rel="noopener" to links to remote profiles (#19014)Shlee
* Update timeline_hint.js * Update timeline_hint.js
2022-08-26Fix "select all matching items" being offered when all items are on the page ↵Eugen Rochko
(#19054)
2022-08-25Remove preference to aggregate reblogs in home/list feeds (#18112)Eugen Rochko
2022-08-25Remove digest e-mails (#17985)Eugen Rochko
* Remove digest e-mails * Remove digest-related code
2022-08-25Add ability to select all accounts matching search for batch actions (#19053)Eugen Rochko
2022-08-25Add meta tag for official iOS app (#16599)Eugen Rochko
2022-08-26Bump addressable from 2.8.0 to 2.8.1 (#19033)dependabot[bot]
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.8.0...addressable-2.8.1) --- updated-dependencies: - dependency-name: addressable 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>
2022-08-26Bump oj from 3.13.20 to 3.13.21 (#19031)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.13.20 to 3.13.21. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.13.20...v3.13.21) --- updated-dependencies: - dependency-name: oj 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>
2022-08-25Add audit log entries for user roles (#19040)Eugen Rochko
* Refactor audit log schema * Add audit log entries for user roles
2022-08-25Bump puma from 5.6.4 to 5.6.5 (#19042)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 5.6.4 to 5.6.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.4...v5.6.5) --- updated-dependencies: - dependency-name: puma 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>
2022-08-25Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)Yamagishi Kazutoshi
2022-08-25Merge pull request #1830 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-08-25[Glitch] Fix quickly switching notification filters resulting in empty or ↵Claire
incorrect list Port 55bef1e34fc3b07ed7f762d565a161e74e128016 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25[Glitch] Fix “Filter this post” potentially listing deleted filtersClaire
Port 2cae5f5b8d4d0702fe9835a0ce2782f238755d0c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-08-25Fix quickly switching notification filters resulting in empty or incorrect ↵Claire
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.