about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-09-08Monsterfork v2 Kaiju Commit 2020.06.27.1 - 2020.09.05.5Fire Demon
2020-09-07Merge pull request #1418 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-09-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.
2020-09-04Remove obsolete IndexedDB operations from web UI (#14730)Eugen Rochko
Storing objects in IndexedDB was disabled in #7932, but we were still trying to read objects from it before making an API call
2020-09-04Fix various warnings in rspec (#14729)Eugen Rochko
2020-09-04Fix direct visibility style for light theme (#14727)Takeshi Umeda
2020-09-02Add outbox attribute to instance actor (#14721)ThibG
It's not useful for now, but it's required by ActivityPub
2020-09-02Added account featured tags API (#11817)Takeshi Umeda
2020-09-02Add featured hashtags as an ActivityPub collection (#11595)Eugen Rochko
2020-09-02Change S3 ACL in "tootctl media remove-orphans --fix-permissions" from fixed ↵Y.Yamashiro
value to environment file's value. (#14715)
2020-09-01Merge pull request #1417 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-09-01[Glitch] Update Tesseract.jsThibG
Port 5fc5a9f9f18872cb0f1b54359338b2e189dd2bb1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01[Glitch] Add border around 🐞 emojiThibG
Port JS change from f0b6ddd97948d9c443cd155cb8ccc497e0608117 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.
2020-09-01Change radio button design to be consistent with that of the directory explorerThibaut Girka
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01Capitalize replies_policy stringsThibaut Girka
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01Add configuration option to filter replies in lists (#9205)ThibG
* Add database support for list show-reply preferences * Add backend support to read and update list-specific show_replies settings * Add basic UI to set list replies setting * Add specs for list replies policy * Switch "cycling" reply policy link to a set of radio inputs * Capitalize replies_policy strings * Change radio button design to be consistent with that of the directory explorer
2020-09-01Change own direct-visibility statuses to be in the home feed again (#14711)Eugen Rochko
And remove highlighting in web UI Full circle from #8940
2020-09-01Fix threaded modeThibaut Girka
Fixes #1414
2020-09-01Bump uri-js from 4.2.2 to 4.4.0 (#14706)dependabot[bot]
Bumps [uri-js](https://github.com/garycourt/uri-js) from 4.2.2 to 4.4.0. - [Release notes](https://github.com/garycourt/uri-js/releases) - [Commits](https://github.com/garycourt/uri-js/compare/4.2.2...4.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump mini-css-extract-plugin from 0.9.0 to 0.11.0 (#14690)dependabot[bot]
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.9.0 to 0.11.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.9.0...v0.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Add `--fix-permissions` option to `tootctl media remove-orphans` (#14383)Eugen Rochko
2020-09-01Bump whatwg-url from 8.1.0 to 8.2.1 (#14688)dependabot[bot]
Bumps [whatwg-url](https://github.com/jsdom/whatwg-url) from 8.1.0 to 8.2.1. - [Release notes](https://github.com/jsdom/whatwg-url/releases) - [Commits](https://github.com/jsdom/whatwg-url/compare/v8.1.0...v8.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump loglevel from 1.6.8 to 1.7.0 (#14692)dependabot[bot]
Bumps [loglevel](https://github.com/pimterry/loglevel) from 1.6.8 to 1.7.0. - [Release notes](https://github.com/pimterry/loglevel/releases) - [Commits](https://github.com/pimterry/loglevel/compare/v1.6.8...v1.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump caniuse-lite from 1.0.30001117 to 1.0.30001120 (#14695)dependabot[bot]
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001117 to 1.0.30001120. - [Release notes](https://github.com/ben-eb/caniuse-lite/releases) - [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md) - [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001117...v1.0.30001120) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump querystringify from 2.1.1 to 2.2.0 (#14696)dependabot[bot]
Bumps [querystringify](https://github.com/unshiftio/querystringify) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/unshiftio/querystringify/releases) - [Commits](https://github.com/unshiftio/querystringify/compare/2.1.1...2.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump opener from 1.5.1 to 1.5.2 (#14698)dependabot[bot]
Bumps [opener](https://github.com/domenic/opener) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/domenic/opener/releases) - [Commits](https://github.com/domenic/opener/compare/v1.5.1...v1.5.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump side-channel from 1.0.2 to 1.0.3 (#14700)dependabot[bot]
Bumps [side-channel](https://github.com/ljharb/side-channel) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/ljharb/side-channel/releases) - [Changelog](https://github.com/ljharb/side-channel/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/side-channel/compare/v1.0.2...v1.0.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump @testing-library/jest-dom from 5.11.2 to 5.11.4 (#14703)dependabot[bot]
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.2 to 5.11.4. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.2...v5.11.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump postcss-calc from 7.0.2 to 7.0.3 (#14705)dependabot[bot]
Bumps [postcss-calc](https://github.com/postcss/postcss-calc) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/postcss/postcss-calc/releases) - [Changelog](https://github.com/postcss/postcss-calc/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss-calc/compare/7.0.2...v7.0.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump rubocop from 0.86.0 to 0.88.0 (#14412)dependabot[bot]
* Bump rubocop from 0.86.0 to 0.88.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix for latest RuboCop Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-09-01Bump aws-partitions from 1.362.0 to 1.363.0 (#14713)dependabot[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.362.0 to 1.363.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump hamlit from 2.11.0 to 2.11.1 (#14689)dependabot[bot]
Bumps [hamlit](https://github.com/k0kubun/hamlit) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/k0kubun/hamlit/releases) - [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md) - [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump aws-sdk-s3 from 1.78.0 to 1.79.1 (#14691)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.78.0 to 1.79.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump aws-sdk-core from 3.104.4 to 3.105.0 (#14694)dependabot[bot]
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.104.4 to 3.105.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump microformats from 4.2.0 to 4.2.1 (#14699)dependabot[bot]
Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump loofah from 2.6.0 to 2.7.0 (#14701)dependabot[bot]
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump parallel_tests from 3.1.0 to 3.2.0 (#14702)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.1.0...v3.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Bump oj from 3.10.12 to 3.10.13 (#14704)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.10.12 to 3.10.13. - [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.10.12...v3.10.13) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01Update Tesseract.js (#14708)ThibG
* [WiP] Update Tesseract.js - Update Tesseract.js to 2.2.1 - Use versioned file names - differentiate two progression states: preparing OCR and detecting picture * Get rid of copy-webpack-plugin
2020-08-31Fix crash when opening detailed view of a status you boostedThibaut Girka
2020-08-31Add border around 🐞 emoji (#14712)ThibG
2020-08-31Add back “Home” link to the “Getting Started” column when the ↵ThibG
“Home” column isn't mounted (#14707) * Add back "Home" link to "Getting started" when Home column isn't mounted * Fix keys in getting_started It should not matter much in practice as the list of items will only change extremely rarely, but having a `key` that corresponds to the actual item makes much more sense than having it be the index of the item within the list.
2020-08-31Fix limited follower id in fan-out-on-write service (#14709)Takeshi Umeda
2020-08-31Make Array-creation behavior of Paginable more predictable (#14687)Akihiko Odaki
* Make Array-creation behavior of Paginable more predictable Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it returns an Array if min_id option is present. The behavior caused problems fixed with the following commits: - 552e886b648faa2a2229d86c7fd9abc8bb5ff99c - b63ede5005d33b52266650ec716d345f166e2df0 - 64ef37b89de806f49cc59e011aa0ee2039c82c46 To prevent from recurring similar problems, this commit introduces two changes: - The scope now always returns an Array whether min_id option is present or not. - The scope is renamed to to_a_paginated_by_id to clarify it returns an Array. * Transform Paginable.to_a_paginated_by_id from a scope to a class method https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope > The method is intended to return an ActiveRecord::Relation object, which > is composable with other scopes. Paginable.to_a_paginated_by_id returns an Array and is not appropriate as a scope.
2020-08-30Merge pull request #1411 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-08-30Adapt 2FA changes to glitch-soc's theming systemThibaut Girka
2020-08-30[Glitch] Add WebAuthn as an alternative 2FA methodsantiagorodriguez96
Port CSS changes from e8d41bc2fe9418613cdc118c8674fc5fe7856685 Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] Fix: also use custom private boost icon for detailed statusTdxdxoz
Port a3ec9af9b009d4548e3e8f7369213883212a922a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30Minor fix & improvement for the Dockerfile (#14686)Kairui Song | 宋恺睿
* Dockerfile: Fix building with multiarch Tested on amd64 and arm64 * Reduce docker image size by clean up some unneeded source file
generated by cgit-pink (git 2.37.1) at 2024-11-22 06:03:33 +0000