1043 Commits (9381f7816639418acf0934c1594ac6d863a4c078)

Author	SHA1	Message	Date
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	1 year ago
Steven Munn	52d36f0f98	Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959) ... Co-authored-by: Steven Munn <stevenjmunn@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Eugen Rochko	3869e8c210	Change "Sign in" to "Login" (#24942)	2 years ago
Renaud Chaput	5eeb40bdbe	Add stricter ESLint rules for Typescript files (#24926)	2 years ago
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2 years ago
Eugen Rochko	0a08e9d3d3	New Crowdin updates (#24678) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2 years ago
Eugen Rochko	8979b70975	Add default post text to onboarding flow in web UI (#24705)	2 years ago
Eugen Rochko	7cf963eec2	Change label from "For you" to "People" on explore screen in web UI (#24706)	2 years ago
Eugen Rochko	d4511f2a76	New Crowdin updates (#24617) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	c35e3cb6ac	Add more tips to onboarding flow in web UI (#24646)	2 years ago
Nick Schonning	2daa5a1549	Enable formatjs/prefer-pound-in-plural (#24622)	2 years ago
Nick Schonning	ef3675d688	Remove empty Kushubian (csb) local files (#24151)	2 years ago
Eugen Rochko	0461f83320	Add new onboarding flow to web UI (#24619)	2 years ago
Eugen Rochko	9d75b03ba4	New Crowdin updates (#24517) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	955ec252a4	Add client-side validation for taken username in sign-up form (#24546)	2 years ago
Ivan Rodriguez	f05fb51ecb	Fix status title for statuses without text (#24359)	2 years ago
Claire	8f0b0435ab	Fix missing translation strings in en.json and defaultMessages.json (#24518)	2 years ago
Eugen Rochko	c5eba06d8c	New Crowdin updates (#24447) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	cee357d538	Change all components to use the same error page in web UI (#24512)	2 years ago
Claire	c11e69f33a	Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`	2 years ago
Claire	ce12934f5b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.	2 years ago
Claire	10469a0b85	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169) ... This reduces differences with upstream and fixes a bunch of locale-data files having been forgotten.	2 years ago
Eugen Rochko	c9f3438efe	New Crowdin updates (#24378) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	4909c2e718	New Crowdin updates (#24276) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	2b11376411	Change search pop-out in web UI (#24305)	2 years ago
Claire	01d6f7529f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.	2 years ago
Eugen Rochko	68a192e718	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2 years ago
Eugen Rochko	cf12621e37	New Crowdin updates (#24130) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	193250556c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.	2 years ago
Eugen Rochko	a085901108	New Crowdin updates (#23904) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	3ef5f62abf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.	2 years ago
PauloVilarinho	8770473dbb	add modal message when editing toot (#23936) ... Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>	2 years ago
Claire	276c1d32d6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	cb97ba7a2f	New Crowdin updates (#23802) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	4ed09276d5	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.	2 years ago
Eugen Rochko	2564117131	New Crowdin updates (#23625) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	7452a95998	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.	2 years ago
Eugen Rochko	630975bf41	New Crowdin updates (#23527) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	87419f9307	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	71ae17e8f5	New Crowdin updates (#23413) ... * New translations en.json (Esperanto) * New translations en.yml (Slovak) * New translations en.json (Burmese) * New translations en.yml (Korean) * New translations en.json (Burmese) * New translations en.json (Burmese) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.json (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.json (Burmese) * New translations activerecord.en.yml (Burmese) * New translations en.yml (Burmese) * New translations activerecord.en.yml (Burmese) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations en.json (Catalan) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.json (Russian) * New translations en.json (Belarusian) * New translations en.json (Belarusian) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations doorkeeper.en.yml (Korean) * New translations en.json (Burmese) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.yml (English, United Kingdom) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations devise.en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.json (Silesian) * New translations en.yml (Occitan) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.json (Occitan) * New translations activerecord.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * Normalize * Remove unused locales --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	85558a5e18	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.	2 years ago
Eugen Rochko	e2207af3d7	New Crowdin updates (#23393) ... * New translations en.yml (Portuguese) * New translations en.yml (Romanian) * New translations en.yml (Spanish) * New translations en.yml (Afrikaans) * New translations en.yml (Arabic) * New translations en.yml (Belarusian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Basque) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Italian) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Polish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Punjabi) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Thai) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Latvian) * New translations en.yml (Hindi) * New translations en.yml (Malay) * New translations en.yml (Telugu) * New translations en.yml (Burmese) * New translations en.yml (Welsh) * New translations en.yml (Faroese) * New translations en.yml (Uyghur) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Hebrew) * New translations en.json (Japanese) * New translations en.json (Romanian) * New translations en.json (Afrikaans) * New translations en.json (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Irish) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Breton) * New translations en.yml (Latin) * New translations en.yml (Bosnian) * New translations en.yml (French, Quebec) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Aragonese) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Scots) * New translations en.yml (Igbo) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Uzbek) * New translations en.yml (Uzbek) * New translations en.json (Kashubian) * New translations en.yml (Kashubian) * New translations simple_form.en.yml (Slovenian) * New translations en.json (Georgian) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Slovenian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Galician) * New translations en.json (Persian) * New translations en.json (Tamil) * New translations en.json (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Marathi) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (Burmese) * New translations en.json (Faroese) * New translations en.json (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.json (Latin) * New translations en.json (Bosnian) * New translations en.json (French, Quebec) * New translations en.json (Sinhala) * New translations en.json (Cornish) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Aragonese) * New translations en.json (Occitan) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Scots) * New translations en.json (Igbo) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Catalan) * New translations en.json (German) * New translations en.json (Korean) * New translations en.json (Portuguese) * New translations en.json (Thai) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Thai) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Thai) * New translations en.json (Hungarian) * New translations en.json (Spanish, Argentina) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.yml (German) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (German) * New translations en.json (German) * New translations en.json (Italian) * New translations en.json (Albanian) * New translations en.yml (German) * New translations en.yml (Russian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Latvian) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Italian) * New translations en.json (French) * New translations en.json (Czech) * New translations simple_form.en.yml (French) * New translations en.json (Slovak) * New translations simple_form.en.yml (Slovak) * New translations en.json (German) * New translations en.json (English, United Kingdom) * New translations en.json (Esperanto) * New translations en.yml (German) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Slovak) * New translations simple_form.en.yml (German) * New translations en.json (Spanish) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Spanish) * New translations en.json (Basque) * New translations en.json (Belarusian) * New translations en.json (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Faroese) * New translations en.json (Faroese) * New translations en.json (Korean) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Korean) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Galician) * New translations en.json (Galician) * New translations simple_form.en.yml (Polish) * New translations en.json (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations activerecord.en.yml (French) * New translations devise.en.yml (French) * New translations doorkeeper.en.yml (French) * New translations en.json (Icelandic) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations doorkeeper.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Danish) * New translations en.json (Danish) * New translations en.yml (English, United Kingdom) * New translations en.yml (Asturian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Estonian) * New translations en.json (Estonian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Frisian) * New translations en.json (Frisian) * Normalize --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	8651ef751e	New Crowdin updates (#23356) ... * New translations en.json (Korean) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Korean) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Finnish) * New translations en.yml (English, United Kingdom) * New translations en.yml (Korean) * New translations en.yml (Esperanto) * New translations en.json (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.yml (English, United Kingdom) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.json (Korean) * New translations en.json (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations en.yml (Danish) * New translations en.yml (Slovak) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Belarusian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Irish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Italian) * New translations en.json (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Faroese) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (French, Quebec) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Aragonese) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Scots) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Spanish, Mexico) * Normalize --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	aeacebb3d7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.	2 years ago
Eugen Rochko	b8c31f8110	New Crowdin updates (#23221) ... * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Thai) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Latvian) * New translations en.yml (Hindi) * New translations en.yml (Malay) * New translations en.yml (Telugu) * New translations en.yml (Burmese) * New translations en.yml (Welsh) * New translations en.yml (Faroese) * New translations en.yml (Uyghur) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Breton) * New translations en.yml (Latin) * New translations en.yml (Bosnian) * New translations en.yml (French, Quebec) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Aragonese) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Scots) * New translations en.yml (Igbo) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Finnish) * New translations en.json (Albanian) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations en.yml (Finnish) * New translations en.yml (Hebrew) * New translations en.yml (Japanese) * New translations en.yml (Estonian) * New translations en.yml (Portuguese) * New translations doorkeeper.en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Albanian) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Faroese) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.json (Finnish) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations en.yml (Finnish) * New translations en.yml (Japanese) * New translations en.yml (Ukrainian) * New translations en.yml (Spanish, Mexico) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Slovenian) * New translations en.yml (Slovenian) * New translations en.yml (Korean) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Latvian) * New translations en.json (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Galician) * New translations en.json (Finnish) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Galician) * New translations en.yml (German) * New translations en.yml (Faroese) * New translations en.json (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations en.json (Italian) * New translations en.yml (German) * New translations en.yml (Italian) * New translations en.yml (Finnish) * New translations en.yml (Hebrew) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Frisian) * New translations en.yml (Finnish) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Italian) * New translations en.yml (Finnish) * New translations en.yml (Turkish) * New translations en.yml (Estonian) * New translations en.yml (German) * New translations en.yml (Estonian) * New translations en.yml (Turkish) * New translations en.yml (Thai) * New translations en.json (Czech) * New translations en.json (Armenian) * New translations en.json (Thai) * New translations doorkeeper.en.yml (Armenian) * New translations en.yml (Basque) * New translations en.yml (Armenian) * New translations en.yml (Thai) * New translations en.yml (Basque) * New translations en.yml (Belarusian) * New translations en.yml (Hungarian) * New translations en.json (Kazakh) * New translations en.yml (Slovenian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Uzbek) * New translations en.yml (Uzbek) * New translations simple_form.en.yml (Uzbek) * New translations activerecord.en.yml (Uzbek) * New translations devise.en.yml (Uzbek) * New translations doorkeeper.en.yml (Uzbek) * New translations en.json (Kashubian) * New translations en.yml (Kashubian) * New translations simple_form.en.yml (Kashubian) * New translations activerecord.en.yml (Kashubian) * New translations devise.en.yml (Kashubian) * New translations doorkeeper.en.yml (Kashubian) * New translations en.json (Uzbek) * New translations en.json (Uzbek) * New translations en.yml (Polish) * New translations en.json (Uzbek) * New translations activerecord.en.yml (Uzbek) * New translations en.json (Catalan) * New translations en.json (Uzbek) * New translations en.yml (Uzbek) * New translations en.json (Catalan) * New translations activerecord.en.yml (Catalan) * New translations en.json (Uzbek) * New translations devise.en.yml (Uzbek) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (English, United Kingdom) * New translations simple_form.en.yml (English, United Kingdom) * New translations en.yml (Czech) * New translations en.yml (Slovak) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.yml (Frisian) * New translations en.yml (Frisian) * New translations en.yml (Slovenian) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.json (English, United Kingdom) * New translations en.json (Vietnamese) * New translations en.yml (French) * New translations en.yml (Italian) * New translations en.yml (French) * New translations en.json (Catalan) * New translations en.json (Belarusian) * New translations en.yml (Dutch) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Basque) * New translations doorkeeper.en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Slovak) * New translations simple_form.en.yml (Slovak) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations devise.en.yml (Korean) * New translations devise.en.yml (Korean) * New translations activerecord.en.yml (Korean) * New translations en.yml (Danish) * New translations simple_form.en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Galician) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Spanish) * New translations en.yml (Basque) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Spanish) * New translations doorkeeper.en.yml (Spanish) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Slovak) * New translations en.json (Korean) * New translations en.json (Indonesian) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Danish) * New translations en.yml (German) * New translations en.yml (Korean) * New translations en.json (English, United Kingdom) * New translations simple_form.en.yml (English, United Kingdom) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.json (Uzbek) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Japanese) * New translations en.yml (English, United Kingdom) * New translations en.json (Korean) * New translations simple_form.en.yml (Japanese) * New translations en.json (Bulgarian) * New translations en.json (Korean) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Korean) * New translations devise.en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.json (Bulgarian) * New translations en.yml (Korean) * New translations devise.en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * Normalize --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	3074338d79	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago