]> cat aescling's git repositories - mastodon.git/log
cat aescling's git repositories / mastodon.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
mastodon.git
5 years ago[Glitch] Fix unnecessary re-rendering of various components when typing in web UI
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 18:36:36 +0000 (19:36 +0100)]
[Glitch] Fix unnecessary re-rendering of various components when typing in web UI

Partially port 9620ee90be7e04b3616ce4b851abb63dbba7af7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5 years ago[Glitch] rename replies_policy enumerables
commit | commitdiff | tree
trwnh [Wed, 9 Dec 2020 03:34:17 +0000 (21:34 -0600)]
[Glitch] rename replies_policy enumerables

Port front-end changes from 127c543a6e59d20de68e6760e952d18ed53578e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5 years ago[Glitch] Fix alert when failing to save timeline markers in web UI
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 02:23:43 +0000 (03:23 +0100)]
[Glitch] Fix alert when failing to save timeline markers in web UI

Port 59d943e152a36c693eddd6a6a3c1d9c956dba07b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Wed, 9 Dec 2020 13:42:33 +0000 (14:42 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agorename replies_policy enumerables (#15304)
commit | commitdiff | tree
trwnh [Wed, 9 Dec 2020 03:34:17 +0000 (21:34 -0600)]
rename replies_policy enumerables (#15304)

5 years agoFix missing pictureInPicture prop in detailed status container (#15309)
commit | commitdiff | tree
Takeshi Umeda [Wed, 9 Dec 2020 03:33:33 +0000 (12:33 +0900)]
Fix missing pictureInPicture prop in detailed status container (#15309)

5 years agoFix open media hotkey (#15308)
commit | commitdiff | tree
Jeong Arm [Tue, 8 Dec 2020 23:24:13 +0000 (08:24 +0900)]
Fix open media hotkey (#15308)

* Fix open media hotkey

* Update status.js

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
5 years agoFix the Open handler for PreviewCard (#15305)
commit | commitdiff | tree
Takeshi Umeda [Tue, 8 Dec 2020 11:07:54 +0000 (20:07 +0900)]
Fix the Open handler for PreviewCard (#15305)

5 years agoFix column swiping animation logic (#15301)
commit | commitdiff | tree
ThibG [Mon, 7 Dec 2020 19:07:24 +0000 (20:07 +0100)]
Fix column swiping animation logic (#15301)

From the start, swiping columns was highly unreliable because the logic
could change `ReactSwipeableViews`'s `animateTransitions` property
mid-swipe.

PR #11200 partially fixed this, but at the unintended cost of disabling the
swipe animation altogether.

This PR changes the logic behind `shouldAnimate` to only disable the swiping
animation at the end of a column change not initiated by `ReactSwipeableViews`.

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
5 years agoFix unnecessary re-rendering of various components when typing in web UI (#15286)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 18:36:36 +0000 (19:36 +0100)]
Fix unnecessary re-rendering of various components when typing in web UI (#15286)

5 years agoFix slow distinct queries where grouped queries are faster (#15287)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 11:08:30 +0000 (12:08 +0100)]
Fix slow distinct queries where grouped queries are faster (#15287)

About 2x speed-up on inboxes query

5 years agoFix not being able to open audio modal in web UI (#15283)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 03:29:37 +0000 (04:29 +0100)]
Fix not being able to open audio modal in web UI (#15283)

Fix #15280

Also adds the new action bar and blurhash-based background
color to audio and video modals

5 years agoFix alert when failing to save timeline markers in web UI (#15285)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 02:23:43 +0000 (03:23 +0100)]
Fix alert when failing to save timeline markers in web UI (#15285)

Fix #15267

5 years agoFix too low contrast on new media modal background in web UI (#15284)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Dec 2020 01:32:27 +0000 (02:32 +0100)]
Fix too low contrast on new media modal background in web UI (#15284)

Fix #15258

5 years agoFix remove number sign from account_featured_tags (#15277)
commit | commitdiff | tree
Takeshi Umeda [Sun, 6 Dec 2020 04:55:35 +0000 (13:55 +0900)]
Fix remove number sign from account_featured_tags (#15277)

5 years agoMerge pull request #1470 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Sat, 5 Dec 2020 21:03:28 +0000 (22:03 +0100)]
Merge pull request #1470 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix character count not ignoring hidden CW field
commit | commitdiff | tree
Mélanie Chauvel [Mon, 30 Nov 2020 11:09:34 +0000 (12:09 +0100)]
[Glitch] Fix character count not ignoring hidden CW field

Port 68775b60392152d32deda45a261bc1d4f848b44a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sat, 5 Dec 2020 16:33:29 +0000 (17:33 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.

5 years agoAdd favourite modal to light theme CSS
commit | commitdiff | tree
Starfall [Thu, 3 Dec 2020 21:49:29 +0000 (15:49 -0600)]
Add favourite modal to light theme CSS

5 years agoFix incorrect conditions for suspended accounts in Get API for account featured tags...
commit | commitdiff | tree
Takeshi Umeda [Fri, 4 Dec 2020 03:22:35 +0000 (12:22 +0900)]
Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270)

5 years agoFix account merging in maintenance script (#15264)
commit | commitdiff | tree
ThibG [Fri, 4 Dec 2020 01:23:51 +0000 (02:23 +0100)]
Fix account merging in maintenance script (#15264)

Also include AccountNote and AccountDeletionRequest to the list of classes
needing to be reassigned the merged account.

5 years agoChange public thread view to hide "Show thread" link (#15266)
commit | commitdiff | tree
ThibG [Wed, 2 Dec 2020 20:21:44 +0000 (21:21 +0100)]
Change public thread view to hide "Show thread" link (#15266)

Fixes #15262

5 years agoFix followers hash cache not being invalidated on account merge (#15256)
commit | commitdiff | tree
ThibG [Wed, 2 Dec 2020 20:20:00 +0000 (21:20 +0100)]
Fix followers hash cache not being invalidated on account merge (#15256)

Also clear relationships cache.

5 years agoFix tootctl ip_blocks add failing if not given a comment (#15263)
commit | commitdiff | tree
ThibG [Wed, 2 Dec 2020 20:19:41 +0000 (21:19 +0100)]
Fix tootctl ip_blocks add failing if not given a comment (#15263)

Fixes #15261

5 years agoFix Gemfile.lock breaking CI (#15257)
commit | commitdiff | tree
ThibG [Tue, 1 Dec 2020 11:34:33 +0000 (12:34 +0100)]
Fix Gemfile.lock breaking CI (#15257)

Unnecessary Ruby and Bundler version constraints got included in #15230

5 years agoFix changelog containing items from 3.2.1 twice (#15255)
commit | commitdiff | tree
Eugen Rochko [Tue, 1 Dec 2020 05:45:58 +0000 (06:45 +0100)]
Fix changelog containing items from 3.2.1 twice (#15255)

5 years agoBump version to 3.3.0rc1 (#15230)
commit | commitdiff | tree
Eugen Rochko [Tue, 1 Dec 2020 05:38:05 +0000 (06:38 +0100)]
Bump version to 3.3.0rc1 (#15230)

5 years agoFix `ku` locale not being right-to-left (#15252)
commit | commitdiff | tree
Eugen Rochko [Mon, 30 Nov 2020 22:02:32 +0000 (23:02 +0100)]
Fix `ku` locale not being right-to-left (#15252)

5 years agoFix character count not ignoring hidden CW field (#15236)
commit | commitdiff | tree
Mélanie Chauvel [Mon, 30 Nov 2020 11:09:34 +0000 (12:09 +0100)]
Fix character count not ignoring hidden CW field (#15236)

5 years agoUpdate Dockerfile (#15232)
commit | commitdiff | tree
Shlee [Sun, 29 Nov 2020 08:20:02 +0000 (18:50 +1030)]
Update Dockerfile (#15232)

5 years agoFix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228)
commit | commitdiff | tree
Eugen Rochko [Sat, 28 Nov 2020 04:17:53 +0000 (05:17 +0100)]
Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228)

5 years agoFix media modal crashing when media has no blurhash (#15229)
commit | commitdiff | tree
Eugen Rochko [Sat, 28 Nov 2020 02:37:01 +0000 (03:37 +0100)]
Fix media modal crashing when media has no blurhash (#15229)

5 years agoBump version to 3.2.1 (#15227)
commit | commitdiff | tree
Eugen Rochko [Fri, 27 Nov 2020 17:29:22 +0000 (18:29 +0100)]
Bump version to 3.2.1 (#15227)

5 years agoFix deletes not reaching every server that interacted with status (#15200)
commit | commitdiff | tree
Eugen Rochko [Fri, 27 Nov 2020 14:48:31 +0000 (15:48 +0100)]
Fix deletes not reaching every server that interacted with status (#15200)

Extract logic for determining ActivityPub inboxes to send deletes
to to its own class and explicitly include the person the status
replied to (even if not mentioned), people who favourited it, and
people who replied to it (though that one is still not recursive)

5 years agoFix media modal regression on public pages (#15221)
commit | commitdiff | tree
Eugen Rochko [Fri, 27 Nov 2020 14:41:58 +0000 (15:41 +0100)]
Fix media modal regression on public pages (#15221)

5 years agoFix post-migration warning about index corruption being too scary (#15223)
commit | commitdiff | tree
Eugen Rochko [Fri, 27 Nov 2020 14:41:43 +0000 (15:41 +0100)]
Fix post-migration warning about index corruption being too scary (#15223)

5 years agoChange media modals look in web UI (#15217)
commit | commitdiff | tree
Eugen Rochko [Fri, 27 Nov 2020 02:24:11 +0000 (03:24 +0100)]
Change media modals look in web UI (#15217)

- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar

5 years agoNew Crowdin updates (#15137)
commit | commitdiff | tree
Eugen Rochko [Thu, 26 Nov 2020 13:42:12 +0000 (14:42 +0100)]
New Crowdin updates (#15137)

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Sanskrit)
[ci skip]

* New translations en.json (Sanskrit)
[ci skip]

* New translations en.yml (Sardinian)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Urdu (Pakistan))
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Telugu)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.yml (Malay)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.json (Latvian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations simple_form.en.yml (Kazakh)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations simple_form.en.yml (Bengali)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations devise.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]

* New translations en.json (Standard Moroccan Tamazight)
[ci skip]

* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]

* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]

* New translations en.json (Standard Moroccan Tamazight)
[ci skip]

* New translations en.json (Standard Moroccan Tamazight)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.json (Standard Moroccan Tamazight)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations devise.en.yml (Czech)
[ci skip]

* New translations devise.en.yml (Czech)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations simple_form.en.yml (Armenian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations doorkeeper.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations simple_form.en.yml (Armenian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations devise.en.yml (Galician)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Sorani (Kurdish))
[ci skip]

* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]

* Ran `i18n-tasks normalize`

* Ran `yarn manage:translations`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years agoMerge pull request #1468 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Wed, 25 Nov 2020 18:01:15 +0000 (19:01 +0100)]
Merge pull request #1468 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fixed ESLint error
commit | commitdiff | tree
abcang [Mon, 23 Nov 2020 16:35:14 +0000 (01:35 +0900)]
[Glitch] Fixed ESLint error

Port a2da02626ef7a026dc7f6ec4219fbb839f4c2721 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Remove fade-in animation from modals in web UI
commit | commitdiff | tree
Eugen Rochko [Sat, 21 Nov 2020 22:54:36 +0000 (23:54 +0100)]
[Glitch] Remove fade-in animation from modals in web UI

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoDefault to 25 fps for frame seeking if framerate information isn't known
commit | commitdiff | tree
Thibaut Girka [Wed, 25 Nov 2020 14:47:23 +0000 (15:47 +0100)]
Default to 25 fps for frame seeking if framerate information isn't known

5 years ago[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI
commit | commitdiff | tree
Eugen Rochko [Sat, 21 Nov 2020 22:19:04 +0000 (23:19 +0100)]
[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI

Port f970e1fab6ca5d2334604b86d6e472e64510ea40 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Wed, 25 Nov 2020 14:31:45 +0000 (15:31 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.

5 years agoRevert "Bump webpack-cli from 3.3.12 to 4.2.0 (#15123)" (#15213)
commit | commitdiff | tree
Eugen Rochko [Tue, 24 Nov 2020 20:06:18 +0000 (21:06 +0100)]
Revert "Bump webpack-cli from 3.3.12 to 4.2.0 (#15123)" (#15213)

This reverts commit 022d2353a77edaddd6a681405521f27f5fac11b2.

5 years agoAdd `tootctl accounts merge` (#15201)
commit | commitdiff | tree
Eugen Rochko [Mon, 23 Nov 2020 16:50:16 +0000 (17:50 +0100)]
Add `tootctl accounts merge` (#15201)

* Add `tootctl accounts merge`

* Update lib/mastodon/accounts_cli.rb

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years agoFixed ESLint error (#15214)
commit | commitdiff | tree
abcang [Mon, 23 Nov 2020 16:35:14 +0000 (01:35 +0900)]
Fixed ESLint error (#15214)

* eslint --fix

* fix consistent-return

* fix promise/catch-or-return

* ignore import rule

5 years agoBump @babel/preset-env from 7.12.1 to 7.12.7 (#15209)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 12:03:44 +0000 (21:03 +0900)]
Bump @babel/preset-env from 7.12.1 to 7.12.7 (#15209)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.1 to 7.12.7.
- [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.12.7/packages/babel-preset-env)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump parallel from 1.20.0 to 1.20.1 (#15204)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 12:02:47 +0000 (21:02 +0900)]
Bump parallel from 1.20.0 to 1.20.1 (#15204)

Bumps [parallel](https://github.com/grosser/parallel) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.20.0...v1.20.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump eslint from 7.13.0 to 7.14.0 (#15210)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:07:56 +0000 (17:07 +0900)]
Bump eslint from 7.13.0 to 7.14.0 (#15210)

Bumps [eslint](https://github.com/eslint/eslint) from 7.13.0 to 7.14.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.13.0...v7.14.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump @babel/preset-react from 7.12.5 to 7.12.7 (#15208)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:05:04 +0000 (17:05 +0900)]
Bump @babel/preset-react from 7.12.5 to 7.12.7 (#15208)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.12.5 to 7.12.7.
- [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.12.7/packages/babel-preset-react)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump @babel/core from 7.12.3 to 7.12.7 (#15205)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:04:47 +0000 (17:04 +0900)]
Bump @babel/core from 7.12.3 to 7.12.7 (#15205)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.3 to 7.12.7.
- [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.12.7/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump @testing-library/react from 11.2.0 to 11.2.2 (#15211)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:03:37 +0000 (17:03 +0900)]
Bump @testing-library/react from 11.2.0 to 11.2.2 (#15211)

Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.2.0 to 11.2.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.2.0...v11.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump parallel_tests from 3.3.0 to 3.4.0 (#15203)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:02:30 +0000 (17:02 +0900)]
Bump parallel_tests from 3.3.0 to 3.4.0 (#15203)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.3.0 to 3.4.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/v3.3.0...v3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump redis from 4.2.2 to 4.2.5 (#15202)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:00:55 +0000 (17:00 +0900)]
Bump redis from 4.2.2 to 4.2.5 (#15202)

Bumps [redis](https://github.com/redis/redis-rb) from 4.2.2 to 4.2.5.
- [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.2...v4.2.5)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump rubocop from 1.3.0 to 1.3.1 (#15212)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 08:00:23 +0000 (17:00 +0900)]
Bump rubocop from 1.3.0 to 1.3.1 (#15212)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.3.0...v1.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump aws-sdk-s3 from 1.84.1 to 1.85.0 (#15207)
commit | commitdiff | tree
dependabot[bot] [Mon, 23 Nov 2020 07:59:45 +0000 (16:59 +0900)]
Bump aws-sdk-s3 from 1.84.1 to 1.85.0 (#15207)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.1 to 1.85.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/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>
5 years agoRemove fade-in animation from modals in web UI (#15199)
commit | commitdiff | tree
Eugen Rochko [Sat, 21 Nov 2020 22:54:36 +0000 (23:54 +0100)]
Remove fade-in animation from modals in web UI (#15199)

5 years agoFix hardcoded frame rate for frame by frame video navigation in web UI (#15198)
commit | commitdiff | tree
Eugen Rochko [Sat, 21 Nov 2020 22:19:04 +0000 (23:19 +0100)]
Fix hardcoded frame rate for frame by frame video navigation in web UI (#15198)

5 years agoUndo outgoing follows when suspending a remote account (#15188)
commit | commitdiff | tree
ThibG [Sat, 21 Nov 2020 20:27:00 +0000 (21:27 +0100)]
Undo outgoing follows when suspending a remote account (#15188)

5 years agoFix not being able to unfavorite toots one has lost access to (#15192)
commit | commitdiff | tree
ThibG [Sat, 21 Nov 2020 05:18:09 +0000 (06:18 +0100)]
Fix not being able to unfavorite toots one has lost access to (#15192)

Fixes #15191

5 years agoMerge pull request #1467 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Fri, 20 Nov 2020 14:11:43 +0000 (15:11 +0100)]
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoFix video not taking focus on interaction
commit | commitdiff | tree
Thibaut Girka [Fri, 20 Nov 2020 13:20:17 +0000 (14:20 +0100)]
Fix video not taking focus on interaction

Revert part of #737 to restore hotkey functionality

5 years ago[Glitch] Fix image uploads being random data when canvas read access is blocked
commit | commitdiff | tree
ThibG [Wed, 18 Nov 2020 17:01:58 +0000 (18:01 +0100)]
[Glitch] Fix image uploads being random data when canvas read access is blocked

Port d8d43a427a549cf063de3f6b3c22a08a06f53ffa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Add hotkeys for audio/video control
commit | commitdiff | tree
Eugen Rochko [Sun, 15 Nov 2020 13:24:54 +0000 (14:24 +0100)]
[Glitch] Add hotkeys for audio/video control

Port 04a079e7230bc4e73b897e3c4462011cddf36474 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Fri, 20 Nov 2020 12:27:48 +0000 (13:27 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.

5 years agoFix webfinger redirect handling in ResolveAccountService (#15187)
commit | commitdiff | tree
ThibG [Thu, 19 Nov 2020 18:52:06 +0000 (19:52 +0100)]
Fix webfinger redirect handling in ResolveAccountService (#15187)

* Fix webfinger redirect handling in ResolveAccountService

ResolveAccountService#process_webfinger! handled a one-step webfinger
redirection, but only accepting the result if it matched the exact URI passed
as input, defeating the point of a redirection check.

Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`,
updating the resulting `acct:` URI with the result of the first webfinger
query.

* Add tests

5 years agoAdd import/export feature for bookmarks (#14956)
commit | commitdiff | tree
ThibG [Thu, 19 Nov 2020 16:48:13 +0000 (17:48 +0100)]
Add import/export feature for bookmarks (#14956)

* Add ability to export bookmarks

* Add support for importing bookmarks

* Add bookmark import tests

* Add bookmarks export test

5 years agoBump webpack-cli from 3.3.12 to 4.2.0 (#15123)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 16:47:20 +0000 (17:47 +0100)]
Bump webpack-cli from 3.3.12 to 4.2.0 (#15123)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.2.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoUse Ruby 2.7.2 (#15150)
commit | commitdiff | tree
Daigo 3 Dango [Thu, 19 Nov 2020 16:46:46 +0000 (16:46 +0000)]
Use Ruby 2.7.2 (#15150)

thwait and e2mmap are no longer needed in Gemfile.
Gems properly require those.

5 years agoBump omniauth-cas from 1.1.1 to 2.0.0 (#15165)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 16:43:58 +0000 (17:43 +0100)]
Bump omniauth-cas from 1.1.1 to 2.0.0 (#15165)

Bumps [omniauth-cas](https://github.com/dlindahl/omniauth-cas) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/dlindahl/omniauth-cas/releases)
- [Changelog](https://github.com/dlindahl/omniauth-cas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dlindahl/omniauth-cas/compare/v1.1.1...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump rubocop from 0.93.1 to 1.3.0 (#15170)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 16:43:35 +0000 (17:43 +0100)]
Bump rubocop from 0.93.1 to 1.3.0 (#15170)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.1 to 1.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.1...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump @testing-library/react from 11.1.1 to 11.2.0 (#15186)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 16:42:47 +0000 (17:42 +0100)]
Bump @testing-library/react from 11.1.1 to 11.2.0 (#15186)

Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.1.1 to 11.2.0.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.1.1...v11.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoMark correctly as read reverse-order announcements (#15070)
commit | commitdiff | tree
Darius Kazemi [Thu, 19 Nov 2020 16:40:18 +0000 (08:40 -0800)]
Mark correctly as read reverse-order announcements (#15070)

This fixes a bug in #15065 where the "read" indicator was not getting correctly set. The ID of a dismissed announcement is now correct.

5 years agoFix sending spurious Rejects when processing remote account deletion (#15104)
commit | commitdiff | tree
ThibG [Thu, 19 Nov 2020 16:39:47 +0000 (17:39 +0100)]
Fix sending spurious Rejects when processing remote account deletion (#15104)

* Fix sending spurious Rejects when processing remote account deletion

* Make skip_side_effects imply skip_activitypub

5 years agoAdd cache buster feature for media files (#15155)
commit | commitdiff | tree
Eugen Rochko [Thu, 19 Nov 2020 16:38:06 +0000 (17:38 +0100)]
Add cache buster feature for media files (#15155)

Nginx can be configured to bypass proxy cache when a special header
is in the request. If the response is cacheable, it will replace
the cache for that request. Proxy caching of media files is
desirable when using object storage as a way of minimizing bandwidth
costs, but has the drawback of leaving deleted media files for
a configured amount of cache time. A cache buster can make those
media files immediately unavailable. This especially makes sense
when suspending and unsuspending an account.

5 years agoDeal with collation-related index corruption (#14860)
commit | commitdiff | tree
ThibG [Thu, 19 Nov 2020 16:37:49 +0000 (17:37 +0100)]
Deal with collation-related index corruption (#14860)

* Add tootctl maintenance fix-duplicates

This tool goes through the database to detect and fix duplicates.
This operation is very slow and may cause data loss (of data that would be
inaccessible without intervention because of the existing index corruptions).
It tries its best to make sensible decisions, and asks the user in some cases.

* Add warning message in db:migrate hook

* Clear Rails cache after being done with database deduplication

Avoids followers hash cache being incorrect, among other things

5 years agoBump babel-loader from 8.1.0 to 8.2.1 (#15167)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 02:08:20 +0000 (11:08 +0900)]
Bump babel-loader from 8.1.0 to 8.2.1 (#15167)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.1.0...v8.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump webpack-merge from 5.3.0 to 5.4.0 (#15166)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 02:07:57 +0000 (11:07 +0900)]
Bump webpack-merge from 5.3.0 to 5.4.0 (#15166)

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.4.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.3.0...v5.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump sass-loader from 10.0.5 to 10.1.0 (#15164)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 02:03:07 +0000 (11:03 +0900)]
Bump sass-loader from 10.0.5 to 10.1.0 (#15164)

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 10.0.5 to 10.1.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.5...v10.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump mini-css-extract-plugin from 1.3.0 to 1.3.1 (#15168)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:56:04 +0000 (10:56 +0900)]
Bump mini-css-extract-plugin from 1.3.0 to 1.3.1 (#15168)

Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.0...v1.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump bootsnap from 1.5.0 to 1.5.1 (#15171)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:45:57 +0000 (10:45 +0900)]
Bump bootsnap from 1.5.0 to 1.5.1 (#15171)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.0...v1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump yargs from 16.1.0 to 16.1.1 (#15163)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:44:38 +0000 (10:44 +0900)]
Bump yargs from 16.1.0 to 16.1.1 (#15163)

Bumps [yargs](https://github.com/yargs/yargs) from 16.1.0 to 16.1.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v16.1.0...v16.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump webmock from 3.9.5 to 3.10.0 (#15172)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:42:05 +0000 (10:42 +0900)]
Bump webmock from 3.9.5 to 3.10.0 (#15172)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump @testing-library/jest-dom from 5.11.5 to 5.11.6 (#15162)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:34:31 +0000 (10:34 +0900)]
Bump @testing-library/jest-dom from 5.11.5 to 5.11.6 (#15162)

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.5 to 5.11.6.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.5...v5.11.6)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump compression-webpack-plugin from 6.1.0 to 6.1.1 (#15161)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:32:00 +0000 (10:32 +0900)]
Bump compression-webpack-plugin from 6.1.0 to 6.1.1 (#15161)

Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v6.1.0...v6.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump aws-sdk-s3 from 1.84.0 to 1.84.1 (#15173)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:28:31 +0000 (10:28 +0900)]
Bump aws-sdk-s3 from 1.84.0 to 1.84.1 (#15173)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.0 to 1.84.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/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>
5 years agoBump json-ld from 3.1.4 to 3.1.5 (#15174)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:25:12 +0000 (10:25 +0900)]
Bump json-ld from 3.1.4 to 3.1.5 (#15174)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.4...3.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoBump oj from 3.10.15 to 3.10.16 (#15175)
commit | commitdiff | tree
dependabot[bot] [Thu, 19 Nov 2020 01:22:24 +0000 (10:22 +0900)]
Bump oj from 3.10.15 to 3.10.16 (#15175)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16.
- [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.10.15...v3.10.16)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoFix DMs not appearing into timelines (#15182)
commit | commitdiff | tree
ThibG [Wed, 18 Nov 2020 23:23:46 +0000 (00:23 +0100)]
Fix DMs not appearing into timelines (#15182)

Fixes #15179

5 years agoFix image uploads being random data when canvas read access is blocked (#15180)
commit | commitdiff | tree
ThibG [Wed, 18 Nov 2020 17:01:58 +0000 (18:01 +0100)]
Fix image uploads being random data when canvas read access is blocked (#15180)

Fixes #15178

PR #11499 introduced a way to deal with all-white canvas, but newer
Firefox versions set random data instead.

This PR detects whether canvas operations are reliable by comparing
the results on a hardcoded 2×2 pixels image, and memoizing the result.

This should be both more reliable and faster than the previous check.

5 years agoFix pop-out player appearing on mobile screens in web UI (#15157)
commit | commitdiff | tree
Eugen Rochko [Mon, 16 Nov 2020 04:16:39 +0000 (05:16 +0100)]
Fix pop-out player appearing on mobile screens in web UI (#15157)

Fix #15092

5 years agoAdd hotkeys for audio/video control (#15158)
commit | commitdiff | tree
Eugen Rochko [Sun, 15 Nov 2020 13:24:54 +0000 (14:24 +0100)]
Add hotkeys for audio/video control (#15158)

Fix #14515

5 years agoApply label automatically when issue creation from template (#15154)
commit | commitdiff | tree
Yamagishi Kazutoshi [Sat, 14 Nov 2020 18:19:23 +0000 (03:19 +0900)]
Apply label automatically when issue creation from template (#15154)

5 years agoMerge pull request #1465 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Fri, 13 Nov 2020 23:50:43 +0000 (00:50 +0100)]
Merge pull request #1465 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Fri, 13 Nov 2020 23:30:36 +0000 (00:30 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.

5 years agoFix AccountDeletionWorker not accepting keyword arguments (#15152)
commit | commitdiff | tree
ThibG [Fri, 13 Nov 2020 21:17:04 +0000 (22:17 +0100)]
Fix AccountDeletionWorker not accepting keyword arguments (#15152)

5 years agoFix minor design issues with fav confirmation modal
commit | commitdiff | tree
Thibaut Girka [Thu, 12 Nov 2020 22:25:26 +0000 (23:25 +0100)]
Fix minor design issues with fav confirmation modal

5 years agoFix media not being marked sensitive when outgoing CW is set
commit | commitdiff | tree
Thibaut Girka [Thu, 12 Nov 2020 23:46:03 +0000 (00:46 +0100)]
Fix media not being marked sensitive when outgoing CW is set

Fixes #1461

Fixes a regression from a recent merge

5 years agoFix “Show boosts/replies in public timelines” only affecting streaming
commit | commitdiff | tree
Thibaut Girka [Thu, 12 Nov 2020 22:15:31 +0000 (23:15 +0100)]
Fix “Show boosts/replies in public timelines” only affecting streaming

Fixes #1456

next
source code fur Kibicat Mastodon