]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoFix old migrations failing because of new version of `strong_migrations`
Thibaut Girka [Thu, 30 May 2019 19:12:02 +0000 (21:12 +0200)]
Fix old migrations failing because of new version of `strong_migrations`

6 years agoMerge pull request #1076 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 30 May 2019 12:07:45 +0000 (14:07 +0200)]
Merge pull request #1076 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 30 May 2019 11:31:01 +0000 (13:31 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoRaise exception when attempting to serialize local-only statuses
Thibaut Girka [Wed, 29 May 2019 20:32:24 +0000 (22:32 +0200)]
Raise exception when attempting to serialize local-only statuses

6 years agoFix incorrect PropType in Glitch AutosuggestInput
slice [Thu, 30 May 2019 06:38:09 +0000 (23:38 -0700)]
Fix incorrect PropType in Glitch AutosuggestInput

6 years agoRemove isRequired from Glitch ReplyIndicator status
slice [Thu, 30 May 2019 06:42:09 +0000 (23:42 -0700)]
Remove isRequired from Glitch ReplyIndicator status

This can be null under normal circumstances, which isRequired doesn't
like.

6 years agoBump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892)
dependabot-preview[bot] [Thu, 30 May 2019 03:58:22 +0000 (12:58 +0900)]
Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.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/compare/v1.40.0...v1.41.0)

