]> cat aescling's git repositories - mastodon.git/log
mastodon.git
5 years agoMerge pull request #1385 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 22 Jul 2020 13:39:36 +0000 (15:39 +0200)]
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix keyboard navigation in scrollable lists
ThibG [Sat, 18 Jul 2020 16:55:36 +0000 (18:55 +0200)]
[Glitch] Fix keyboard navigation in scrollable lists

Port 98f6380dee5c93d9cdc4d94ec81d31a3bfa0a943 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix following_counter plural to include "one"
Sasha Sorokin [Fri, 17 Jul 2020 05:08:23 +0000 (12:08 +0700)]
[Glitch] Fix following_counter plural to include "one"

Port 17b1d71536609c6deabcf3b13ec9be0ec9fd793f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix audio player controls color in mastodon-light theme
ThibG [Fri, 17 Jul 2020 05:07:18 +0000 (07:07 +0200)]
[Glitch] Fix audio player controls color in mastodon-light theme

Port 85bc0f9639c9c1ecccfa6963929b6c405fb8452c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 22 Jul 2020 11:38:17 +0000 (13:38 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.

5 years agoFix not handling Undo on some activity types when they aren't inlined (#14346)
ThibG [Wed, 22 Jul 2020 09:45:35 +0000 (11:45 +0200)]
Fix not handling Undo on some activity types when they aren't inlined (#14346)

* Fix not handling Undo on some activity types when they aren't inlined

When receiving an Undo for a non-inlined activity, try looking it up in
database using the URI. The queries are ad-hoc because we don't have a global
index of object URIs, and not all activity types are stored in database with
an index on their URI.

Announces are just statuses, and have an index on URIs, so this check can
be done efficiently.

Accepts cannot be handled at all because we don't record their URI at any
point.

Follows don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.

Likes don't have an index on URI, they have an index on the issuing account,
but the number of favs per account may be very high, so I decided not to
handle that.

Blocks don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.

In all cases, if an Undo could not be handled properly, we call `delete_later!`
because that does not require us to know more than the URI of the undone
property.

* Add tests

* Make newer blocks overwrite older ones

Allows re-synchronizing block info by re-blocking and un-blocking again
when the original Undo Block has been lost.

5 years agoFix RSS feeds not being cachable (#14368)
ThibG [Wed, 22 Jul 2020 09:44:02 +0000 (11:44 +0200)]
Fix RSS feeds not being cachable (#14368)

* Add tests for some cachable responses

This only covers responses that we should have managed to make cachable
so far. It's not the case of all responses that should be cachable in
the end.

* Fix RSS feeds not being cachable

5 years agoDereference object URIs in Create and Update messages (#14359)
ThibG [Wed, 22 Jul 2020 09:43:17 +0000 (11:43 +0200)]
Dereference object URIs in Create and Update messages (#14359)

* Dereference object URIs in Create and Update messages

Fixes #14353

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor, and perform origin check *before* attempting to fetch object

Co-authored-by: Fire Demon <firedemon@creature.cafe>
5 years agoChanged retries and rescued in ActivityPub::ProcessingWorker (#14355)
Takeshi Umeda [Mon, 20 Jul 2020 09:26:12 +0000 (18:26 +0900)]
Changed retries and rescued in ActivityPub::ProcessingWorker (#14355)

* Changed the number of retries and rescued exceptions in ActivityPub::ProcessingWorker

* Remove RecordNotUnique from rescue

5 years agoFix to add RedisLock to handle Announce activity (#14365)
Takeshi Umeda [Mon, 20 Jul 2020 09:25:26 +0000 (18:25 +0900)]
Fix to add RedisLock to handle Announce activity (#14365)

5 years agoRemove nodejs buildpack from buildpacks (#14364)
Jeong Arm [Mon, 20 Jul 2020 07:48:10 +0000 (16:48 +0900)]
Remove nodejs buildpack from buildpacks (#14364)

5 years agoFix movie width and frame_rate returning nil (#14357)
Takeshi Umeda [Sun, 19 Jul 2020 20:28:27 +0000 (05:28 +0900)]
Fix movie width and frame_rate returning nil (#14357)

* Fix movie width and frame_rate returning nil

* Add StreamValidationError and raise

* Fix code style

5 years agoAdd thumbnail_remote_url in MediaAttachment REST response (#14358)
Takeshi Umeda [Sun, 19 Jul 2020 17:53:31 +0000 (02:53 +0900)]
Add thumbnail_remote_url in MediaAttachment REST response (#14358)

* Add thumbnail_remote_url in MediaAttachment REST response

* Change thumbnail_remote_url to preview_remote_url

5 years agoFix/14021 behaviour on add or remove toots (#14212)
Ariel [Sun, 19 Jul 2020 15:04:02 +0000 (12:04 -0300)]
Fix/14021 behaviour on add or remove toots (#14212)

* Add toot send by current user at local state after send a new toot

Related to #14021

* Decrement toot counter at profile when remove a toot

Related to #14021

* Remove semicolon at end of line

5 years agoFix mimetype returning nil (#14356)
Takeshi Umeda [Sun, 19 Jul 2020 11:09:47 +0000 (20:09 +0900)]
Fix mimetype returning nil (#14356)

5 years agohelm: add examples of annotation for NGINX upload limits (#14350)
Alex Dunn [Sat, 18 Jul 2020 17:30:46 +0000 (10:30 -0700)]
helm: add examples of annotation for NGINX upload limits (#14350)

5 years agoran `yarn manage:translations` (#14344)
mayaeh [Sat, 18 Jul 2020 17:01:16 +0000 (02:01 +0900)]
ran `yarn manage:translations` (#14344)

5 years agoSet bundle config in local file, and set path (#14351)
David Cook [Sat, 18 Jul 2020 17:00:59 +0000 (12:00 -0500)]
Set bundle config in local file, and set path (#14351)

5 years agoFix keyboard navigation in scrollable lists (#14348)
ThibG [Sat, 18 Jul 2020 16:55:36 +0000 (18:55 +0200)]
Fix keyboard navigation in scrollable lists (#14348)

Fixes #14347

5 years agoFix following_counter plural to include "one" (#14342)
Sasha Sorokin [Fri, 17 Jul 2020 05:08:23 +0000 (12:08 +0700)]
Fix following_counter plural to include "one" (#14342)

That should've worked just fine, but unfortunately, Crowdin wasn't able
to pick up on our non-existent "one" category, thus appending empty
translation block to people's translations. Empty block WILL BE used by
any ICU FormatMessage library, thus resulting in an empty translation
for "one" category, and that requires immediate fix.

This commit duplicates contents of the "other" plural category.

5 years agoFix boosted toots from blocked account not being retroactively removed from TL (...
ThibG [Fri, 17 Jul 2020 05:07:54 +0000 (07:07 +0200)]
Fix boosted toots from blocked account not being retroactively removed from TL (#14339)

* Fix boosted toots from blocked account not being retroactively removed from TL

Fixes #14301

* Add test for clear_from_timeline

5 years agoFix audio player controls color in mastodon-light theme (#14338)
ThibG [Fri, 17 Jul 2020 05:07:18 +0000 (07:07 +0200)]
Fix audio player controls color in mastodon-light theme (#14338)

Fixes #14337

The new audio player sets the background and foreground colors automatically
based on the thumbnail of the audio file, but the mastodon-light theme
overrides the controls' colors with a hardcoded color, which sometimes make
them unreadable.

5 years agoBump lodash from 4.17.15 to 4.17.19 (#14321)
dependabot[bot] [Fri, 17 Jul 2020 05:06:45 +0000 (07:06 +0200)]
Bump lodash from 4.17.15 to 4.17.19 (#14321)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years agoStop using heroku-buildpack-nodejs (#14341)
Daigo 3 Dango [Thu, 16 Jul 2020 20:01:34 +0000 (10:01 -1000)]
Stop using heroku-buildpack-nodejs (#14341)

heroku-buildpack-ruby started to install Node 12 by default.
This makes it possible to run Mastodon without heroku-buildpack-nodejs.

5 years agoMerge pull request #1383 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 16 Jul 2020 13:01:13 +0000 (15:01 +0200)]
Merge pull request #1383 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix error when closing a playing audio or video modal
ThibG [Wed, 15 Jul 2020 19:07:53 +0000 (21:07 +0200)]
[Glitch] Fix error when closing a playing audio or video modal

Port bfed7dd5f3127f08ece3070bd67f5737933bac1a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 16 Jul 2020 12:43:50 +0000 (14:43 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoNew Crowdin updates (#14314)
Eugen Rochko [Wed, 15 Jul 2020 22:49:14 +0000 (00:49 +0200)]
New Crowdin updates (#14314)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations doorkeeper.en.yml (Marathi)
[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 (Norwegian Nynorsk)
[ci skip]

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

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

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

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

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

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

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

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

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

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

* New translations en.json (Tamil)
[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 (Indonesian)
[ci skip]

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

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

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

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

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

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

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

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

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

* New translations doorkeeper.en.yml (Kazakh)
[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 en.yml (Tamil)
[ci skip]

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

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

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

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

* New translations doorkeeper.en.yml (Chinese Traditional)
[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 doorkeeper.en.yml (Chinese Simplified)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations doorkeeper.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 en.json (Indonesian)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

* Fix

5 years agoNew Crowdin updates (#14311)
Eugen Rochko [Wed, 15 Jul 2020 19:11:21 +0000 (21:11 +0200)]
New Crowdin updates (#14311)

* New translations en.json (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 en.yml (Vietnamese)
[ci skip]

* i18n-tasks normalize

5 years agoFix removing allowed domains being done synchronously (#14302)
ThibG [Wed, 15 Jul 2020 19:08:19 +0000 (21:08 +0200)]
Fix removing allowed domains being done synchronously (#14302)

* Fix removing allowed domains being done synchronously

* Add tests

5 years agoFix error when closing a playing audio or video modal (#14310)
ThibG [Wed, 15 Jul 2020 19:07:53 +0000 (21:07 +0200)]
Fix error when closing a playing audio or video modal (#14310)

5 years agoBump version to 3.2.0rc1 (#14312)
Eugen Rochko [Wed, 15 Jul 2020 19:07:27 +0000 (21:07 +0200)]
Bump version to 3.2.0rc1 (#14312)

5 years agoMerge pull request #1382 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 15 Jul 2020 14:56:33 +0000 (16:56 +0200)]
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoFix style of visibility icon in boost modal
Thibaut Girka [Wed, 15 Jul 2020 14:04:56 +0000 (16:04 +0200)]
Fix style of visibility icon in boost modal

5 years ago[Glitch] Add a visibility icon to boost modal
han@highemelry [Sun, 12 Jul 2020 13:22:48 +0000 (22:22 +0900)]
[Glitch] Add a visibility icon to boost modal

Port 8b35ed96c01b2a1e3b6ae17bc7fc3c2cdab900d8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix audio and video items in account gallery in web UI
Eugen Rochko [Fri, 10 Jul 2020 20:09:28 +0000 (22:09 +0200)]
[Glitch] Fix audio and video items in account gallery in web UI

Port 6cc5b822f5ca7df9b267ac2b5d24e2aac2dc0325 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 15 Jul 2020 13:32:40 +0000 (15:32 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

5 years agoNew Crowdin updates (#14285)
Eugen Rochko [Wed, 15 Jul 2020 12:59:26 +0000 (14:59 +0200)]
New Crowdin updates (#14285)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations simple_form.en.yml (Kazakh)
[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 doorkeeper.en.yml (Estonian)
[ci skip]

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

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

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

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

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

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

* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[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 doorkeeper.en.yml (Croatian)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations activerecord.en.yml (Malayalam)
[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 simple_form.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 (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 (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Vietnamese)
[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.json (Vietnamese)
[ci skip]

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

* New translations en.yml (French)
[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 (Vietnamese)
[ci skip]

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

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

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

* New translations simple_form.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 (Vietnamese)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

5 years agoadd ssl option in smtp setting (#14309)
Tdxdxoz [Wed, 15 Jul 2020 12:43:49 +0000 (20:43 +0800)]
add ssl option in smtp setting (#14309)

5 years agoFix being unable to unboost when blocked by their author (#14308)
ThibG [Wed, 15 Jul 2020 12:43:19 +0000 (14:43 +0200)]
Fix being unable to unboost when blocked by their author (#14308)

Fixes #14307

5 years agoImprove group processing (#14279)
Takeshi Umeda [Tue, 14 Jul 2020 17:05:34 +0000 (02:05 +0900)]
Improve group processing (#14279)

* Fix the local group's followers collection

* Fix to accept followed relayed_through_account

* Add local delivery to the group's followers

* Fix code style

* Revert "Add local delivery to the group's followers"

This reverts commit 3237effc199772e4c4d30f19082cbc5633f56196.

5 years agoFix rubocop warning (#14288)
abcang [Tue, 14 Jul 2020 17:05:07 +0000 (02:05 +0900)]
Fix rubocop warning (#14288)

* Fix rubocop warning

* use limit variable

* use ContextCreatingMethods option

5 years agoFix larger video files not being transcoded (#14306)
ThibG [Tue, 14 Jul 2020 16:50:19 +0000 (18:50 +0200)]
Fix larger video files not being transcoded (#14306)

Since #14145, the `set_type_and_extension` has been moved from
`before_post_process` to `before_file_post_process`, but while the former
runs before all validations performed by Paperclip, the latter is dependent
on the order validations and hooks are defined.

In our case, this meant video files could be checked against the generic 10MB
limit, causing validation failures, which, internally, make Paperclip skip
post-processing, and thus, transcoding of the video file.

The actual validation would then happen after the type is correctly set, so
the large file would pass validation, but without being transcoded first.

This commit moves the hook definition so that it is run before checking for
the file size.

5 years agoChange `tootctl search deploy` algorithm (#14300)
Eugen Rochko [Tue, 14 Jul 2020 16:10:35 +0000 (18:10 +0200)]
Change `tootctl search deploy` algorithm (#14300)

5 years agoFix account domain block not properly unfollowing accounts from domain (#14304)
Eugen Rochko [Mon, 13 Jul 2020 17:33:10 +0000 (19:33 +0200)]
Fix account domain block not properly unfollowing accounts from domain (#14304)

Fix #14303

5 years agoFix removing a DomainAllow rule wiping known accounts in open federation mode (#14298)
ThibG [Sun, 12 Jul 2020 20:11:49 +0000 (22:11 +0200)]
Fix removing a DomainAllow rule wiping known accounts in open federation mode (#14298)

Fixes #14296

5 years agoFix the wrong full documentation link (#14293)
夕日 [Sun, 12 Jul 2020 20:11:31 +0000 (04:11 +0800)]
Fix the wrong full documentation link (#14293)

5 years agoAdd a visibility icon to boost modal (#14292)
han@highemelry [Sun, 12 Jul 2020 13:22:48 +0000 (22:22 +0900)]
Add a visibility icon to boost modal (#14292)

Related to tootsuite#14123.
Add visibility icon not only status/detailed-status but also modal window for boost.

5 years agoEnable promise/catch-or-return allowFinally (#14289)
abcang [Sat, 11 Jul 2020 21:51:22 +0000 (06:51 +0900)]
Enable promise/catch-or-return allowFinally (#14289)

5 years agoDisable E2EE API routes for the next release (#14283)
Eugen Rochko [Fri, 10 Jul 2020 20:09:42 +0000 (22:09 +0200)]
Disable E2EE API routes for the next release (#14283)

5 years agoFix audio and video items in account gallery in web UI (#14282)
Eugen Rochko [Fri, 10 Jul 2020 20:09:28 +0000 (22:09 +0200)]
Fix audio and video items in account gallery in web UI  (#14282)

* Fix audio and video items in account gallery in web UI

- Fix audio items not using thumbnails
- Fix video items not using custom thumbnails
- Fix video items autoplaying like GIFs

* Change audio and video items in account gallery to autoplay when opened in web UI

* Fix code style issue

5 years agoBump version to 3.1.5 (#14284)
Eugen Rochko [Fri, 10 Jul 2020 19:07:30 +0000 (21:07 +0200)]
Bump version to 3.1.5 (#14284)

5 years agoNew Crowdin updates (#14197)
Eugen Rochko [Fri, 10 Jul 2020 18:57:21 +0000 (20:57 +0200)]
New Crowdin updates (#14197)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

5 years agoMerge pull request #1381 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 10 Jul 2020 18:02:28 +0000 (20:02 +0200)]
Merge pull request #1381 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix block/mute pagination in WebUI
ThibG [Fri, 10 Jul 2020 16:04:18 +0000 (18:04 +0200)]
[Glitch] Fix block/mute pagination in WebUI

Port 38579b9f74cf75fa62345fc203bee8257d8a2119 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 10 Jul 2020 16:49:06 +0000 (18:49 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix block/mute pagination in WebUI (#14275)
ThibG [Fri, 10 Jul 2020 16:04:18 +0000 (18:04 +0200)]
Fix block/mute pagination in WebUI (#14275)

Fixes #14274

5 years agoMerge pull request #1380 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 10 Jul 2020 15:29:43 +0000 (17:29 +0200)]
Merge pull request #1380 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Improve safety of Blurhash component
Sasha Sorokin [Thu, 9 Jul 2020 20:32:36 +0000 (03:32 +0700)]
[Glitch] Improve safety of Blurhash component

Port 3ef94c00444f2b72a6f68e0fd9cff1b3f783c555 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Audio player visualization improvements
ThibG [Fri, 10 Jul 2020 11:57:05 +0000 (13:57 +0200)]
[Glitch] Audio player visualization improvements

Port a2abe35e0f55c96e8b8525ee25089751859d14c2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Freeze scroll position when a dropdown menu is open in the TL
ThibG [Thu, 9 Jul 2020 13:09:19 +0000 (15:09 +0200)]
[Glitch] Freeze scroll position when a dropdown menu is open in the TL

Port 6fda3cbbebfdc7b050f4437b996b2ad36c1db64c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Replace repetitive blurhash code with component (#14267)
Sasha Sorokin [Thu, 9 Jul 2020 11:01:30 +0000 (18:01 +0700)]
[Glitch] Replace repetitive blurhash code with component (#14267)

Port 61c07c37317f01c1ab4981826704750fe9937fe7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoAudio player visualization improvements (#14281)
ThibG [Fri, 10 Jul 2020 11:57:05 +0000 (13:57 +0200)]
Audio player visualization improvements (#14281)

* Fix audio player ticks position

* Split visualizer code into own file to comply with license

* Change top-left corner of visualizer always showing peaks, clean up code

5 years agoAdd attribution notice to the audio player component (#14280)
Eugen Rochko [Fri, 10 Jul 2020 10:25:44 +0000 (12:25 +0200)]
Add attribution notice to the audio player component (#14280)

The code for rendering a frequency graph around a circle has been adopted (with modifications) from a CodePen by Alex Permyakov

5 years agoFix clicking the audio player also opening toots in detailed view
Thibaut Girka [Fri, 10 Jul 2020 07:50:41 +0000 (09:50 +0200)]
Fix clicking the audio player also opening toots in detailed view

5 years agoImprove safety of Blurhash component (#14278)
Sasha Sorokin [Thu, 9 Jul 2020 20:32:36 +0000 (03:32 +0700)]
Improve safety of Blurhash component (#14278)

There was a missed empty hash check. As well as rendering is now wrapped
in try/catch block, so app won't crash if any Blurhash component fails
to render its contents as it's not that critical.

5 years agoFreeze scroll position when a dropdown menu is open in the TL (#14271)
ThibG [Thu, 9 Jul 2020 13:09:19 +0000 (15:09 +0200)]
Freeze scroll position when a dropdown menu is open in the TL (#14271)

* Freeze scroll position when a dropdown menu is open in the TL

* Apply this to direct TL as well

* Fix case when mouse leaves the menu

5 years agoReplace repetitive blurhash code with component (#14267)
Sasha Sorokin [Thu, 9 Jul 2020 11:01:30 +0000 (18:01 +0700)]
Replace repetitive blurhash code with component (#14267)

This commit replaces all unnecessarily repeated code for decoding and
embedding blurhash canvases with separate component - <Blurhash>.

Under the hood Blurhash component will use effect dependent on its
props. This gives a few benefits: it will only be re-rendered whenever
the hash or width/height/dummy props update, and will not render if
canvas won't get to the final DOM, because then effect won't fire,
which prevents weird bugs like #14257.

5 years agoFix videos on public pages not using custom thumbnails (#14273)
Eugen Rochko [Thu, 9 Jul 2020 10:53:16 +0000 (12:53 +0200)]
Fix videos on public pages not using custom thumbnails (#14273)

5 years agoChange styling of account note editing buttons
Thibaut Girka [Tue, 7 Jul 2020 17:26:08 +0000 (19:26 +0200)]
Change styling of account note editing buttons

Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
5 years agoremove unused word. (#14250)
mayaeh [Wed, 8 Jul 2020 21:53:56 +0000 (06:53 +0900)]
remove unused word. (#14250)

ran `yarn manage:translations en`

5 years agoMerge pull request #1378 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 8 Jul 2020 14:25:03 +0000 (16:25 +0200)]
Merge pull request #1378 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads
ThibG [Wed, 8 Jul 2020 12:54:47 +0000 (14:54 +0200)]
[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads

Port 0d2135a46172fd6931f757ef083ad99f4522081d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
ThibG [Wed, 8 Jul 2020 10:58:17 +0000 (12:58 +0200)]
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail

Port d308a863fbd373b94fa571103ad431782c29e074 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
ThibG [Wed, 8 Jul 2020 07:22:23 +0000 (09:22 +0200)]
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail

Port 258171549120142a6a7dac40f17ecc2087433f4a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 8 Jul 2020 13:23:41 +0000 (15:23 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix new accent color not refreshing when changing thumbnail for audio uploads (#14264)
ThibG [Wed, 8 Jul 2020 12:54:47 +0000 (14:54 +0200)]
Fix new accent color not refreshing when changing thumbnail for audio uploads (#14264)

5 years agoRevert tesseract.js to tesseract.js@2.0.0-alpha.16 (#14262)
ThibG [Wed, 8 Jul 2020 11:57:06 +0000 (13:57 +0200)]
Revert tesseract.js to tesseract.js@2.0.0-alpha.16 (#14262)

The OCR feature in master is broken, there are several reasons for this:
- https://github.com/naptha/tesseract.js/issues/369
- https://github.com/naptha/tesseract.js/issues/346
- and the fact that the worker JS file is served with an unversioned URL,
  and, in the nginx config we provide, served with
  "public, max-age=31536000, immutable", leading to version mismatches as
  the old version gets cached

5 years agoFix WebUI crash on sensitive preview card with no preview thumbnail (#14261)
ThibG [Wed, 8 Jul 2020 10:58:17 +0000 (12:58 +0200)]
Fix WebUI crash on sensitive preview card with no preview thumbnail (#14261)

Follow-up on #14260 which only fixed half the call sites

5 years agoFix RemoveDuplicatedIndexesPghero to check for the existence of the index (#14259)
Takeshi Umeda [Wed, 8 Jul 2020 07:23:23 +0000 (16:23 +0900)]
Fix RemoveDuplicatedIndexesPghero to check for the existence of the index (#14259)

5 years agoFix WebUI crash on sensitive preview card with no preview thumbnail (#14260)
ThibG [Wed, 8 Jul 2020 07:22:23 +0000 (09:22 +0200)]
Fix WebUI crash on sensitive preview card with no preview thumbnail (#14260)

Fixes #14257

5 years agohelm: bump chart and default image version to 3.1.5 (#14256)
Alex Dunn [Tue, 7 Jul 2020 18:35:55 +0000 (11:35 -0700)]
helm: bump chart and default image version to 3.1.5 (#14256)

5 years agoFix streaming server only working for streams allowing local-only toots
Thibaut Girka [Tue, 7 Jul 2020 18:30:40 +0000 (20:30 +0200)]
Fix streaming server only working for streams allowing local-only toots

5 years agoMerge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option
ThibG [Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)]
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option

Add option to show local-only toots in public timeline

5 years agoChange styling and layout of account notes UI
Thibaut Girka [Tue, 7 Jul 2020 15:47:33 +0000 (17:47 +0200)]
Change styling and layout of account notes UI

5 years agoChange account note placeholder name since the design has diverged upstream
Thibaut Girka [Tue, 7 Jul 2020 15:42:35 +0000 (17:42 +0200)]
Change account note placeholder name since the design has diverged upstream

5 years agoFix being unable to add account notes
Thibaut Girka [Tue, 7 Jul 2020 15:24:23 +0000 (17:24 +0200)]
Fix being unable to add account notes

5 years ago[Glitch] Replace shortNumberFormat with <ShortNumber>
Sasha Sorokin [Mon, 6 Jul 2020 12:27:32 +0000 (19:27 +0700)]
[Glitch] Replace shortNumberFormat with <ShortNumber>

Port cb2adaaf9d6c3147de9060132b69933df734d5dc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoFix ogg vorbis files with a cover art not being correctly processed (#14255)
ThibG [Tue, 7 Jul 2020 14:32:14 +0000 (16:32 +0200)]
Fix ogg vorbis files with a cover art not being correctly processed (#14255)

5 years agoMerge pull request #1373 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 7 Jul 2020 14:21:42 +0000 (16:21 +0200)]
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Add ability to choose media thumbnail in web UI
Eugen Rochko [Tue, 7 Jul 2020 10:14:19 +0000 (12:14 +0200)]
[Glitch] Add ability to choose media thumbnail in web UI

Port 06fc6a9cd4c700c450dbe8e8c579a5d5bc4ba732 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix hashtag column options styling
ThibG [Mon, 6 Jul 2020 23:33:38 +0000 (01:33 +0200)]
[Glitch] Fix hashtag column options styling

Port a783bdf4adee3444e9cd32c2eaa0712214ba1230 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 7 Jul 2020 13:34:00 +0000 (15:34 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.

5 years agoFix media attachments enumeration (#14254)
Eugen Rochko [Tue, 7 Jul 2020 13:26:51 +0000 (15:26 +0200)]
Fix media attachments enumeration (#14254)

* Fix media attachment enumeration

* Switch media_attachments id to snowflake ids

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
5 years agoChange rate limits for various paths (#14253)
Eugen Rochko [Tue, 7 Jul 2020 13:26:39 +0000 (15:26 +0200)]
Change rate limits for various paths (#14253)

- Rate limit login attempts by target account
- Rate limit password resets and e-mail re-confirmations by target account
- Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before

5 years agoFix other sessions not being logged out on password change (#14252)
Eugen Rochko [Tue, 7 Jul 2020 13:26:31 +0000 (15:26 +0200)]
Fix other sessions not being logged out on password change (#14252)

While OAuth tokens were immediately revoked, accessing the home
controller immediately generated new OAuth tokens and "revived"
the session due to a combination of using remember_me tokens and
overwriting the `authenticate_user!` method

5 years agoFix account note border radius (#14251)
Sasha Sorokin [Tue, 7 Jul 2020 11:46:21 +0000 (18:46 +0700)]
Fix account note border radius (#14251)

5 years agoAdd ability to choose media thumbnail in web UI (#14244)
Eugen Rochko [Tue, 7 Jul 2020 10:14:19 +0000 (12:14 +0200)]
Add ability to choose media thumbnail in web UI (#14244)

5 years agoChange User-Agent of link preview fetching service to include "Bot" (#14248)
Eugen Rochko [Tue, 7 Jul 2020 08:55:18 +0000 (10:55 +0200)]
Change User-Agent of link preview fetching service to include "Bot" (#14248)

This forces Twitter to render OpenGraph tags in the response