about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-06-10Merge pull request #1356 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09Fix WebUI crash when processing accounts before page is loaded (#14015)ThibG
2020-06-09Disable dependabotThibaut Girka
2020-06-09Merge pull request #1350 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-09[Glitch] Fix WebUI crash when loading account data before page is loadedThibaut Girka
2020-06-09Disable E2EE-related routesThibaut Girka
Not that I think they are an issue, but the API is likely to change, and isn't versioned, so I don't want to that be an issue since we also don't have clear versioning in glitch-soc.
2020-06-09[Glitch] Add hotkey for toggling content warning composer fieldThibG
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09[Glitch] Improve rendering of emoji which do not contrast with backgroundThibG
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] FIX: filters ignore media descriptionsBen Lubar
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Hide sensitive preview cards with blurhashThibG
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Fix ref attr for react-textarea-autozsizeYamagishi Kazutoshi
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
2020-06-09Add hotkey for toggling content warning composer field (#13987)ThibG
2020-06-09Make domain block/silence/reject-media code more robust (#13424)ThibG
* Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.
2020-06-09Update “status” to “toot” for en.json (#13877)Bei Li
2020-06-09Improve rendering of emoji which do not contrast with background (#13772)ThibG
* Refactor list of emoji requiring added outlines so that it can be theme-specific * Split inaccessible emoji to emoji requiring an outline and ones that can be inverted * Drop the “silouhettes” from black emoji as they seem to have changed color * Add inaccessible emojis list for the light theme * Use bordered emoji variant instead of unreliable CSS
2020-06-09Improve wording and add titles on moderated servers section in /about/more ↵Mélanie Chauvel
(#13930)
2020-06-09Fix performance of follow import (#13836)Takeshi Umeda
2020-06-09Add e-mail-based sign in challenge for users with disabled 2FA (#14013)Eugen Rochko
2020-06-09Add limit parameter to rss (#13743)Takeshi Umeda
2020-06-09Add visibility parameter in share page (#13023)Takeshi Umeda
* Add visibility parameter in share page * Restrict to default privacy
2020-06-09Add emojis:generate_borders Rake task (#13773)leo60228
* Add emojis:generate_borders Rake task * Address review * Border all dark emoji * Combine stroke with filter to reduce artifacting * Cleanup Camera with Flash * Add stroke-linejoin="round" The previous filter and tweaks were effectively a poor imitation of it. There are no artifacts for any dark emoji now! * Set stroke-width using property This fixes old versions of Firefox. * Store emoji in string instead of array * Use separate arguments for each path segment * Remove "background: black;"
2020-06-09FIX: filters ignore media descriptions (#13837)Ben Lubar
* FIX: filters ignore media descriptions * remove parentheses to make codeclimate happy * combine the text and run the regular expression only once. https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581 * Fix use of “filter” instead of “compact”, fix coding style issues Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-06-08Bump rubocop from 0.85.0 to 0.85.1 (#14009)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.0 to 0.85.1. - [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.85.0...v0.85.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump react-immutable-pure-component from 1.2.3 to 2.2.2 (#14010)dependabot[bot]
Bumps [react-immutable-pure-component](https://github.com/Monar/react-immutable-pure-component) from 1.2.3 to 2.2.2. - [Release notes](https://github.com/Monar/react-immutable-pure-component/releases) - [Commits](https://github.com/Monar/react-immutable-pure-component/compare/v1.2.3...v2.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump regexp_parser from 1.7.0 to 1.7.1 (#14008)dependabot[bot]
Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.7.0...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump pbkdf2 from 3.0.17 to 3.1.1 (#14007)dependabot[bot]
Bumps [pbkdf2](https://github.com/crypto-browserify/pbkdf2) from 3.0.17 to 3.1.1. - [Release notes](https://github.com/crypto-browserify/pbkdf2/releases) - [Commits](https://github.com/crypto-browserify/pbkdf2/compare/v3.0.17...v3.1.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump sanitize from 5.1.0 to 5.2.0 (#14006)dependabot[bot]
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump fog-openstack from 0.3.7 to 0.3.10 (#13996)dependabot[bot]
Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.3.7 to 0.3.10. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.7...v0.3.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08Bump @babel/plugin-transform-runtime from 7.9.0 to 7.10.1 (#14003)dependabot[bot]
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.9.0 to 7.10.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-runtime) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07Bump aws-sdk-s3 from 1.66.0 to 1.67.1 (#14000)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.66.0 to 1.67.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-06-07Bump copy-webpack-plugin from 6.0.1 to 6.0.2 (#13999)dependabot[bot]
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07Bump is-regex from 1.0.5 to 1.1.0 (#13998)dependabot[bot]
Bumps [is-regex](https://github.com/ljharb/is-regex) from 1.0.5 to 1.1.0. - [Release notes](https://github.com/ljharb/is-regex/releases) - [Changelog](https://github.com/inspect-js/is-regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/ljharb/is-regex/compare/v1.0.5...v1.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07Bump aws-sdk-core from 3.96.1 to 3.98.0 (#13992)dependabot[bot]
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.96.1 to 3.98.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-06-07Bump @babel/preset-react from 7.9.4 to 7.10.1 (#13995)dependabot[bot]
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.9.4 to 7.10.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-preset-react) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Hide sensitive preview cards with blurhash (#13985)ThibG
* Use preview card blurhash in WebUI * Handle sensitive preview cards
2020-06-06Bump websocket-extensions from 0.1.3 to 0.1.4 (#13988)dependabot[bot]
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Update dependabot.yml (Fix #13939) (#13990)Shlee
* Update dependabot.yml * Update dependabot.yml
2020-06-06Bump jest-cli from 25.4.0 to 25.5.4 (#13977)dependabot[bot]
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli) from 25.4.0 to 25.5.4. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.5.4/packages/jest-cli) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump babel-eslint from 10.0.3 to 10.1.0 (#13983)dependabot[bot]
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.3 to 10.1.0. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump terser-webpack-plugin from 3.0.1 to 3.0.3 (#13978)dependabot[bot]
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.1 to 3.0.3. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.1...v3.0.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump react-event-listener from 0.6.5 to 0.6.6 (#13982)dependabot[bot]
Bumps [react-event-listener](https://github.com/oliviertassinari/react-event-listener) from 0.6.5 to 0.6.6. - [Release notes](https://github.com/oliviertassinari/react-event-listener/releases) - [Changelog](https://github.com/oliviertassinari/react-event-listener/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliviertassinari/react-event-listener/compare/v0.6.5...v0.6.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump caniuse-lite from 1.0.30001066 to 1.0.30001078 (#13981)dependabot[bot]
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001066 to 1.0.30001078. - [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.30001066...v1.0.30001078) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump vm-browserify from 1.1.0 to 1.1.2 (#13979)dependabot[bot]
Bumps [vm-browserify](https://github.com/substack/vm-browserify) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/substack/vm-browserify/releases) - [Changelog](https://github.com/browserify/vm-browserify/blob/master/CHANGELOG.md) - [Commits](https://github.com/substack/vm-browserify/compare/v1.1.0...v1.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump object.entries from 1.1.1 to 1.1.2 (#13974)dependabot[bot]
Bumps [object.entries](https://github.com/es-shims/Object.entries) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/es-shims/Object.entries/releases) - [Changelog](https://github.com/es-shims/Object.entries/blob/master/CHANGELOG.md) - [Commits](https://github.com/es-shims/Object.entries/compare/v1.1.1...v1.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump ejs from 2.7.1 to 2.7.4 (#13973)dependabot[bot]
Bumps [ejs](https://github.com/mde/ejs) from 2.7.1 to 2.7.4. - [Release notes](https://github.com/mde/ejs/releases) - [Changelog](https://github.com/mde/ejs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mde/ejs/compare/v2.7.1...v2.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump postcss-load-config from 2.0.0 to 2.1.0 (#13972)dependabot[bot]
Bumps [postcss-load-config](https://github.com/michael-ciniawsky/postcss-load-config) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/michael-ciniawsky/postcss-load-config/releases) - [Changelog](https://github.com/michael-ciniawsky/postcss-load-config/blob/master/CHANGELOG.md) - [Commits](https://github.com/michael-ciniawsky/postcss-load-config/compare/v2.0.0...v2.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06Bump aws-partitions from 1.322.0 to 1.325.0 (#13968)dependabot[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.322.0 to 1.325.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>
generated by cgit-pink (git 2.37.1) at 2024-12-28 01:58:38 +0000