6 years agoBump capybara from 3.21.0 to 3.22.0 (#10893)
dependabot-preview[bot] [Thu, 30 May 2019 00:37:12 +0000 (09:37 +0900)]
Bump capybara from 3.21.0 to 3.22.0 (#10893)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.21.0...3.22.0)

6 years agoChange links in right panel to open in the same tab (#10848)
Eugen Rochko [Wed, 29 May 2019 14:33:35 +0000 (17:33 +0300)]
Change links in right panel to open in the same tab (#10848)

For Rambox compatibility

6 years agoFix React warning about legacy lifecycle calls and sensitive status resetting (#10872)
ThibG [Wed, 29 May 2019 14:33:15 +0000 (16:33 +0200)]
Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872)

6 years agoBump js-yaml from 3.12.0 to 3.13.1 (#10881)
dependabot-preview[bot] [Wed, 29 May 2019 14:17:01 +0000 (23:17 +0900)]
Bump js-yaml from 3.12.0 to 3.13.1 (#10881)

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

6 years agoBump express from 4.16.4 to 4.17.1 (#10889)
dependabot-preview[bot] [Wed, 29 May 2019 13:53:20 +0000 (22:53 +0900)]
Bump express from 4.16.4 to 4.17.1 (#10889)

Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.1)

6 years agoBump intl-relativeformat from 2.1.0 to 2.2.0 (#10887)
dependabot-preview[bot] [Wed, 29 May 2019 13:30:52 +0000 (22:30 +0900)]
Bump intl-relativeformat from 2.1.0 to 2.2.0 (#10887)

Bumps [intl-relativeformat](https://github.com/yahoo/intl-relativeformat) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/yahoo/intl-relativeformat/releases)
- [Commits](https://github.com/yahoo/intl-relativeformat/commits)

6 years agoBump babel-plugin-react-intl from 3.0.1 to 3.1.0 (#10877)
dependabot-preview[bot] [Wed, 29 May 2019 10:03:31 +0000 (19:03 +0900)]
Bump babel-plugin-react-intl from 3.0.1 to 3.1.0 (#10877)

Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)

6 years agoBump strong_migrations from 0.3.1 to 0.4.0 (#10871)
dependabot-preview[bot] [Wed, 29 May 2019 09:22:59 +0000 (18:22 +0900)]
Bump strong_migrations from 0.3.1 to 0.4.0 (#10871)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.1...v0.4.0)

6 years agoBump react-redux from 6.0.0 to 6.0.1 (#10879)
dependabot-preview[bot] [Wed, 29 May 2019 09:20:36 +0000 (18:20 +0900)]
Bump react-redux from 6.0.0 to 6.0.1 (#10879)

Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.0...v6.0.1)

6 years agoBump @babel/plugin-transform-runtime from 7.3.4 to 7.4.4 (#10878)
dependabot-preview[bot] [Wed, 29 May 2019 09:19:16 +0000 (18:19 +0900)]
Bump @babel/plugin-transform-runtime from 7.3.4 to 7.4.4 (#10878)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4)

6 years agoBump webpacker from 4.0.2 to 4.0.4 (#10882)
dependabot-preview[bot] [Wed, 29 May 2019 09:16:07 +0000 (18:16 +0900)]
Bump webpacker from 4.0.2 to 4.0.4 (#10882)

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.2...v4.0.4)

6 years agoBump rimraf from 2.6.2 to 2.6.3 (#10880)
dependabot-preview[bot] [Wed, 29 May 2019 09:12:53 +0000 (18:12 +0900)]
Bump rimraf from 2.6.2 to 2.6.3 (#10880)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.2...v2.6.3)

6 years agoFix safari post field display issue in single column layout (#10883)
Takeshi Umeda [Wed, 29 May 2019 09:03:56 +0000 (18:03 +0900)]
Fix safari post field display issue in single column layout (#10883)

6 years agoi18n: Update Corsican front-end translation (#10884)
Alix Rossi [Wed, 29 May 2019 08:57:08 +0000 (10:57 +0200)]
i18n: Update Corsican front-end translation (#10884)

6 years agoAdd Dependabot config (#10876)
Yamagishi Kazutoshi [Wed, 29 May 2019 06:00:51 +0000 (15:00 +0900)]
Add Dependabot config (#10876)

6 years agoBump capybara from 3.20.2 to 3.21.0 (#10854)
dependabot-preview[bot] [Wed, 29 May 2019 02:21:22 +0000 (11:21 +0900)]
Bump capybara from 3.20.2 to 3.21.0 (#10854)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.2...3.21.0)

6 years agoBump tty-prompt from 0.18.1 to 0.19.0 (#10870)
dependabot-preview[bot] [Wed, 29 May 2019 02:10:24 +0000 (11:10 +0900)]
Bump tty-prompt from 0.18.1 to 0.19.0 (#10870)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0)

6 years agoUpdate Japanese translations. (#10875)
mayaeh [Wed, 29 May 2019 02:09:59 +0000 (11:09 +0900)]
Update Japanese translations. (#10875)

run yarn manage:translations ja && i18n-tasks add-missing ja

6 years agoI18n: Update Czech translation (#10874)
Aditoo17 [Wed, 29 May 2019 00:52:41 +0000 (02:52 +0200)]
I18n: Update Czech translation (#10874)

6 years agoTruncate long URLs while providing alt text for inline images
Thibaut Girka [Sun, 26 May 2019 20:42:01 +0000 (22:42 +0200)]
Truncate long URLs while providing alt text for inline images

6 years agoTranslate incoming remote img tags by a link
Thibaut Girka [Sun, 26 May 2019 13:10:33 +0000 (15:10 +0200)]
Translate incoming remote img tags by a link

6 years agoMerge pull request #1073 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 28 May 2019 17:33:15 +0000 (19:33 +0200)]
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
Eugen Rochko [Mon, 27 May 2019 01:33:39 +0000 (03:33 +0200)]
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it

Port SCSS changes from 8d5dcc9301c422f131167574da550f8cdaedb73f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 28 May 2019 15:45:06 +0000 (17:45 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix undefined method error (#10868)
Hinaloe [Tue, 28 May 2019 12:31:51 +0000 (21:31 +0900)]
Fix undefined method error (#10868)

6 years agoBump ox from 2.10.0 to 2.10.1 (#10869)
dependabot-preview[bot] [Tue, 28 May 2019 11:26:36 +0000 (20:26 +0900)]
Bump ox from 2.10.0 to 2.10.1 (#10869)

Bumps [ox](https://github.com/ohler55/ox) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.10.0...v2.10.1)

6 years agoFix undefined method error. (#10867)
mayaeh [Tue, 28 May 2019 03:42:04 +0000 (12:42 +0900)]
Fix undefined method error. (#10867)

6 years agoUpdate simple_form.co.yml (#10862)
Alix Rossi [Tue, 28 May 2019 01:21:30 +0000 (03:21 +0200)]
Update simple_form.co.yml (#10862)

6 years agoFix web push notifications for polls (#10864)
ThibG [Mon, 27 May 2019 22:26:08 +0000 (00:26 +0200)]
Fix web push notifications for polls (#10864)

Fixes #10861

6 years agoRefactor footers in web UI into a single component (#10846)
Eugen Rochko [Mon, 27 May 2019 19:58:41 +0000 (21:58 +0200)]
Refactor footers in web UI into a single component (#10846)

6 years agoImprove rate limiting (#10860)
ThibG [Mon, 27 May 2019 19:57:49 +0000 (21:57 +0200)]
Improve rate limiting (#10860)

* Rate limit based on remote address IP, not on potential reverse proxy

* Limit rate of unauthenticated API requests further

* Rate-limit paging requests to one every 3 seconds

6 years agoDisplay notifications count on a new single column (#10859)
abcang [Mon, 27 May 2019 19:56:29 +0000 (04:56 +0900)]
Display notifications count on a new single column (#10859)

6 years agoMerge pull request #1072 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 27 May 2019 19:26:03 +0000 (21:26 +0200)]
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix video player regressions introduced by blurhash merge
Thibaut Girka [Sun, 26 May 2019 17:55:58 +0000 (19:55 +0200)]
Fix video player regressions introduced by blurhash merge

6 years ago[Glitch] Add keyboard shortcut to hide/show media
Thibaut Girka [Sun, 26 May 2019 16:58:14 +0000 (18:58 +0200)]
[Glitch] Add keyboard shortcut to hide/show media

Port a472190729782f31731674c626c07af483fe9c7f and 988342a56cb58da9ac660eec3e55c3bcbbd6269b to glitch-soc

6 years agoUse `<use />` to render transparent SVG logo instead of inserting it (#10845)
Eugen Rochko [Mon, 27 May 2019 01:33:39 +0000 (03:33 +0200)]
Use `<use />` to render transparent SVG logo instead of inserting it (#10845)

6 years agoFix poll visibility on public pages (#10817)
Takeshi Umeda [Sun, 26 May 2019 21:13:29 +0000 (06:13 +0900)]
Fix poll visibility on public pages (#10817)

* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.

6 years agoDocker: Remove dist-upgrade (#10822)
Sandro Jäckel [Sun, 26 May 2019 20:26:45 +0000 (22:26 +0200)]
Docker: Remove dist-upgrade (#10822)

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 26 May 2019 13:41:40 +0000 (15:41 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

6 years ago[Glitch] Fix composer route opening when not needed
りんすき [Wed, 21 Feb 2018 18:33:23 +0000 (03:33 +0900)]
[Glitch] Fix composer route opening when not needed

Port c1e77b56a92fc075f000af9c263c72ba6bdbe5f7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoCreate new click handler for status__expand area in status (#10837)
Neil Moore [Sun, 26 May 2019 11:48:45 +0000 (07:48 -0400)]
Create new click handler for status__expand area in status (#10837)

This click handler only activates on left-click, resolving #10798.
This matches behavior in status_content.js, as added in #536

6 years agoFix null error in status component when determining showMedia state (#10838)
Eugen Rochko [Sun, 26 May 2019 11:48:16 +0000 (13:48 +0200)]
Fix null error in status component when determining showMedia state (#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs

6 years agoUpdate simple_form.sk.yml (#10842)
Marek Ľach [Sun, 26 May 2019 10:26:39 +0000 (12:26 +0200)]
Update simple_form.sk.yml (#10842)

6 years agoFix wrong redirect from getting started to home in advanced Web UI (#10839)
Hanage999 [Sun, 26 May 2019 10:22:33 +0000 (19:22 +0900)]
Fix wrong redirect from getting started to home in advanced Web UI  (#10839)

* update Ruby to 2.5.3

* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)

6 years agoImprovements to the single column layout (#10835)
Eugen Rochko [Sun, 26 May 2019 00:55:37 +0000 (02:55 +0200)]
Improvements to the single column layout (#10835)

* Improvements to the single column layout

- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel

* Redirect from getting started to home when navigation panel is visible

6 years agoAdd a keyboard shortcut to hide/show media (#10647)
ThibG [Sat, 25 May 2019 21:20:51 +0000 (23:20 +0200)]
Add a keyboard shortcut to hide/show media (#10647)

* Move control of media visibility to parent component

* Add keyboard shortcut to toggle media visibility

6 years agoDocker: Keep /var/lib/apt/ to keep apt working (#10830)
Sandro Jäckel [Sat, 25 May 2019 21:20:28 +0000 (23:20 +0200)]
Docker: Keep /var/lib/apt/ to keep apt working (#10830)

6 years agoExpand abbreviation to minimise confusion (#10826)
Alfie John [Sat, 25 May 2019 21:20:18 +0000 (07:20 +1000)]
Expand abbreviation to minimise confusion (#10826)

6 years agoAvoid cutting bottom of letters of last paragraph of statuses (#10821)
Mélanie Chauvel (ariasuni) [Sat, 25 May 2019 21:19:39 +0000 (23:19 +0200)]
Avoid cutting bottom of letters of last paragraph of statuses (#10821)

6 years agoI18n: Update Czech translation (#10832)
Aditoo17 [Sat, 25 May 2019 20:34:40 +0000 (22:34 +0200)]
I18n: Update Czech translation (#10832)

6 years agoAdd responsive panels to the single-column layout (#10820)
Eugen Rochko [Sat, 25 May 2019 19:27:00 +0000 (21:27 +0200)]
Add responsive panels to the single-column layout (#10820)

* Add responsive panels to the single-column layout

* Fixes

* Fix not being able to save the preference

* Fix code style issues

* Set max-height on the compose textarea and add a link to relationship manager

6 years agoMerge pull request #1068 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 24 May 2019 14:30:49 +0000 (16:30 +0200)]
Merge pull request #1068 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoUse Sec-WebSocket-Protocol instead of query string to pass WebSocket token
Thibaut Girka [Fri, 17 May 2019 18:52:58 +0000 (20:52 +0200)]
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token

Inspired by https://github.com/kubevirt/kubevirt/issues/1242

6 years agoForward port version bumps to 2.8.3 and 2.8.4 (#10819)
Eugen Rochko [Fri, 24 May 2019 13:57:31 +0000 (15:57 +0200)]
Forward port version bumps to 2.8.3 and 2.8.4 (#10819)

* Bump version to 2.8.3

* Bump version to 2.8.4

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 24 May 2019 13:23:52 +0000 (15:23 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- streaming/index.js

6 years agoImprove streaming server security (#10818)
ThibG [Fri, 24 May 2019 13:21:42 +0000 (15:21 +0200)]
Improve streaming server security (#10818)

* Check OAuth token scopes in the streaming API

* Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token

Inspired by https://github.com/kubevirt/kubevirt/issues/1242

6 years agoMerge pull request #1067 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 23 May 2019 20:01:34 +0000 (22:01 +0200)]
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoDo not share a single Redcarpet::Markdown object across threads
Thibaut Girka [Thu, 23 May 2019 16:53:24 +0000 (18:53 +0200)]
Do not share a single Redcarpet::Markdown object across threads

There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 23 May 2019 19:18:27 +0000 (21:18 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoMerge pull request #1065 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 23 May 2019 18:49:18 +0000 (20:49 +0200)]
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoVarious improvements to single column layout (#10809)
Eugen Rochko [Thu, 23 May 2019 18:01:10 +0000 (20:01 +0200)]
Various improvements to single column layout (#10809)

- Add potential side panels to single column layout
- Hide FAB on large screens

6 years agoFix possible race condition when processing statuses (#10815)
ThibG [Thu, 23 May 2019 18:00:39 +0000 (20:00 +0200)]
Fix possible race condition when processing statuses (#10815)

6 years ago[Glitch] Fix stacking order of emoji picker
nzws [Wed, 22 May 2019 16:00:34 +0000 (01:00 +0900)]
[Glitch] Fix stacking order of emoji picker

Port 8a378d4c3d8bd74f3070af0b70725da4a6d10375 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 23 May 2019 17:01:30 +0000 (19:01 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.

6 years agoMove signature verification stoplight to the requests themselves (#10813)
ThibG [Thu, 23 May 2019 13:22:39 +0000 (15:22 +0200)]
Move signature verification stoplight to the requests themselves (#10813)

* Move signature verification stoplight to the requests themselves

This avoids blocking messages from known keys for 5 minutes when only one fails…

* Put the stoplight on the actual client IP, not a potential reverse proxy

6 years agoAdd sponsor button to GitHub web UI (#10814)
Yamagishi Kazutoshi [Thu, 23 May 2019 13:00:54 +0000 (22:00 +0900)]
Add sponsor button to GitHub web UI (#10814)

- https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository

6 years agoRetry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)
ThibG [Thu, 23 May 2019 13:00:30 +0000 (15:00 +0200)]
Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)

HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.

Also added HTTP 408 as that error is by nature temporary.

6 years agoMake headers font size proportional
Thibaut Girka [Tue, 21 May 2019 11:11:06 +0000 (13:11 +0200)]
Make headers font size proportional

6 years agoAllow rel=tag in status text
Thibaut Girka [Thu, 23 May 2019 10:15:46 +0000 (12:15 +0200)]
Allow rel=tag in status text

Fixes tag links in local Markdown or HTML-authored statuses

6 years agoAdd `forceSingleColumn` prop to `<UI />` (#10807)
Eugen Rochko [Wed, 22 May 2019 23:35:22 +0000 (01:35 +0200)]
Add `forceSingleColumn` prop to `<UI />` (#10807)

* Move TabsBar rendering logic from CSS to the ColumnsArea component

* Add forceSingleColumn mode

* Add unread notifications counter to tabs bar

* Add toggle to control `forceSingleColumn`

* Increase paddings in mobile layout responsively at large sizes

6 years agoMigrate from uws to cws (#10805)
abcang [Wed, 22 May 2019 16:19:16 +0000 (01:19 +0900)]
Migrate from uws to cws (#10805)

6 years agoFix stacking order of emoji picker (#10801)
nzws [Wed, 22 May 2019 16:00:34 +0000 (01:00 +0900)]
Fix stacking order of emoji picker (#10801)

6 years agoBump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803)
dependabot[bot] [Wed, 22 May 2019 13:31:05 +0000 (22:31 +0900)]
Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.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/compare/v1.39.0...v1.40.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump rubocop from 0.69.0 to 0.70.0 (#10802)
dependabot[bot] [Wed, 22 May 2019 13:09:10 +0000 (22:09 +0900)]
Bump rubocop from 0.69.0 to 0.70.0 (#10802)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.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.69.0...v0.70.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n: Complete frontend Bengali translation (#10800)
dxwc [Wed, 22 May 2019 01:00:58 +0000 (21:00 -0400)]
i18n: Complete frontend Bengali translation (#10800)

* i18n: Complete frontend Bengali translation

* run yarn manage:translations

6 years agoFix local text/html toots not being sanitized
Thibaut Girka [Tue, 21 May 2019 20:57:59 +0000 (22:57 +0200)]
Fix local text/html toots not being sanitized

6 years agoUpdate remote bio test from 160 to 500 (#10799)
trwnh [Tue, 21 May 2019 11:29:06 +0000 (06:29 -0500)]
Update remote bio test from 160 to 500 (#10799)

6 years agoAdd `account_id` param to `GET /api/v1/notifications` (#10796)
Paul Woolcock [Tue, 21 May 2019 11:28:49 +0000 (07:28 -0400)]
Add `account_id` param to `GET /api/v1/notifications` (#10796)

* Add `from_account` to notifications API

this adds the ability to filter notifications by the account they
originated from

* passing a non-existent user should cause none to be returned

* Fix codeclimate warnings

* fix more codeclimate warnings

* make requested changes:

* use account id instead of user@domain
* name the param `account_id` instead of `from_account`

* Don't use `return` in a lambda

6 years agoBump httplog from 1.2.2 to 1.3.0 (#10795)
dependabot[bot] [Tue, 21 May 2019 06:41:15 +0000 (15:41 +0900)]
Bump httplog from 1.2.2 to 1.3.0 (#10795)

Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/commits/v1.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoRefactor contentType selection in glitch composer
Thibaut Girka [Mon, 20 May 2019 08:05:11 +0000 (10:05 +0200)]
Refactor contentType selection in glitch composer

6 years agoUpdate sk.yml (#10788)
Marek Ľach [Mon, 20 May 2019 06:42:19 +0000 (08:42 +0200)]
Update sk.yml (#10788)

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* normalize

6 years agoBump lograge from 0.11.0 to 0.11.1 (#10793)
dependabot[bot] [Mon, 20 May 2019 06:19:56 +0000 (15:19 +0900)]
Bump lograge from 0.11.0 to 0.11.1 (#10793)

Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.0 to 0.11.1.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.0...v0.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump capybara from 3.20.0 to 3.20.2 (#10794)
dependabot[bot] [Mon, 20 May 2019 06:18:28 +0000 (15:18 +0900)]
Bump capybara from 3.20.0 to 3.20.2 (#10794)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.0 to 3.20.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.0...3.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoUse glitch-soc's poll component instead of upstream's
Thibaut Girka [Sun, 19 May 2019 21:02:32 +0000 (23:02 +0200)]
Use glitch-soc's poll component instead of upstream's

6 years agoChange bio limit from 160 to 500 (#10790)
trwnh [Sun, 19 May 2019 20:51:44 +0000 (15:51 -0500)]
Change bio limit from 160 to 500 (#10790)

* Change note_length validator from 160 to 500

* Change input maxlength from 160 to 500

* update bio test from 160 to 500

* Multiply a string 30 times instead of 10

6 years agoMerge pull request #1055 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 19 May 2019 20:07:42 +0000 (22:07 +0200)]
Merge pull request #1055 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 19 May 2019 19:53:44 +0000 (21:53 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoMerge pull request #1054 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 19 May 2019 19:52:27 +0000 (21:52 +0200)]
Merge pull request #1054 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix “invited by” not showing up for invited accounts in admin interface (#10791)
ThibG [Sun, 19 May 2019 19:40:36 +0000 (21:40 +0200)]
Fix “invited by” not showing up for invited accounts in admin interface (#10791)

6 years agosk.yml grammar update (#10786)
Marek Ľach [Sun, 19 May 2019 17:27:32 +0000 (19:27 +0200)]
sk.yml grammar update (#10786)

* sk.yml grammar update

* bundle exec i18n-tasks normalize

6 years agofix `isSubmitting` prop case (#10785)
Hinaloe [Sun, 19 May 2019 16:41:41 +0000 (01:41 +0900)]
fix `isSubmitting` prop case (#10785)

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 19 May 2019 15:46:31 +0000 (17:46 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoSmall corrections for sk translation (#10784)
Marek Ľach [Sun, 19 May 2019 13:42:10 +0000 (15:42 +0200)]
Small corrections for sk translation (#10784)