about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-11-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.
2020-11-08Add support for reversible suspensions through ActivityPub (#14989)Eugen Rochko
2020-11-07Merge pull request #1453 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-11-07[Glitch] Add limitation of image's max zoom rate (max to the original size ↵Mashiro
of image) Port f720af6b721b773e68c00a546256ff20eeb3226d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-07[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1dependabot[bot]
Port e16b0fb15a7ef2607f080e8c0b884c1cf37e5ebb to glitch-soc Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-11-07Fix crashes in SuspendAccountService/UnsuspendAccountService (#15100)ThibG
* Fix crashes in SuspendAccountService/UnsuspendAccountService * Catch filesystem errors
2020-11-07Fix suspension/unsuspension not working because of FeedManager change (#15099)ThibG
2020-11-06Fix cookies not having a SameSite attribute (#15098)Eugen Rochko
2020-11-06Add subresource integrity for JS and CSS assets (#15096)Eugen Rochko
Fix #2744
2020-11-04Display “Show newer” and “Show older” instead of “Show more” in ↵Mélanie Chauvel
public pages (#15052)
2020-11-04Change order of announcements in admin page to sort them newest-first (#15091)ThibG
* Change order of announcements in admin page to sort show newly-created first Fixes #15090 * Use reverse-chronological rather than creation date only
2020-11-04Add account sensitized (#14361)Takeshi Umeda
* Add account sensitized * Fix i18n normalize * Fix description and spec * Fix spec * Fix wording
2020-11-04Bump puma from 5.0.2 to 5.0.4 (#15085)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.4. - [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.0.2...v5.0.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Add limitation of image's max zoom rate (max to the original size of image) ↵Mashiro
(#15094) * limit image max scale rate to fit the actual image size * replace with MIN_SCALE * fix behavior on touch screen
2020-11-04Fix unsightly re-layout delay for media previewsThibaut Girka
2020-11-04Fix hiding video breaking playbackThibaut Girka
Also make the video player code closer to upstream
2020-11-05Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)dependabot[bot]
* Bump webpack-merge from 4.2.2 to 5.0.9 Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.0.9. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.0.9) Signed-off-by: dependabot[bot] <support@github.com> * Fix import path Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-11-05Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003)dependabot[bot]
* Bump detect-passive-events from 1.0.5 to 2.0.1 Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events) from 1.0.5 to 2.0.1. - [Release notes](https://github.com/rafgraph/detect-passive-events/releases) - [Commits](https://github.com/rafgraph/detect-passive-events/compare/v1.0.5...v2.0.1) Signed-off-by: dependabot[bot] <support@github.com> * Migrate to detect-passive-events v2 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-11-05Bump sass from 1.27.0 to 1.28.0 (#15082)dependabot[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.27.0 to 1.28.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.27.0...1.28.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-05Bump mini-css-extract-plugin from 1.2.0 to 1.2.1 (#15077)dependabot[bot]
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-05Bump eslint-plugin-jsx-a11y from 6.3.1 to 6.4.1 (#15078)dependabot[bot]
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.3.1 to 6.4.1. - [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.3.1...v6.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-05Bump react-redux from 7.2.1 to 7.2.2 (#15079)dependabot[bot]
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.1 to 7.2.2. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.1...v7.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-05Bump eslint from 7.12.0 to 7.12.1 (#15080)dependabot[bot]
Bumps [eslint](https://github.com/eslint/eslint) from 7.12.0 to 7.12.1. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.12.0...v7.12.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Bump compression-webpack-plugin from 6.0.3 to 6.0.4 (#15076)dependabot[bot]
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v6.0.3...v6.0.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Bump file-loader from 6.1.1 to 6.2.0 (#15075)dependabot[bot]
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.1.1 to 6.2.0. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.1.1...v6.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Bump wicg-inert from 3.0.3 to 3.1.0 (#15081)dependabot[bot]
Bumps [wicg-inert](https://github.com/WICG/inert) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/WICG/inert/releases) - [Commits](https://github.com/WICG/inert/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Bump sidekiq-unique-jobs from 6.0.24 to 6.0.25 (#15083)dependabot[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.24 to 6.0.25. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/commits/v6.0.25) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Bump bootsnap from 1.4.8 to 1.4.9 (#15086)dependabot[bot]
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.8 to 1.4.9. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.8...v1.4.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04Merge pull request #1450 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-11-04[Glitch] add mouse scroll lock in image expand viewMashiro
Port f645dad661ba033efdcdd6ca7597e7b8bc7f4f51 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04[Glitch] Add expand/compress image button on image view boxMashiro
Port 6a2db10f767879b9072b6c020ebadac4f985ed34 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04[Glitch] Fix width of content text fluctuating over timemayaeh
Port 2ae751f19d48c12e70a445ce1d01149866b56ce8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04[Glitch] Make visibility icon clickable as part of the time of a tootMélanie Chauvel
Port 1d07f51039625c2eafa7eb0b1b6d5a7f8cf00e41 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03[Glitch] Make click area of video/audio player buttons bigger in WebUIMélanie Chauvel
Port a5afbb62d25306dc9d28fa8d0e85edf02c63d2a3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03[Glitch] Fix some account media gallery items having empty labelsThibG
Port 9d023ed4f6d8a69699d14479d5e12132ea4f4cd2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03[Glitch] Fix wrong seek bar width on media playerfuyu
Port 8d7fbe7dd9b0a64915a96d342579ab80951be840 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03[Glitch] Make “Mark media as sensitive” properly translatableMélanie Chauvel
Port c5704e75ae1f64742d59747fd931ffcca7a4887d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-11-03add mouse scroll lock in image expand view (#15088)Mashiro
* add mouse scroll lock in image expand view * enhancement
2020-11-02Add expand/compress image button on image view box (#15068)Mashiro
* add zoom image button * enhance zoom algorithm & add translation * code structure * code structure * code structure * enhance grab performance * rm useless state * fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel * remove scroll lock on MouseWheelEvent * code structure * enhance algorithm and code structure * rm Gemfile.lock from tree * codeclimate * fix a stupid mistake
2020-11-02Fix postrgres secret name for cronjob (#15072)Patrice Ferlet
The cronjob tries to get key from `mastodon` secret instead of `mastodon-postgresql` - so the cronjob fails with this error: Error: couldn't find key postgresql-password in Secret [NS]/mastodon Another solution is to save the postgres password in mastodon secret, but that means that the password is placed in two places. Postgresql use <fullname>-postgresql name as secret name.
2020-11-01Tweak signature verification (#15069)ThibG
* Add more specific error message when request body digest is invalid This may help other implementors debug their implementation. * Relax Host parameter requirement to GET requests The only POST requests processed by Mastodon need objects/actors (including their host) to be explicitly mentioned in the request's body, so replaying a legitimate request to another host should not be a security issue. * Support Digest headers using multiple algorithms or lowercase alogirthm names
2020-11-01Fix some account media gallery items having empty labels (#15073)ThibG
Remove the labels entirely for images instead of putting an empty label.
2020-11-01Fix crash when viewing a profile with a filtered out pinned tootThibaut Girka
2020-11-01Fix poll ending notifications being created for each vote (#15071)ThibG
On a poll ending, notifications were created for each vote instead of for each voter.
2020-10-30Merge branch 'glitch' into mainStarfall
2020-10-30Show announcements in reverse chronological order (#15065)Darius Kazemi
2020-10-30Fix wrong seek bar width on media player (#15060)fuyu
2020-10-30Bump mini-css-extract-plugin from 0.11.3 to 1.2.0 (#15034)dependabot[bot]
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.11.3 to 1.2.0. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.11.3...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
generated by cgit-pink (git 2.37.1) at 2024-12-01 20:02:56 +0000