me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38492 commits 2 branches 0 tags 429 MiB
Commit graph

38492 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
723c73c3f2 Merge pull request #1361 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-06-24 17:06:26 +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
c0ad588857 [Glitch] Fix very wide media attachments resulting in too thin a thumbnail 
Port 90445230cd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 16:01:28 +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
26778b8c30 [Glitch] Fix modifier key to keep the EmojiPicker on macOS 
Port c0b52ac871 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:56:43 +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
2e48c4ae55 [Glitch] Fix unnecessary gap under of video modal 
Port 88cbcb5804 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:55:53 +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
c1eb60642b 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
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
d0dc37eadb 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
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
90445230cd Fix very wide media attachments resulting in too thin a thumbnail (#14127) 
Fixes #14094
 2020-06-23 17:24:29 +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
df13142cdd 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
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
a6ce37528e Simplify filtering condition 2020-06-23 16:09:36 +02:00
Thibaut Girka
5d12b63e79 Simplify filtering condition 2020-06-23 16:09:36 +02:00
ash lea
3489cb87b7 never filter own posts from timeline 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
6c42b23382 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
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
ce34c13aff 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
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
90477d7e4d Fix audio player not working when media files are hosted on a different domain (#14118) 2020-06-22 19:24:16 +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
6d4a71856b 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
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
563a77d0b4 Change design of audio players in web UI (#14095) 2020-06-21 02:27:19 +02:00
Eugen Rochko
75a2b8f815
Change design of audio players in web UI (#14095) 2020-06-21 02:27:19 +02:00
dependabot[bot]
e72d60ed6d 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]
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]
571ca9cd56 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]
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]
3f187b6260 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]
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]
0072b00e3c 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]
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]
71f92170d8 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]
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]
c6f474c0c4 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]
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]
8c169b2a7a 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
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
c0b52ac871 Fix modifier key to keep the EmojiPicker on macOS (#14096) 2020-06-20 13:30:40 +02:00
Takeshi Umeda
434a6d0b15
Fix modifier key to keep the EmojiPicker on macOS (#14096) 2020-06-20 13:30:40 +02:00
fuyu
88cbcb5804 Fix unnecessary gap under of video modal (#14098) 2020-06-20 13:30:27 +02:00
fuyu
cb3c6d1780
Fix unnecessary gap under of video modal (#14098) 2020-06-20 13:30:27 +02:00
fuyu
ad1dfea4fa Fix not working I18n on 2FA and Sign in token page (#14087) 2020-06-20 13:30:13 +02:00