Commit graph

12431 commits

Author SHA1 Message Date
dependabot[bot]
0d258eaa10
Bump @babel/core from 7.10.2 to 7.10.3 (#14112)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.2 to 7.10.3.
- [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.10.3/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25 17:19:30 +09:00
dependabot[bot]
f0f1161939
Bump elliptic from 6.5.2 to 6.5.3 (#14115)
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25 17:16:59 +09:00
dependabot[bot]
7afc31d793
Bump es-abstract from 1.17.5 to 1.17.6 (#14117)
Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.5 to 1.17.6.
- [Release notes](https://github.com/ljharb/es-abstract/releases)
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.5...v1.17.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25 17:13:54 +09:00
Eugen Rochko
662a49dc3f
Fix various issues around OpenGraph representation of media (#14133)
- Fix audio attachments not being represented in OpenGraph tags
- Fix audio being represented as "1 image" in OpenGraph descriptions
- Fix video metadata being overwritten by paperclip-av-transcoder
- Fix embedded player not using Mastodon's UI
- Fix audio/video progress bars not moving smoothly
- Fix audio/video buffered bars not displaying correctly
2020-06-25 01:33:01 +02:00
ThibG
e9ff61ca07
Remove unused dependency on wavesurfer.js (#14136)
It's not used anymore now that the audio player design has changed again.
2020-06-24 22:54:06 +02:00
ThibG
ddcdddd6fc
Change streaming server to treat blank redis password as password-less auth (#14135)
Fixes #14131

Our `mastodon:setup` task defaults to a blank password rather than the
absence of password, but some versions of Redis reject blank password
authentication when authentication is possible without a password.

The Ruby code only uses the Redis password when it's not blank, so
do the same for the node.js part.
2020-06-24 22:25:23 +02:00
ThibG
8f4aff9b6f
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-06-24 17:06:26 +02:00
ThibG
72d193654b [Glitch] Fix very wide media attachments resulting in too thin a thumbnail
Port d469247083 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 16:01:28 +02:00
Takeshi Umeda
83bc9f68af [Glitch] Fix modifier key to keep the EmojiPicker on macOS
Port 434a6d0b15 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 15:56:43 +02:00
fuyu
51922d7ffa [Glitch] Fix unnecessary gap under of video modal
Port cb3c6d1780 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 15:55:53 +02:00
Thibaut Girka
aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
2020-06-24 15:33:41 +02:00
Eugen Rochko
bb9ca8a587
Fix audio/video/images/cards not reacting to window resizes in web UI (#14130)
* Fix audio/video/images/cards not reacting to window resizes in web UI

* Update app/javascript/mastodon/features/audio/index.js

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-06-24 10:25:32 +02:00
ThibG
d469247083
Fix very wide media attachments resulting in too thin a thumbnail (#14127)
Fixes #14094
2020-06-23 17:24:29 +02:00
ThibG
01a99f7ec7
Fix crash in MergeWorker (#14129)
Similarly to #12324, the code is passing an Account object where an id
is expected.
2020-06-23 16:40:01 +02:00
Thibaut Girka
5d12b63e79 Simplify filtering condition 2020-06-23 16:09:36 +02:00
ash lea
c1377049c6 never filter own posts from timeline 2020-06-23 16:09:36 +02:00
ThibG
791402af7c
never filter own posts from timeline (#14128)
Signed-off-by: Thibaut Girka <thib@sitedethib.com>

Co-authored-by: ash lea <example@thisismyactual.email>
2020-06-23 16:01:34 +02:00
Eugen Rochko
419ad6248b
Change volume control and download buttons in web UI (#14122)
* Fix audio download button not starting download in web UI

* Fix volume controls on audio and video players in web UI

* Remove download button from video player in web UI
2020-06-23 12:20:14 +02:00
ThibG
aaf91abffa
Fix audio player not working when media files are hosted on a different domain (#14118) 2020-06-22 19:24:16 +02:00
ThibG
c6904c0d37
Fix unique username constraint for local users not being enforced in database (#14099)
This should not be an issue in practice because of the Rails-level uniqueness
check, but local accounts having a NULL domain means the uniqueness constraint
did not apply to them (since no two NULL values are considered equal).
2020-06-21 12:41:38 +02:00
Eugen Rochko
75a2b8f815
Change design of audio players in web UI (#14095) 2020-06-21 02:27:19 +02:00
dependabot[bot]
f111b71d1c
Bump eslint-import-resolver-node from 0.3.3 to 0.3.4 (#14081)
Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/resolvers/node/v0.3.3...resolvers/node/v0.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:32:23 +09:00
dependabot[bot]
975c943432
Bump fast-glob from 3.2.2 to 3.2.4 (#14079)
Bumps [fast-glob](https://github.com/mrmlnc/fast-glob) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/mrmlnc/fast-glob/releases)
- [Commits](https://github.com/mrmlnc/fast-glob/compare/3.2.2...3.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:32:02 +09:00
dependabot[bot]
1b29574a54
Bump sass from 1.26.5 to 1.26.8 (#14078)
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.5 to 1.26.8.
- [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.26.5...1.26.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:30:09 +09:00
dependabot[bot]
25cd4998fe
Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072)
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.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-21 08:28:45 +09:00
dependabot[bot]
02fc97928c
Bump nearley from 2.19.3 to 2.19.4 (#14075)
Bumps [nearley](https://github.com/hardmath123/nearley) from 2.19.3 to 2.19.4.
- [Release notes](https://github.com/hardmath123/nearley/releases)
- [Commits](https://github.com/hardmath123/nearley/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:27:50 +09:00
dependabot[bot]
3bf3b4cb22
Bump electron-to-chromium from 1.3.448 to 1.3.475 (#14068)
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.448 to 1.3.475.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.448...v1.3.475)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:26:21 +09:00
dependabot[bot]
d22931454e
Bump caniuse-lite from 1.0.30001078 to 1.0.30001084 (#14083)
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001078 to 1.0.30001084.
- [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.30001078...v1.0.30001084)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-21 08:25:05 +09:00
Takeshi Umeda
434a6d0b15
Fix modifier key to keep the EmojiPicker on macOS (#14096) 2020-06-20 13:30:40 +02:00
fuyu
cb3c6d1780
Fix unnecessary gap under of video modal (#14098) 2020-06-20 13:30:27 +02:00
fuyu
a279acc730
Fix not working I18n on 2FA and Sign in token page (#14087) 2020-06-20 13:30:13 +02:00
ThibG
ac8a788370
Fix functional user requirements in whitelist mode (#14093)
Fixes #14092
2020-06-19 19:18:47 +02:00
ThibG
c7da2cc5a1
Merge pull request #1358 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-06-17 18:28:28 +02:00
Eugen Rochko
9a641a5a0e [Glitch] Add hints about incomplete remote content to web UI
Port 3e9dc4044b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:48:04 +02:00
ThibG
65a9b788fc [Glitch] Fix initial audio volume not corresponding to what's displayed
Port 755e8c76ab to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:20:14 +02:00
fuyu
45fbba2742 [Glitch] Fixed emoji detection problem to append border
Port b1484cf3ce to glitch-soc

Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:18:42 +02:00
Thibaut Girka
59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
2020-06-17 17:10:15 +02:00
dependabot[bot]
b1d492f30a
Bump parallel from 1.19.1 to 1.19.2 (#14069)
Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-17 20:18:43 +09:00
mayaeh
f56129a947
Suppress Redis#exists(key) warning (#14067) 2020-06-17 10:31:31 +02:00
dependabot[bot]
f5e6cbacf3
Bump capistrano from 3.14.0 to 3.14.1 (#14037)
* Bump capistrano from 3.14.0 to 3.14.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1)

Signed-off-by: dependabot[bot] <support@github.com>

* Bump capistrano from 3.14.0 to 3.14.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-06-17 06:31:30 +02:00
mayaeh
437cdf89e0
[Security] Bump rack from 2.2.2 to 2.2.3 (#14064) 2020-06-17 06:30:57 +02:00
dependabot[bot]
ee3e709e74
Bump sanitize from 5.2.0 to 5.2.1 (#14063)
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1.
- [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.2.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-17 10:15:54 +09:00
dependabot[bot]
06262afeb2
Bump parallel_tests from 2.32.0 to 3.0.0 (#14044)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-16 01:00:56 +09:00
dependabot[bot]
a26f9cc0b1
Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034)
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-16 00:57:20 +09:00
dependabot[bot]
764fc04957
Bump jest from 25.4.0 to 26.0.1 (#14056)
Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15 23:48:15 +09:00
ThibG
755e8c76ab
Fix initial audio volume not corresponding to what's displayed (#14057) 2020-06-15 16:43:30 +02:00
dependabot[bot]
df30002df8
Bump excon from 0.73.0 to 0.74.0 (#14046)
Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15 23:41:18 +09:00
dependabot[bot]
e009dcd1ab
Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15 23:38:23 +09:00
dependabot[bot]
0d5570b631
Bump css-loader from 3.5.3 to 3.6.0 (#14041)
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0.
- [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/v3.5.3...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15 23:37:30 +09:00
dependabot[bot]
a3a68445f1
Bump devise from 4.7.1 to 4.7.2 (#14045)
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15 23:31:04 +09:00