13757 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Claire	dc58d02192	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-12 11:03:05 +02:00
Claire	70f6f2e9b7	Fix empty CW when a content-less toot with a CW is encountered twice (#16220)	2021-05-11 22:21:47 +02:00
Claire	4f747d9f83	Fix follow recommendations UI in advanced layout (#16215)	2021-05-11 21:16:24 +02:00
Mélanie Chauvel	0464240f19	Fix dialog close button (#16219) ... * Fix dialog close button being white on almost white * Make dialog close button slightly bigger	2021-05-11 21:15:57 +02:00
rinsuki	5ed5f62705	Fix animated GIF generates animated thumbnail (#16216)	2021-05-11 19:15:11 +02:00
Eugen Rochko	be353bccbb	Fix error when rendering actor with hashtags in bio (#16218) ... Fix #16217, regression from #16160	2021-05-11 19:14:59 +02:00
Takeshi Umeda	c403c3695b	Fix to be able to redownload avatar and header (#16190) ... * Fix to reset if header and avatar download fails * Add RedownloadAvatarWorker and RedownloadHeaderWorker	2021-05-11 14:19:22 +02:00
abcang	b5ad787ebf	Fix rubocop warning (#16214)	2021-05-11 14:19:01 +02:00
abcang	7032d4f582	Ignore brakeman false positive warning (#16213)	2021-05-11 14:18:33 +02:00
abcang	be6f4e013a	Fix eslint error (#16212)	2021-05-11 14:17:38 +02:00
Eugen Rochko	7bd2b54a46	Bump version to 3.4.0rc2 (#16206)	2021-05-10 22:23:48 +02:00
Yamagishi Kazutoshi	a097ec997d	Run i18n-tasks normalize (#16208) ... * Run `i18n-tasks normalize` * Fix consistent interpolations * fix	2021-05-10 22:20:33 +02:00
Claire	ffc3f8eebe	Merge pull request #1534 from ClearlyClaire/glitch-soc/merge-upstream ... Merge upstream changes	2021-05-10 22:17:28 +02:00
Claire	7ac8bcf209	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-10 21:45:32 +02:00
dependabot[bot]	d279666bd4	Bump brakeman from 5.0.0 to 5.0.1 (#16146) ... Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v5.0.0...v5.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:46:39 +02:00
Eugen Rochko	f8d2dbdefa	New Crowdin updates (#16183) ... * New translations en.yml (Kannada) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Hungarian) [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 en.json (Hebrew) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.json (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 en.json (Basque) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [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 en.json (Georgian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Armenian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (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 en.json (Italian) [ci skip] * New translations doorkeeper.en.yml (Armenian) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Afrikaans) [ci skip] * New translations en.json (Afrikaans) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations en.json (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.json (French) [ci skip] * New translations doorkeeper.en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (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 en.json (Danish) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (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 en.json (Catalan) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations simple_form.en.yml (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations en.yml (Chinese Simplified) [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 en.json (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.yml (Vietnamese) [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 en.json (Galician) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [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 (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations en.yml (Punjabi) [ci skip] * New translations en.json (Punjabi) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Macedonian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (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 en.json (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * i18n-tasks normalize * yarn manage:translations	2021-05-10 17:46:23 +02:00
dependabot[bot]	a8cce402e0	Bump rubocop from 1.13.0 to 1.14.0 (#16192) ... Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.13.0...v1.14.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:41:37 +02:00
dependabot[bot]	7342d3b132	Bump glob from 7.1.6 to 7.1.7 (#16204) ... Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.6 to 7.1.7. - [Release notes](https://github.com/isaacs/node-glob/releases) - [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v7.1.6...v7.1.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:37:23 +02:00
dependabot[bot]	6ac84c1e33	Bump @babel/preset-env from 7.14.0 to 7.14.1 (#16203) ... Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.0 to 7.14.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.1/packages/babel-preset-env) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:37:09 +02:00
dependabot[bot]	74fa5542a6	Bump yargs from 17.0.0 to 17.0.1 (#16201) ... Bumps [yargs](https://github.com/yargs/yargs) from 17.0.0 to 17.0.1. - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs/compare/v17.0.0...v17.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:36:47 +02:00
dependabot[bot]	3605df1e6f	Bump eslint from 7.25.0 to 7.26.0 (#16200) ... Bumps [eslint](https://github.com/eslint/eslint) from 7.25.0 to 7.26.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.25.0...v7.26.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:36:38 +02:00
dependabot[bot]	25ee7c7be6	Bump utf-8-validate from 5.0.4 to 5.0.5 (#16199) ... Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate) from 5.0.4 to 5.0.5. - [Release notes](https://github.com/websockets/utf-8-validate/releases) - [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.4...v5.0.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:36:26 +02:00
dependabot[bot]	04e4e864c1	Bump rqrcode from 1.2.0 to 2.0.0 (#16198) ... Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 1.2.0 to 2.0.0. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md) - [Commits](https://github.com/whomwah/rqrcode/compare/v1.2.0...v2.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:36:14 +02:00
dependabot[bot]	cd80ab8826	Bump stackprof from 0.2.16 to 0.2.17 (#16197) ... Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.16 to 0.2.17. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.16...v0.2.17) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:35:31 +02:00
dependabot[bot]	43e8b4982f	Bump rubocop-rails from 2.9.1 to 2.10.1 (#16193) ... Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.9.1 to 2.10.1. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.9.1...v2.10.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:35:24 +02:00
dependabot[bot]	a4243eefdc	Bump aws-sdk-s3 from 1.94.0 to 1.94.1 (#16191) ... Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.94.0 to 1.94.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:35:09 +02:00
dependabot[bot]	10e95ed0c8	Bump dotenv from 8.2.0 to 9.0.1 (#16202) ... Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.2.0 to 9.0.1. - [Release notes](https://github.com/motdotla/dotenv/releases) - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:34:59 +02:00
Claire	afb7882189	Fix blocking someone not clearing up list feeds (#16205)	2021-05-10 17:31:55 +02:00
dependabot[bot]	10cd2d1e86	Bump puma from 5.2.2 to 5.3.0 (#16194) ... Bumps [puma](https://github.com/puma/puma) from 5.2.2 to 5.3.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.2.2...v5.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:27:50 +02:00
dependabot[bot]	08769fd69f	Bump rails from 6.1.3.1 to 6.1.3.2 (#16196) ... Bumps [rails](https://github.com/rails/rails) from 6.1.3.1 to 6.1.3.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.1.3.1...v6.1.3.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 17:25:36 +02:00
Claire	fc8baba8cb	Merge pull request #1533 from ClearlyClaire/glitch-soc/merge-upstream ... Merge upstream changes	2021-05-09 11:14:32 +02:00
Mélanie Chauvel	299ab28d5f	[Glitch] Make media_gallery.toggle_visible less confusing to translate ... Port 68181b9506 to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-09 10:50:39 +02:00
Claire	87c3a0d0b3	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-09 10:41:28 +02:00
Takeshi Umeda	9b18914c35	Add a Redis environment variable for sidekiq (#16188)	2021-05-09 10:40:17 +02:00
Claire	f9c2d1b9a1	Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189) ... Since #16173, `account_summaries` and `follow_recommendations` are not populated at creation time, which causes concurrent refresh to fail. As we currently only use those materialized views right after explicitly refreshing them, this commit changes refreshes to not be performed concurrently. This will fix the issue and ensure the refresh completes faster while using less resources.	2021-05-09 10:39:29 +02:00
rinsuki	4d31cef19d	Fix breaking change about format of accounts.created_at (#16186)	2021-05-09 10:39:13 +02:00
Eugen Rochko	d1442a06c3	Bump version to 3.4.0rc1 (#16053)	2021-05-08 17:15:06 +02:00
Eugen Rochko	bd1abac370	New Crowdin updates (#16094) ... * New translations devise.en.yml (Welsh) [ci skip] * New translations devise.en.yml (Esperanto) [ci skip] * New translations devise.en.yml (Hindi) [ci skip] * New translations devise.en.yml (Kazakh) [ci skip] * New translations devise.en.yml (Croatian) [ci skip] * New translations devise.en.yml (Norwegian Nynorsk) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations activerecord.en.yml (Japanese) [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 (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Sanskrit) [ci skip] * New translations en.yml (Sardinian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Sorani (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Tatar) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Scottish Gaelic) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Galician) [ci skip] * New translations 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 (Russian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Korean) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations activerecord.en.yml (Finnish) [ci skip] * New translations devise.en.yml (Finnish) [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.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 simple_form.en.yml (Dutch) [ci skip] * New translations devise.en.yml (Dutch) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Danish) [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 simple_form.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.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * i18n-tasks normalize * yarn manage:translations	2021-05-08 17:12:56 +02:00
Takeshi Umeda	9da5e0b350	Fix webfinger_update_due to run WebFinger on stale activitypub-account (#16182)	2021-05-08 16:22:18 +02:00
Mélanie Chauvel	68181b9506	Make media_gallery.toggle_visible less confusing to translate (#15993) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2021-05-08 01:56:40 +02:00
Claire	5233e99106	Merge pull request #1531 from ClearlyClaire/glitch-soc/features/upstream-media-modal ... Port upstream's new media modal	2021-05-08 00:37:51 +02:00
Claire	df82963ea4	Merge pull request #1532 from ClearlyClaire/glitch-soc/merge-upstream ... Merge upstream changes	2021-05-08 00:21:55 +02:00
Claire	fbf097f7e1	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-08 00:01:47 +02:00
Marcin Mikołajczak	196cef8977	[Glitch] Add transition to media modal background ... Port f8e50eaea3 to glitch-soc Signed-off-by: marcin mikołajczak <me@mkljczk.pl> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
Takeshi Umeda	34cc6f45ac	[Glitch] Fix expand video on public page ... Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
ThibG	d8e756eda8	[Glitch] Fix media modal buttons not showing up on mobile ... Port b08d2d4f78 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
Eugen Rochko	d973a90bcc	[Glitch] Fix not being able to open audio modal in web UI ... Port a8c471fcc0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
Eugen Rochko	f29f8caccb	[Glitch] Fix too low contrast on new media modal background in web UI ... Port 014733d1e4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
Eugen Rochko	cccc65651d	[Glitch] Fix media modal crashing when media has no blurhash ... Port 13206fcfb8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00
Eugen Rochko	9dde2400d0	[Glitch] Fix media modal regression on public pages ... Port e1a6526c8d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2021-05-07 22:47:09 +02:00