]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoMerge pull request #1289 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 25 Feb 2020 17:05:52 +0000 (18:05 +0100)]
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix `/web` redirecting to `/web/web` in web UI
ThibG [Sat, 22 Feb 2020 00:27:34 +0000 (01:27 +0100)]
[Glitch] Fix `/web` redirecting to `/web/web` in web UI

Port 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix dismissing an announcement twice raising an obscure error (#13124)
ThibG [Mon, 24 Feb 2020 21:21:40 +0000 (22:21 +0100)]
Fix dismissing an announcement twice raising an obscure error (#13124)

6 years agoFix misleading error when attempting to re-send a pending follow request (#13133)
ThibG [Mon, 24 Feb 2020 20:19:19 +0000 (21:19 +0100)]
Fix misleading error when attempting to re-send a pending follow request (#13133)

Fixes #13131

6 years agoFix backups failing when files are missing from media attachments (#13146)
ThibG [Mon, 24 Feb 2020 20:18:26 +0000 (21:18 +0100)]
Fix backups failing when files are missing from media attachments (#13146)

Fixes #13123

6 years agoFix duplicate accounts being created when fetching an account for its key only (...
ThibG [Mon, 24 Feb 2020 20:15:53 +0000 (21:15 +0100)]
Fix duplicate accounts being created when fetching an account for its key only (#13147)

Fixes #13136

When a user's canonical acct domain is different from its id's domain
(WEB_DOMAIN ≠ LOCAL_DOMAIN), two webfinger queries are required to find the
canonical domain from the URI. However, we skip webfinger queries when
updating only the key of a remote user, which led to the creation of a
duplicate account, using the URI's domain instead of the canonical acct: one.

6 years agoBump react-redux from 7.1.3 to 7.2.0 (#13141)
dependabot-preview[bot] [Mon, 24 Feb 2020 12:54:19 +0000 (21:54 +0900)]
Bump react-redux from 7.1.3 to 7.2.0 (#13141)

Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.3 to 7.2.0.
- [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/v7.1.3...v7.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump webpack-cli from 3.3.10 to 3.3.11 (#13139)
dependabot-preview[bot] [Mon, 24 Feb 2020 08:50:25 +0000 (17:50 +0900)]
Bump webpack-cli from 3.3.10 to 3.3.11 (#13139)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.10 to 3.3.11.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/next/CHANGELOG_v3.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.10...v3.3.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rellax from 1.10.0 to 1.12.1 (#13140)
dependabot-preview[bot] [Mon, 24 Feb 2020 08:50:18 +0000 (17:50 +0900)]
Bump rellax from 1.10.0 to 1.12.1 (#13140)

Bumps [rellax](https://github.com/dixonandmoe/rellax) from 1.10.0 to 1.12.1.
- [Release notes](https://github.com/dixonandmoe/rellax/releases)
- [Commits](https://github.com/dixonandmoe/rellax/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/core from 7.8.3 to 7.8.4 (#13137)
dependabot-preview[bot] [Mon, 24 Feb 2020 08:36:32 +0000 (17:36 +0900)]
Bump @babel/core from 7.8.3 to 7.8.4 (#13137)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoDocument alt+enter
Thibaut Girka [Fri, 21 Feb 2020 11:25:23 +0000 (12:25 +0100)]
Document alt+enter

6 years agoAdd `--reset-password` option to `tootctl accounts modify` (#13126)
ThibG [Sat, 22 Feb 2020 00:29:14 +0000 (01:29 +0100)]
Add `--reset-password` option to `tootctl accounts modify` (#13126)

6 years agoFix `/web` redirecting to `/web/web` in web UI (#13128)
ThibG [Sat, 22 Feb 2020 00:27:34 +0000 (01:27 +0100)]
Fix `/web` redirecting to `/web/web` in web UI (#13128)

Fixes #13127

6 years agoFix previously OStatus-based accounts not being detected as ActivityPub (#13129)
ThibG [Sat, 22 Feb 2020 00:26:41 +0000 (01:26 +0100)]
Fix previously OStatus-based accounts not being detected as ActivityPub (#13129)

6 years agoBump rack from 2.1.2 to 2.2.2 (#13108)
dependabot-preview[bot] [Thu, 20 Feb 2020 00:24:16 +0000 (09:24 +0900)]
Bump rack from 2.1.2 to 2.2.2 (#13108)

Bumps [rack](https://github.com/rack/rack) from 2.1.2 to 2.2.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoMerge pull request #1287 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 19 Feb 2020 23:52:50 +0000 (00:52 +0100)]
Merge pull request #1287 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Add source-mapped stacktrace to error message in web UI
Thibaut Girka [Wed, 19 Feb 2020 22:16:29 +0000 (23:16 +0100)]
[Glitch] Add source-mapped stacktrace to error message in web UI

Port ff3a11d01d262c0a37cc1e33db2013b19729fb9d to glitch-soc

6 years ago[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI
ThibG [Tue, 18 Feb 2020 16:22:44 +0000 (17:22 +0100)]
[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI

Port 1314bba68a5f2d271312bad08f108e1ff56c2c00 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 19 Feb 2020 22:04:18 +0000 (23:04 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd source-mapped stacktrace to error message in web UI (#13082)
ThibG [Wed, 19 Feb 2020 21:36:52 +0000 (22:36 +0100)]
Add source-mapped stacktrace to error message in web UI (#13082)

* Add source-mapped stack trace to copyable text in error boundary

* Add the error message to the copied report, not only the stack trace

6 years agoFix account JSON/RSS not being cacheable due to wrong mime type comparison (#13116)
ThibG [Wed, 19 Feb 2020 21:31:53 +0000 (22:31 +0100)]
Fix account JSON/RSS not being cacheable due to wrong mime type comparison (#13116)

`request.format` is not a symbol but a `Mime::Type`, so the condition actually
never matched, and a session was created even for those requests, preventing
caching.

6 years agoFix old browsers crashing because of missing `finally` polyfill in web UI (#13115)
ThibG [Tue, 18 Feb 2020 16:22:44 +0000 (17:22 +0100)]
Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)

Fix #13015

6 years agoBump simplecov from 0.18.1 to 0.18.2 (#13106)
dependabot-preview[bot] [Mon, 17 Feb 2020 17:27:19 +0000 (02:27 +0900)]
Bump simplecov from 0.18.1 to 0.18.2 (#13106)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.1 to 0.18.2.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.1...v0.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump pkg-config from 1.4.0 to 1.4.1 (#13105)
dependabot-preview[bot] [Mon, 17 Feb 2020 17:24:20 +0000 (02:24 +0900)]
Bump pkg-config from 1.4.0 to 1.4.1 (#13105)

Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.0...1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump nokogiri from 1.10.7 to 1.10.8 (#13110)
dependabot-preview[bot] [Mon, 17 Feb 2020 17:22:43 +0000 (02:22 +0900)]
Bump nokogiri from 1.10.7 to 1.10.8 (#13110)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rimraf from 3.0.0 to 3.0.2 (#13104)
dependabot-preview[bot] [Mon, 17 Feb 2020 16:58:14 +0000 (01:58 +0900)]
Bump rimraf from 3.0.0 to 3.0.2 (#13104)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump react-swipeable-views from 0.13.4 to 0.13.9 (#13103)
dependabot-preview[bot] [Mon, 17 Feb 2020 16:57:29 +0000 (01:57 +0900)]
Bump react-swipeable-views from 0.13.4 to 0.13.9 (#13103)

Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) from 0.13.4 to 0.13.9.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases)
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/commits/v0.13.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump eslint-plugin-import from 2.20.0 to 2.20.1 (#13101)
dependabot-preview[bot] [Mon, 17 Feb 2020 16:53:02 +0000 (01:53 +0900)]
Bump eslint-plugin-import from 2.20.0 to 2.20.1 (#13101)

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.0 to 2.20.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.0...v2.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump terser-webpack-plugin from 2.3.2 to 2.3.5 (#13100)
dependabot-preview[bot] [Mon, 17 Feb 2020 16:49:21 +0000 (01:49 +0900)]
Bump terser-webpack-plugin from 2.3.2 to 2.3.5 (#13100)

Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.3.2 to 2.3.5.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.2...v2.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoFix account's bio not being shown if there are no proofs/fields in admin UI (#13075)
ThibG [Mon, 17 Feb 2020 15:38:59 +0000 (16:38 +0100)]
Fix account's bio not being shown if there are no proofs/fields in admin UI (#13075)

6 years agoFix sign-ups without checked user agreement being accepted through the web form ...
ThibG [Sun, 16 Feb 2020 11:56:53 +0000 (12:56 +0100)]
Fix sign-ups without checked user agreement being accepted through the web form (#13088)

* Fix user agreement not being verified

* Fix tests

* Fix up agreement field being dismissed

6 years agoFix non-x64 architectures not being able to build Docker image because of hardcoded...
Sara Aimée Smiseth [Sun, 16 Feb 2020 11:54:57 +0000 (11:54 +0000)]
Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture (#13081)

* Use ARCH variable instead of hardcoded x64

* fix formating

6 years agoFix invite request input not being shown on sign-up error if left empty (#13089)
ThibG [Sun, 16 Feb 2020 11:38:22 +0000 (12:38 +0100)]
Fix invite request input not being shown on sign-up error if left empty (#13089)

If the “Why do you want to join?” textarea is left empty and the entered params
do not validate, the textarea isn't shown again, unlike other fields.

This commit fixes that by populating an empty `UserInviteRequest` when needed.

6 years agoFix clicking on the “TOOT” button send bogus visibility parameter
Thibaut Girka [Sat, 15 Feb 2020 22:51:24 +0000 (23:51 +0100)]
Fix clicking on the “TOOT” button send bogus visibility parameter

6 years agoDo not suggest to login into the GitLab database (#13084)
Marcin Cieślak [Sat, 15 Feb 2020 11:52:57 +0000 (12:52 +0100)]
Do not suggest to login into the GitLab database (#13084)

As pointed out on Discourse:

https://discourse.joinmastodon.org/t/obscure-wtf-error-message-running-migrations-for-3-1/2524

The message the administrators were getting was telling them
to log in to the "GitLab database" and also mentions MySQL

6 years agoFix alt+enter changing visibility setting without sending toot when toot is empty
Thibaut Girka [Fri, 14 Feb 2020 19:19:35 +0000 (20:19 +0100)]
Fix alt+enter changing visibility setting without sending toot when toot is empty

6 years agoAdd test for health_check endpoint
Thibaut Girka [Mon, 10 Feb 2020 18:13:12 +0000 (19:13 +0100)]
Add test for health_check endpoint

6 years agoFix ActiveRecord::Migration.check_pending! failing because of duplicate migrations
Thibaut Girka [Mon, 10 Feb 2020 18:03:14 +0000 (19:03 +0100)]
Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations

6 years agoBump @babel/plugin-transform-runtime from 7.7.6 to 7.8.3 (#12980)
dependabot-preview[bot] [Mon, 10 Feb 2020 12:34:03 +0000 (21:34 +0900)]
Bump @babel/plugin-transform-runtime from 7.7.6 to 7.8.3 (#12980)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.7.6 to 7.8.3.
- [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.7.6...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump json-ld-preloaded from 3.0.6 to 3.1.0 (#12982)
dependabot-preview[bot] [Mon, 10 Feb 2020 12:26:53 +0000 (21:26 +0900)]
Bump json-ld-preloaded from 3.0.6 to 3.1.0 (#12982)

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rubocop-rails from 2.4.1 to 2.4.2 (#12984)
dependabot-preview[bot] [Mon, 10 Feb 2020 12:18:07 +0000 (21:18 +0900)]
Bump rubocop-rails from 2.4.1 to 2.4.2 (#12984)

Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump capybara from 3.30.0 to 3.31.0 (#12983)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:51:14 +0000 (20:51 +0900)]
Bump capybara from 3.30.0 to 3.31.0 (#12983)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.30.0 to 3.31.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.30.0...3.31.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump simplecov from 0.17.1 to 0.18.1 (#13027)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:46:25 +0000 (20:46 +0900)]
Bump simplecov from 0.17.1 to 0.18.1 (#13027)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.1 to 0.18.1.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump pry-byebug from 3.7.0 to 3.8.0 (#12985)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:46:05 +0000 (20:46 +0900)]
Bump pry-byebug from 3.7.0 to 3.8.0 (#12985)

Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump uuid from 3.3.3 to 3.4.0 (#12981)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:41:58 +0000 (20:41 +0900)]
Bump uuid from 3.3.3 to 3.4.0 (#12981)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump sass from 1.24.2 to 1.25.0 (#12978)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:40:32 +0000 (20:40 +0900)]
Bump sass from 1.24.2 to 1.25.0 (#12978)

Bumps [sass](https://github.com/sass/dart-sass) from 1.24.2 to 1.25.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.24.2...1.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump axios from 0.19.1 to 0.19.2 (#12976)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:30:40 +0000 (20:30 +0900)]
Bump axios from 0.19.1 to 0.19.2 (#12976)

Bumps [axios](https://github.com/axios/axios) from 0.19.1 to 0.19.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/0.19.1...v0.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-transform-react-inline-elements from 7.8.0 to 7.8.3 (#12974)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:29:15 +0000 (20:29 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.8.0 to 7.8.3 (#12974)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.0 to 7.8.3.
- [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.8.0...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump letter_opener_web from 1.3.4 to 1.4.0 (#13028)
dependabot-preview[bot] [Mon, 10 Feb 2020 11:28:22 +0000 (20:28 +0900)]
Bump letter_opener_web from 1.3.4 to 1.4.0 (#13028)

Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases)
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump version to 3.1.1 (#13069)
Eugen Rochko [Mon, 10 Feb 2020 01:55:40 +0000 (02:55 +0100)]
Bump version to 3.1.1 (#13069)

6 years agoFix boosting private toots in detailed view
Thibaut Girka [Sun, 9 Feb 2020 20:37:06 +0000 (21:37 +0100)]
Fix boosting private toots in detailed view

6 years agoMerge pull request #1280 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 9 Feb 2020 11:56:12 +0000 (12:56 +0100)]
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix tests
Thibaut Girka [Sun, 9 Feb 2020 11:32:33 +0000 (12:32 +0100)]
Fix tests

Well, kinda, it's actually a bug from glitch-soc, but we will have to address it separately.

6 years ago[Glitch] Fix unread indicator on announcements not being aligned with text in web UI
Eugen Rochko [Sat, 8 Feb 2020 22:44:01 +0000 (23:44 +0100)]
[Glitch] Fix unread indicator on announcements not being aligned with text in web UI

Port 90f04ea06425d5774c200818caf08219c172b6f8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix native share button not being displayed for unlisted toots
ThibG [Fri, 7 Feb 2020 12:21:25 +0000 (13:21 +0100)]
[Glitch] Fix native share button not being displayed for unlisted toots

Port 02236332bab7c5cc4ddf4a3a778fd956f6851322 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 9 Feb 2020 11:15:55 +0000 (12:15 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.

6 years agoBump httplog from 1.4.1 to 1.4.2 (#13059)
mayaeh [Sun, 9 Feb 2020 11:05:31 +0000 (20:05 +0900)]
Bump httplog from 1.4.1 to 1.4.2 (#13059)

6 years agoupdate gemfile.lock for httplog 1.4.1
Lynne [Sun, 9 Feb 2020 06:39:55 +0000 (16:39 +1000)]
update gemfile.lock for httplog 1.4.1

6 years agoupdate gemfile to reflect yanked httplog 1.4.0
Lynne [Sun, 9 Feb 2020 06:38:57 +0000 (16:38 +1000)]
update gemfile to reflect yanked httplog 1.4.0

6 years agoBump version to 3.1.0 (#13053)
Eugen Rochko [Sat, 8 Feb 2020 23:02:08 +0000 (00:02 +0100)]
Bump version to 3.1.0 (#13053)

6 years agoFix unread indicator on announcements not being aligned with text in web UI (#13052)
Eugen Rochko [Sat, 8 Feb 2020 22:44:01 +0000 (23:44 +0100)]
Fix unread indicator on announcements not being aligned with text in web UI (#13052)

6 years agoNew Crowdin translations (#13036)
Eugen Rochko [Sat, 8 Feb 2020 22:33:22 +0000 (23:33 +0100)]
New Crowdin translations (#13036)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations simple_form.en.yml (Spanish)
[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 (Spanish, Argentina)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

6 years agoBump httplog from 1.4.0 to 1.4.1. (#13051)
mayaeh [Sat, 8 Feb 2020 20:39:44 +0000 (05:39 +0900)]
Bump httplog from 1.4.0 to 1.4.1. (#13051)

httplog 1.4.0 is yanked.

6 years agoFix rendering `<a>` without `href` when scheme unsupported (#13040)
Eugen Rochko [Sat, 8 Feb 2020 20:22:38 +0000 (21:22 +0100)]
Fix rendering `<a>` without `href` when scheme unsupported (#13040)

- Disallow links with relative paths
- Disallow iframes with non-http protocols and relative paths

Close #13037

6 years agoFix unfiltered params error when generating ActivityPub tag pagination (#13049)
Eugen Rochko [Sat, 8 Feb 2020 16:29:40 +0000 (17:29 +0100)]
Fix unfiltered params error when generating ActivityPub tag pagination (#13049)

6 years agoFix malformed HTML causing uncaught error (#13042)
Eugen Rochko [Fri, 7 Feb 2020 14:24:22 +0000 (15:24 +0100)]
Fix malformed HTML causing uncaught error (#13042)

Fix OEmbed preview API leaking existence of private statuses (see #12930)

6 years agoFix native share button not being displayed for unlisted toots (#13045)
ThibG [Fri, 7 Feb 2020 12:21:25 +0000 (13:21 +0100)]
Fix native share button not being displayed for unlisted toots (#13045)

6 years agoMerge pull request #1278 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 6 Feb 2020 21:48:26 +0000 (22:48 +0100)]
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix dates (without time) being rendered as datetimes in public pages
ThibG [Mon, 3 Feb 2020 16:48:56 +0000 (17:48 +0100)]
[Glitch] Fix dates (without time) being rendered as datetimes in public pages

Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Don't display toggle reveal button in video modal when full screen
fuyu [Mon, 3 Feb 2020 11:26:00 +0000 (20:26 +0900)]
[Glitch] Don't display toggle reveal button in video modal when full screen

Port 5711899c59147252a01e21371994ca6a60418628 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 6 Feb 2020 20:36:38 +0000 (21:36 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd environment variable to specify extra data hosts
Thibaut Girka [Thu, 6 Feb 2020 10:25:18 +0000 (11:25 +0100)]
Add environment variable to specify extra data hosts

Fixes #1276

6 years agoFix typo in about page (#13038)
ThibG [Mon, 3 Feb 2020 22:29:42 +0000 (23:29 +0100)]
Fix typo in about page (#13038)

6 years agoFix punycode being returned in some entities instead of unicode in REST API (#13035)
Eugen Rochko [Mon, 3 Feb 2020 20:16:37 +0000 (21:16 +0100)]
Fix punycode being returned in some entities instead of unicode in REST API (#13035)

6 years agoFix remote convertible media attachments not being saved (#13032)
Eugen Rochko [Mon, 3 Feb 2020 17:45:56 +0000 (18:45 +0100)]
Fix remote convertible media attachments not being saved (#13032)

Because the file name was set after loading the file, Paperclip
was flagging the differing file extension as content type spoofing

Fix #12938

6 years agoFix punycode being rendered instead of unicode in some places (#13030)
Eugen Rochko [Mon, 3 Feb 2020 17:44:54 +0000 (18:44 +0100)]
Fix punycode being rendered instead of unicode in some places (#13030)

6 years agoFix dates (without time) being rendered as datetimes in public pages (#13034)
ThibG [Mon, 3 Feb 2020 16:48:56 +0000 (17:48 +0100)]
Fix dates (without time) being rendered as datetimes in public pages (#13034)

6 years agoChange signature verification to ignore signatures with invalid host (#13033)
Eugen Rochko [Mon, 3 Feb 2020 16:48:23 +0000 (17:48 +0100)]
Change signature verification to ignore signatures with invalid host (#13033)

Instead of returning a signature verification error, pretend there
was no signature (i.e., this does not allow access to resources that
need a valid signature), so public resources can still be fetched

Fix #13011

6 years agoNew Crowdin translations (#12953)
Eugen Rochko [Mon, 3 Feb 2020 14:52:20 +0000 (15:52 +0100)]
New Crowdin translations (#12953)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations en.json (Hungarian)
[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 simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

6 years agoDon't display toggle reveal button in video modal when full screen (#13026)
fuyu [Mon, 3 Feb 2020 11:26:00 +0000 (20:26 +0900)]
Don't display toggle reveal button in video modal when full screen (#13026)

6 years agoFix poll compose form being broken on single-column layout
Thibaut Girka [Mon, 3 Feb 2020 10:40:41 +0000 (11:40 +0100)]
Fix poll compose form being broken on single-column layout

6 years agoMerge pull request #1274 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 3 Feb 2020 09:27:07 +0000 (10:27 +0100)]
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Change how unread announcements are handled
ThibG [Mon, 3 Feb 2020 00:53:09 +0000 (01:53 +0100)]
[Glitch] Change how unread announcements are handled

Port 3adc722d1cdd28d87d2724b8952d7ec52d241b52 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add "Show thread" button to public profiles
Sasha Sorokin [Wed, 29 Jan 2020 16:35:54 +0000 (11:35 -0500)]
[Glitch] Add "Show thread" button to public profiles

Port 50cd73e5d7e39600203c9c3f591f04289f41e297 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix mascot being too large, and a code style issue
Eugen Rochko [Wed, 29 Jan 2020 15:18:33 +0000 (16:18 +0100)]
[Glitch] Fix mascot being too large, and a code style issue

Port bba0269d9741c8c4daaa9048c265a1321d93fbba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 3 Feb 2020 08:22:58 +0000 (09:22 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoChange how unread announcements are handled (#13020)
ThibG [Mon, 3 Feb 2020 00:53:09 +0000 (01:53 +0100)]
Change how unread announcements are handled (#13020)

* Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read

* Change how unread announcements are counted in UI

* Add unread marker to announcements and mark announcements as unread as they are displayed

* Fixups

6 years agoWhen submitting markers, use last displayed notification, not last received one
Thibaut Girka [Sat, 1 Feb 2020 16:53:28 +0000 (17:53 +0100)]
When submitting markers, use last displayed notification, not last received one

6 years agoFetch last read notification id to update unread notification count on load
Thibaut Girka [Sat, 1 Feb 2020 16:03:39 +0000 (17:03 +0100)]
Fetch last read notification id to update unread notification count on load

6 years agoSearch account domain in lowercase (#13016)
abcang [Sat, 1 Feb 2020 14:42:24 +0000 (23:42 +0900)]
Search account domain in lowercase (#13016)

* Search account domain in lowercase

* fix rubocop error

* fix spec/models/account_spec.rb

6 years agoFix error when sending moderation notification (#13014)
Renato "Lond" Cerqueira [Sat, 1 Feb 2020 14:42:12 +0000 (15:42 +0100)]
Fix error when sending moderation notification (#13014)

Since the statuses helper is not loaded, the rtl helper cannot be found
and the email cannot be sent.

6 years agoFix Node version in Vagrant (#13008)
Даниил Пронин [Thu, 30 Jan 2020 11:05:56 +0000 (21:05 +1000)]
Fix Node version in Vagrant (#13008)

6 years agoFix english wording (#13003)
ThibG [Wed, 29 Jan 2020 17:39:44 +0000 (18:39 +0100)]
Fix english wording (#13003)

6 years agoAdd "Show thread" button to public profiles (#13000)
Sasha Sorokin [Wed, 29 Jan 2020 16:35:54 +0000 (11:35 -0500)]
Add "Show thread" button to public profiles (#13000)

This adds "Show thread" button to the status view which is used in
profiles. The logic to display the button is mimicking logic in
web app available at app/javascript/mastodon/components/status.js#L439.

* The little change in components CSS required to remove enforced
  underline for all links on public pages on our button.

6 years agoFix mascot being too large, and a code style issue (#13002)
Eugen Rochko [Wed, 29 Jan 2020 15:18:33 +0000 (16:18 +0100)]
Fix mascot being too large, and a code style issue (#13002)

6 years agoBump version to 3.1.0rc2 (#12999)
Eugen Rochko [Tue, 28 Jan 2020 19:56:32 +0000 (20:56 +0100)]
Bump version to 3.1.0rc2 (#12999)

6 years agoUpdate Dockerfile (#12997)
Shlee [Tue, 28 Jan 2020 19:33:09 +0000 (03:33 +0800)]
Update Dockerfile (#12997)

6 years agoAdd missing translations (#12996)
Sasha Sorokin [Tue, 28 Jan 2020 19:28:38 +0000 (14:28 -0500)]
Add missing translations (#12996)

This commit adds missing translations for #12966 and #12954.

6 years agoAdd support for xmpp: and magnet: URIs to misleading link detection code
Thibaut Girka [Sun, 26 Jan 2020 14:26:03 +0000 (15:26 +0100)]
Add support for xmpp: and magnet: URIs to misleading link detection code