810945c95b
Fix logout link not working in safari ( #16574 )
3 years ago
0963f86e89
Fix trends layout ( #16570 )
3 years ago
d58e887e0f
Bump eslint from 7.31.0 to 7.32.0 ( #16550 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.31.0 to 7.32.0.
- [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.31.0...v7.32.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
4c472f5a41
Bump ws from 7.5.3 to 8.0.0 ( #16552 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.5.3 to 8.0.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.5.3...8.0.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
beade68f7a
Revert "Bump sidekiq-unique-jobs from 7.1.2 to 7.1.4 ( #16535 )" ( #16553 )
...
This reverts commit dc3c86bf69
3 years ago
f5659534e6
Bump dotenv from 9.0.2 to 10.0.0 ( #16306 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 9.0.2 to 10.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v9.0.2...v10.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
dc3c86bf69
Bump sidekiq-unique-jobs from 7.1.2 to 7.1.4 ( #16535 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.2 to 7.1.4.
- [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/compare/v7.1.2...v7.1.4 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
9449b5c8af
Bump oj from 3.12.1 to 3.12.2 ( #16536 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.12.1 to 3.12.2.
- [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.12.1...v3.12.2 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c205fe6cdf
Bump aws-sdk-s3 from 1.96.1 to 1.96.2 ( #16537 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.96.1 to 1.96.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
96f0ee2d67
Bump rubocop from 1.18.3 to 1.18.4 ( #16534 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.18.3 to 1.18.4.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.3...v1.18.4 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
e726be04e4
Bump brakeman from 5.0.4 to 5.1.1 ( #16538 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.0.4 to 5.1.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.0.4...v5.1.1 )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
1d97e5ceec
Bump sass from 1.35.2 to 1.36.0 ( #16540 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.35.2 to 1.36.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.35.2...1.36.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
300f0df524
Bump @babel/preset-env from 7.14.7 to 7.14.8 ( #16544 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.14.7 to 7.14.8.
- [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.14.8/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
1d041f164b
Bump npmlog from 4.1.2 to 5.0.0 ( #16539 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 4.1.2 to 5.0.0.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v4.1.2...v5.0.0 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
9c32217e9a
Bump @babel/runtime from 7.14.6 to 7.14.8 ( #16541 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.14.6 to 7.14.8.
- [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.14.8/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c98210d32f
Bump regenerator-runtime from 0.13.7 to 0.13.9 ( #16543 )
...
Bumps [regenerator-runtime](https://github.com/facebook/regenerator ) from 0.13.7 to 0.13.9.
- [Release notes](https://github.com/facebook/regenerator/releases )
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.7...regenerator-runtime@0.13.9 )
---
updated-dependencies:
- dependency-name: regenerator-runtime
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
dd4935df8c
Bump @babel/core from 7.14.6 to 7.14.8 ( #16542 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.14.6 to 7.14.8.
- [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.14.8/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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
505a8e0621
Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
8e1c822dc0
[Glitch] Fix crashes with Microsoft Translate on Microsoft Edge
...
Port 572ae686f0
3 years ago
c58ad61ffc
[Glitch] Add confirmation modal when closing media edit modal with unsaved changes
...
Port 4166ecfedb
3 years ago
7531593afa
[Glitch] Fix “open” link of media modal not closing modal
...
Port d65262ae8b
3 years ago
de0c97de2f
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
4166ecfedb
Add confirmation modal when closing media edit modal with unsaved changes ( #16518 )
...
* Add confirmation modal when closing media edit modal with unsaved changes
* Move focal point media state to redux so it does not get erased by confirmation dialog
* Change upload modal behavior to keep it open while saving changes
Instead of closing it immediately and losing changes if they fail to save…
* Make it work with react-intl 2.9
3 years ago
d65262ae8b
Fix “open” link of media modal not closing modal ( #16524 )
3 years ago
f67e4e70df
Fix scoped order warning in RemoveStatusService ( #16531 )
...
Fixes “Scoped order is ignored, it's forced to be batch order.”
3 years ago
572ae686f0
Fix crashes with Microsoft Translate on Microsoft Edge ( #16525 )
...
Fixes #16509
Microsoft Edge with translation enabled rewrites the DOM in ways that confuse
react and prevent it from working properly. Wrapping the offending parts in
a span avoids this issue.
3 years ago
b5e603c6ad
Add logging of S3-related errors ( #16381 )
3 years ago
f15216f599
Bump ws from 7.5.2 to 7.5.3 ( #16486 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.5.2 to 7.5.3.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.5.2...7.5.3 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8463fbe181
Bump oj from 3.11.8 to 3.12.1 ( #16493 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.8 to 3.12.1.
- [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.11.8...v3.12.1 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
442c516a87
Bump rubocop-rails from 2.11.2 to 2.11.3 ( #16494 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.2...v2.11.3 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
09e7a85cb0
Bump css-loader from 5.2.6 to 5.2.7 ( #16500 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.2.6...v5.2.7 )
---
updated-dependencies:
- dependency-name: css-loader
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
053aac860b
Bump json-ld-preloaded from 3.1.5 to 3.1.6 ( #16522 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.5...3.1.6 )
---
updated-dependencies:
- dependency-name: json-ld-preloaded
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
5e4eaa0a06
Bump eslint from 7.30.0 to 7.31.0 ( #16523 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.30.0 to 7.31.0.
- [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.30.0...v7.31.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c6d2022630
Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
977da6fee8
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
4235b0d031
Fix replying from modal ( #16516 )
...
Fixes #16515
Not using a router object somehow made `this.history` lag behind the real
browser history whenever pushing a new history item in `replyCompose`.
Not using the context-provided router in this case was an oversight made
when porting glitch-soc changes in #16499 .
3 years ago
9c1d3086af
Fix inefficiencies in auto-linking code ( #16506 )
...
The auto-linking code basically rewrote the whole string escaping non-ascii
characters in an inefficient way, and building a full character offset map
between the unescaped and escaped texts before sending the contents to
TwitterText's extractor.
Instead of doing that, this commit changes the TwitterText regexps to include
valid IRI characters in addition to valid URI characters.
3 years ago
1d79ecf729
Fix minor code quality issues ( #16502 )
3 years ago
1e452a10b8
Fix user email address being banned on self-deletion ( #16503 )
...
* Add tests
* Fix user email address being banned on self-deletion
Fixes #16498
3 years ago
686eb94ccd
Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
0495e0642e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream file has changed and we're quoting it.
Ported the changes.
- `README.md`:
Upstream file has changed but we have a completely different one.
Kept our version.
- `lib/mastodon/version.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
3 years ago
83d7f4785f
Update CodeClimate badge in README ( #16501 )
3 years ago
ab4c1478b6
Change references to tootsuite/mastodon to mastodon/mastodon ( #16491 )
...
* Change references to tootsuite/mastodon to mastodon/mastodon
* Remove obsolete test fixture
* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG
And a few other places
3 years ago
9d6d28fe65
Merge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack
...
Fix boost/fav confirmation modals closing media modal
3 years ago
628e5823c3
Improve modal flow and back button handling ( #16499 )
...
* Refactor shouldUpdateScroll passing
So far, shouldUpdateScroll has been manually passed down from the very top of
the React component hierarchy even though it is a static function common to
all ScrollContainer instances, so replaced that with a custom class extending
ScrollContainer.
* Generalize “press back to close modal” to any modal and to public pages
* Fix boost confirmation modal closing media modal
3 years ago
c23c585c0d
Please CodeClimate
3 years ago
f2cdced939
Small scroll/history behavior fixup to take weird browser patterns into account
3 years ago
3de58f0431
Refactor shouldUpdateScroll stuff
3 years ago
20fb69396f
Fix scroll handling with modals
3 years ago
a57b3f5f4b
Fix and simplify browser history handling in relation to modals
...
This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
potentially pushing one
3 years ago
Takeshi Umeda
Jeong Arm
dependabot[bot]
Yamagishi Kazutoshi
Claire
Eugen Rochko