a4c828f8e7
Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
ba8f4535e3
[Glitch] Hide /about/more footer link in limited federation mode
...
Port 7c27ccb8d8
4 years ago
d1780fb9a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Removed upstream, while we had a checkbox telling people to check if the
issue was present upstream. Removed the file as well.
4 years ago
7c27ccb8d8
Fix #16407 ( #16432 )
4 years ago
04a552f076
Replace to issue form ( #16429 )
4 years ago
ff3626269e
Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
a993ff6e2f
Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
9e5a1daa9b
Fix styling of boost button in media modal not reflecting ability to boost ( #16387 )
4 years ago
e592e47e19
Fix WebUI crash when a toot with a playing video gets deleted ( #16384 )
...
* Fix WebUI crash when a toot with a playing video gets deleted
* Fix pop-up player not closing the moment a status is deleted
4 years ago
07ff8cb019
Fix compression-webpack-plugin configuration ( #16356 )
...
compression-webpack-plugin 6.0.0 has changed how filenames were generated,
so from #14892 onward (Mastodon v3.3.0 and later), compressed files were
output to a file named `.gz` instead of the correct filenames.
4 years ago
0eebade48c
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
83b4e8584b
Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
9cd724a3b4
Bump rubocop from 1.16.1 to 1.17.0 ( #16424 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.16.1 to 1.17.0.
- [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.16.1...v1.17.0 )
---
updated-dependencies:
- dependency-name: rubocop
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>
4 years ago
afc170a231
Bump rubocop-rails from 2.10.1 to 2.11.0 ( #16419 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.10.1 to 2.11.0.
- [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.10.1...v2.11.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
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>
4 years ago
05a62819c7
Bump bindata from 2.4.8 to 2.4.10 ( #16430 )
...
Bumps [bindata](https://github.com/dmendel/bindata ) from 2.4.8 to 2.4.10.
- [Release notes](https://github.com/dmendel/bindata/releases )
- [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc )
- [Commits](https://github.com/dmendel/bindata/compare/v2.4.8...v2.4.10 )
---
updated-dependencies:
- dependency-name: bindata
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
62bf929684
Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash
...
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
4 years ago
b6f952ec5b
[Glitch] Fix styling of boost button in media modal not reflecting ability to boost
...
Port tootsuite#16387 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
f024f523b2
Fix pop-up player not closing the moment a status is deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
036ec18fb3
Fix WebUI crash when a toot with a playing video gets deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
2a4e44a725
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
86aca08ec6
Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
a6f03e179a
Bump @babel/runtime from 7.14.5 to 7.14.6 ( #16423 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.14.5 to 7.14.6.
- [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.6/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>
4 years ago
e724a3ea64
Bump eslint from 7.28.0 to 7.29.0 ( #16422 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.28.0 to 7.29.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.28.0...v7.29.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>
4 years ago
aab731e926
Bump oj from 3.11.5 to 3.11.6 ( #16421 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.5 to 3.11.6.
- [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.5...v3.11.6 )
---
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>
4 years ago
f2a1cf7af9
Bump sass from 1.34.1 to 1.35.1 ( #16420 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.34.1 to 1.35.1.
- [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.34.1...1.35.1 )
---
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>
4 years ago
31ec06bcf9
Bump @babel/core from 7.14.5 to 7.14.6 ( #16425 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.14.5 to 7.14.6.
- [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.6/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>
4 years ago
50ce660277
Bump ws from 7.4.6 to 7.5.0 ( #16426 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.4.6 to 7.5.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.4.6...7.5.0 )
---
updated-dependencies:
- dependency-name: ws
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>
4 years ago
1c21dcfa35
Fix newlines in accout notes added by the Move handler ( #16415 )
...
* Fix newlines in account notes added by the move handler
* Make MoveWorker more robust
4 years ago
262c7bcb57
Add full user agent in tooltips for login activities ( #16428 )
...
Also adds timestamp in HTML itself to not rely on javascript
4 years ago
776e00f193
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
979059fbc9
Fix login date not showing up in login history by using “public” pack
4 years ago
d10d1e5eac
[Glitch] Add authentication history
...
Port SCSS changes from d174d12c83
4 years ago
37fd9670a5
Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
63b807cffc
Fix serialization of followers/following counts when user hides their network ( #16418 )
...
* Add tests
* Fix serialization of followers/following counts when user hides their network
Fixes #16382
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
d174d12c83
Add authentication history ( #16408 )
4 years ago
946200b471
Bump @babel/plugin-proposal-decorators from 7.14.2 to 7.14.5 ( #16401 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.14.2 to 7.14.5.
- [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.5/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
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>
4 years ago
8da9afd60f
Bump @babel/plugin-transform-runtime from 7.14.3 to 7.14.5 ( #16394 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.14.3 to 7.14.5.
- [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.5/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-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>
4 years ago
71feb5b112
Bump @babel/plugin-transform-react-inline-elements ( #16406 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.12.13 to 7.14.5.
- [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.5/packages/babel-plugin-transform-react-inline-elements )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
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>
4 years ago
2a2d6880f0
Bump @babel/preset-react from 7.13.13 to 7.14.5 ( #16400 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.13.13 to 7.14.5.
- [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.5/packages/babel-preset-react )
---
updated-dependencies:
- dependency-name: "@babel/preset-react"
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>
4 years ago
f8033c8ac0
Bump @babel/preset-env from 7.14.4 to 7.14.5 ( #16402 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.14.4 to 7.14.5.
- [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.5/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>
4 years ago
a434f370f3
Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
6dd51448a6
[Glitch] Fix OCR failure when erroneous lang data is in cache
...
Port 8428faa085
4 years ago
4aa78027ea
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
glitch-specific one (redcarpet).
Ported upstream change.
4 years ago
8428faa085
Fix OCR failure when erroneous lang data is in cache ( #16386 )
...
Fixes #15472
If the Tesseract worker fails at any point, re-try with cache settings that
overwrite the cache. It is difficult to catch more precise errors as those
are pretty opaque and do not occur when loading lang data but when trying to
detect text.
4 years ago
ee91c8a3a1
Bump rubocop from 1.16.0 to 1.16.1 ( #16395 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.16.0 to 1.16.1.
- [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.16.0...v1.16.1 )
---
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>
4 years ago
318b18f46a
Bump doorkeeper from 5.5.1 to 5.5.2 ( #16391 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.1...v5.5.2 )
---
updated-dependencies:
- dependency-name: doorkeeper
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>
4 years ago
172153d223
Bump webpack-merge from 5.7.3 to 5.8.0 ( #16405 )
...
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge ) from 5.7.3 to 5.8.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases )
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.3...v5.8.0 )
---
updated-dependencies:
- dependency-name: webpack-merge
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>
4 years ago
67dc72f749
Bump aws-sdk-s3 from 1.96.0 to 1.96.1 ( #16398 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.96.0 to 1.96.1.
- [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>
4 years ago
930c7af2d9
Bump brakeman from 5.0.1 to 5.0.4 ( #16397 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.0.1 to 5.0.4.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/commits )
---
updated-dependencies:
- dependency-name: brakeman
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>
4 years ago
42dc78569f
Bump redis from 4.2.5 to 4.3.1 ( #16396 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.5 to 4.3.1.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.2.5...v4.3.1 )
---
updated-dependencies:
- dependency-name: redis
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>
4 years ago
Claire