9576ef92c6
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>
2021-08-01 11:09:50 +09:00
e6e8696a5e
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>
2021-08-01 11:09:33 +09:00
359f8de2e8
Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-25 14:31:49 +02:00
2f6ff14198
[Glitch] Fix crashes with Microsoft Translate on Microsoft Edge
...
Port e9659ae031
2021-07-25 13:04:59 +02:00
34a573ac27
[Glitch] Add confirmation modal when closing media edit modal with unsaved changes
...
Port a8a7066e97
2021-07-25 12:59:03 +02:00
08139d3cd7
[Glitch] Fix “open” link of media modal not closing modal
...
Port af08229ff4
2021-07-25 12:51:33 +02:00
b5e10d07ff
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-25 12:48:48 +02:00
a8a7066e97
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
2021-07-25 01:14:43 +02:00
af08229ff4
Fix “open” link of media modal not closing modal ( #16524 )
2021-07-25 01:13:46 +02:00
1d67acb72f
Fix scoped order warning in RemoveStatusService ( #16531 )
...
Fixes “Scoped order is ignored, it's forced to be batch order.”
2021-07-24 14:41:46 +02:00
e9659ae031
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.
2021-07-23 02:53:17 +02:00
d8629e7b86
Add logging of S3-related errors ( #16381 )
2021-07-21 18:34:39 +02:00
c1d62c4c01
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>
2021-07-20 22:25:19 +09:00
b16d220ec9
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>
2021-07-20 22:25:09 +09:00
6994c57fed
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>
2021-07-20 22:24:57 +09:00
b89591453d
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>
2021-07-20 22:24:41 +09:00
6f569c7bbd
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>
2021-07-20 22:24:16 +09:00
2c5abee2b0
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>
2021-07-20 22:24:02 +09:00
a2df067f98
Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-19 12:09:41 +02:00
d1c87be8cf
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-17 17:45:35 +02:00
e54a65013d
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 .
2021-07-17 17:06:52 +02:00
211d5c3c30
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.
2021-07-15 15:56:58 +02:00
3dcf3f2a3a
Fix minor code quality issues ( #16502 )
2021-07-14 05:36:23 +02:00
30ce6e395c
Fix user email address being banned on self-deletion ( #16503 )
...
* Add tests
* Fix user email address being banned on self-deletion
Fixes #16498
2021-07-14 05:35:49 +02:00
e42ed4502f
Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-13 23:55:09 +02:00
fc500a6062
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.
2021-07-13 17:57:15 +02:00
31593d1426
Update CodeClimate badge in README ( #16501 )
2021-07-13 16:02:15 +02:00
5a1e072517
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
2021-07-13 15:46:20 +02:00
82bc8e7647
Merge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack
...
Fix boost/fav confirmation modals closing media modal
2021-07-13 15:45:21 +02:00
d3791cca0c
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
2021-07-13 15:45:17 +02:00
e4270cb55a
Please CodeClimate
2021-07-13 13:49:40 +02:00
19ea6618b1
Small scroll/history behavior fixup to take weird browser patterns into account
2021-07-13 13:21:00 +02:00
84fbe4d030
Refactor shouldUpdateScroll stuff
2021-07-13 12:51:06 +02:00
99f28c17de
Fix scroll handling with modals
2021-07-13 11:07:16 +02:00
6e3d5cbca2
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
2021-07-12 20:13:02 +02:00
c5b4e6b708
Add modal stack to allow better boost modal and media modal interaction.
2021-07-12 17:00:14 +02:00
ddf3f4cf85
Fix clicking on the pop-up player placeholder expanding the clicked toot
2021-07-12 16:24:53 +02:00
a85eb7d930
Fix follow suggestions scrolling on mobile view
...
Also simplify the CSS a bit and bring it closer to upstream.
2021-07-12 10:22:57 +02:00
0c6dfcf3de
Merge pull request #1563 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-11 22:38:06 +02:00
cdf20f4367
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
Upstream changed the fields returned by /api/v1/instance by adding a
`configuration` field holding a lot of useful information making our
`max_toot_chars` and `poll_limits` fields obsolete.
Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
MAX_CHARS which is defined differently in glitch-soc.
Ported upstream changes.
2021-07-11 21:41:23 +02:00
a2ce7508c9
Update docker-compose.yml ( #16489 )
2021-07-11 12:57:31 +02:00
7095c80373
Add ability to filter reports by origin of target account ( #16487 )
2021-07-11 11:01:38 +02:00
ca8ac1a639
Bump rubocop from 1.18.2 to 1.18.3 ( #16477 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.18.2 to 1.18.3.
- [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.2...v1.18.3 )
---
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>
2021-07-11 01:08:54 +09:00
5c112959aa
Bump sass from 1.35.1 to 1.35.2 ( #16478 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.35.1 to 1.35.2.
- [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.1...1.35.2 )
---
updated-dependencies:
- dependency-name: sass
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>
2021-07-11 01:08:40 +09:00
275fa4746b
Add `configuration` attribute to `GET /api/v1/instance` ( #16485 )
...
List various values like file size limits and supported mime types
2021-07-10 17:58:41 +02:00
3d5183e99c
Use ruby-2.7.4 ( #16481 )
...
Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781
2021-07-10 01:29:27 +02:00
f040b9aee3
Merge pull request #1562 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-08 19:53:43 +02:00
101f8616fe
[Glitch] Fix pop-in player display when poster has long username or handle
...
Port 1381e0e1d9
2021-07-08 16:23:09 +02:00
3160e050a9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/accounts/_header.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/directories/index.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
2021-07-08 16:17:19 +02:00
c4568e3b60
Bump rubocop from 1.18.1 to 1.18.2 ( #16470 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.18.1 to 1.18.2.
- [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.1...v1.18.2 )
---
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>
2021-07-08 14:37:18 +09:00
dependabot[bot]