Claire
c3b64f4a84
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.
2021-06-30 00:42:52 +02:00
David Sterry
b4d598b554
Fix #16407 ( #16432 )
2021-06-27 22:31:28 +02:00
Yamagishi Kazutoshi
ec4c497c70
Replace to issue form ( #16429 )
2021-06-25 15:01:52 +02:00
Claire
5638aa90ee
Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-25 12:20:46 +02:00
Claire
40f2ef9a50
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-25 10:44:06 +02:00
Claire
da955a6533
Fix styling of boost button in media modal not reflecting ability to boost ( #16387 )
2021-06-25 04:45:30 +02:00
Claire
9e0305041f
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
2021-06-25 04:45:17 +02:00
Claire
6993e51247
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.
2021-06-25 04:45:04 +02:00
Claire
a7f37deca5
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 19:22:13 +02:00
Claire
8489dcf900
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 18:59:19 +02:00
dependabot[bot]
bc205aba48
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>
2021-06-25 00:55:34 +09:00
dependabot[bot]
7addac110a
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>
2021-06-24 23:57:03 +09:00
dependabot[bot]
4e43dd321c
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>
2021-06-24 23:56:43 +09:00
Claire
c4e561186c
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
2021-06-24 16:00:26 +02:00
Claire
af19c445ca
[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>
2021-06-24 15:43:04 +02:00
Claire
b1af97fcb3
Fix pop-up player not closing the moment a status is deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:18 +02:00
Claire
8082b6c3d8
Fix WebUI crash when a toot with a playing video gets deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:12 +02:00
Claire
3cc0b7c83a
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 15:16:38 +02:00
Claire
f0035140d7
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 08:08:02 +02:00
dependabot[bot]
b914532203
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>
2021-06-24 07:50:13 +09:00
dependabot[bot]
4ceea8ab76
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>
2021-06-24 07:49:56 +09:00
dependabot[bot]
c0371ad0bc
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>
2021-06-24 07:49:40 +09:00
dependabot[bot]
1dc847cc89
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>
2021-06-24 07:49:29 +09:00
dependabot[bot]
258dc948b9
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>
2021-06-24 07:48:37 +09:00
dependabot[bot]
d025f8ebd4
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>
2021-06-24 07:47:47 +09:00
Claire
4da47fc09f
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
2021-06-23 23:55:47 +02:00
Claire
9008d0312c
Add full user agent in tooltips for login activities ( #16428 )
...
Also adds timestamp in HTML itself to not rely on javascript
2021-06-23 16:42:23 +02:00
Claire
108745bda5
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-23 12:49:09 +02:00
Claire
4b1afb1fb7
Fix login date not showing up in login history by using “public” pack
2021-06-23 12:21:40 +02:00
Eugen Rochko
5deff6483a
[Glitch] Add authentication history
...
Port SCSS changes from 2067b0bf34
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-23 11:40:18 +02:00
Claire
1e5591bdde
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
Claire
01e5559b74
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>
2021-06-21 20:14:47 +02:00
Eugen Rochko
2067b0bf34
Add authentication history ( #16408 )
2021-06-21 17:07:30 +02:00
dependabot[bot]
7da4d99400
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>
2021-06-18 17:25:20 +09:00
dependabot[bot]
252174e598
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>
2021-06-18 16:54:24 +09:00
dependabot[bot]
19f04eaac2
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>
2021-06-18 16:04:38 +09:00
dependabot[bot]
09ea826bef
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>
2021-06-18 16:04:07 +09:00
dependabot[bot]
c00da740ac
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>
2021-06-18 14:41:52 +09:00
Claire
c79396c45f
Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-16 12:42:40 +02:00
Claire
aed9054222
[Glitch] Fix OCR failure when erroneous lang data is in cache
...
Port f530f2bb2a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-16 11:29:07 +02:00
Claire
ac3dd7cae6
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.
2021-06-16 11:24:55 +02:00
Claire
f530f2bb2a
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.
2021-06-15 22:11:07 +02:00
dependabot[bot]
5904ef3ac9
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>
2021-06-15 00:01:51 +09:00
dependabot[bot]
5d6e99f673
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>
2021-06-15 00:01:29 +09:00
dependabot[bot]
b636eed190
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>
2021-06-15 00:00:31 +09:00
dependabot[bot]
a45496066e
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>
2021-06-15 00:00:01 +09:00
dependabot[bot]
fedca2934d
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>
2021-06-14 23:59:46 +09:00
dependabot[bot]
f22862aabe
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>
2021-06-14 23:58:47 +09:00
dependabot[bot]
a5c16a484e
Bump strong_migrations from 0.7.6 to 0.7.7 ( #16393 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.6...v0.7.7 )
---
updated-dependencies:
- dependency-name: strong_migrations
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-06-14 23:57:17 +09:00
dependabot[bot]
e00ad693d1
Bump idn-ruby from 0.1.0 to 0.1.2 ( #16392 )
...
Bumps [idn-ruby](https://github.com/deepfryed/idn-ruby ) from 0.1.0 to 0.1.2.
- [Release notes](https://github.com/deepfryed/idn-ruby/releases )
- [Changelog](https://github.com/deepfryed/idn-ruby/blob/master/CHANGES )
- [Commits](https://github.com/deepfryed/idn-ruby/commits/v0.1.2 )
---
updated-dependencies:
- dependency-name: idn-ruby
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-06-14 23:56:57 +09:00