399 commits

Author	SHA1	Message	Date
Jeremy Kescher	4920ccb302	Merge remote-tracking branch 'upstream/main' into develop	2023-05-27 12:23:36 +02:00
Eugen Rochko	3869e8c210	Change "Sign in" to "Login" (#24942)	2023-05-10 20:17:55 +02:00
Jeremy Kescher	9eb149477a	Merge remote-tracking branch 'upstream/main' into develop	2023-05-06 00:39:56 +02:00
Eugen Rochko	8979b70975	Add default post text to onboarding flow in web UI (#24705)	2023-04-28 10:05:34 +02:00
Eugen Rochko	7cf963eec2	Change label from "For you" to "People" on explore screen in web UI (#24706)	2023-04-28 08:54:20 +02:00
Eugen Rochko	c35e3cb6ac	Add more tips to onboarding flow in web UI (#24646)	2023-04-25 11:12:37 +02:00
Eugen Rochko	0461f83320	Add new onboarding flow to web UI (#24619)	2023-04-23 22:24:53 +02:00
Jeremy Kescher	f3953eee78	Merge remote-tracking branch 'upstream/main' into develop	2023-04-23 20:49:47 +02:00
Jeremy Kescher	3866d53b95	Merge remote-tracking branch 'upstream/main' into develop	2023-04-21 15:05:02 +02:00
Eugen Rochko	955ec252a4	Add client-side validation for taken username in sign-up form (#24546)	2023-04-16 02:10:48 +02:00
Ivan Rodriguez	f05fb51ecb	Fix status title for statuses without text (#24359)	2023-04-14 17:29:09 +02:00
Claire	8f0b0435ab	Fix missing translation strings in en.json and defaultMessages.json (#24518)	2023-04-12 15:24:45 +02:00
Eugen Rochko	c5eba06d8c	New Crowdin updates (#24447) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-04-12 20:21:32 +09:00
Jeremy Kescher	1e866e57ac	Merge remote-tracking branch 'upstream/main' into develop	2023-04-10 08:14:20 +02:00
Claire	c11e69f33a	Move glitch-soc-only translation strings out of app/javascript/mastodono/locales	2023-04-09 15:53:45 +02:00
Jeremy Kescher	198d0b2ed4	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock	2023-04-04 15:26:23 +02:00
Jeremy Kescher	68101baae1	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb	2023-04-03 21:50:15 +02:00
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00
Eugen Rochko	4909c2e718	New Crowdin updates (#24276) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-04-03 14:44:43 +02:00
Eugen Rochko	2b11376411	Change search pop-out in web UI (#24305)	2023-04-01 09:59:10 +02:00
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.	2023-03-31 21:30:27 +02:00
Eugen Rochko	68a192e718	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2023-03-30 15:16:20 +02:00
Jeremy Kescher	24e9a23fe6	Merge remote-tracking branch 'upstream/main' into develop, bump version ... Conflicts: - .github/workflows/build-image.yml We're not building an image with GitHub Actions.	2023-03-17 07:27:28 +01:00
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.	2023-03-15 09:16:10 +01:00
PauloVilarinho	8770473dbb	add modal message when editing toot (#23936) ... Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>	2023-03-06 17:33:09 +01:00
Jeremy Kescher	8de39432a9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml	2023-02-17 00:26:21 +01:00
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.	2023-02-09 12:46:12 +01:00
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>	2023-02-04 15:46:08 +09:00
Jeremy Kescher	bd30ddd982	Merge remote-tracking branch 'upstream/main' into develop	2023-01-22 11:33:25 +01:00
Claire	3fd3e88b25	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-21 14:58:15 +01:00
Jeremy Kescher	0d829dadea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js	2023-01-18 22:29:27 +01:00
Eugen Rochko	a3f176423f	New Crowdin updates (#23052) ... * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Italian) * New translations en.json (German) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Slovenian) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Slovenian) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.json (Portuguese) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Slovenian) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.json (Thai) * New translations doorkeeper.en.yml (Turkish) * New translations doorkeeper.en.yml (Thai) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Galician) * New translations en.yml (Galician) * New translations en.json (Portuguese) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations en.yml (Finnish) * New translations en.yml (Polish) * New translations en.yml (Italian) * New translations en.yml (Ukrainian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Aragonese) * New translations doorkeeper.en.yml (Aragonese) * New translations en.yml (Aragonese) * New translations simple_form.en.yml (Aragonese) * New translations en.yml (German) * New translations en.yml (Hebrew) * New translations simple_form.en.yml (German) * New translations en.yml (Slovak) * New translations en.yml (Chinese Traditional) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations devise.en.yml (German) * New translations en.yml (German) * New translations en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Spanish) * New translations en.yml (Czech) * New translations simple_form.en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.yml (Galician) * New translations en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Hungarian) * New translations en.yml (Danish) * New translations simple_form.en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Thai) * New translations en.yml (Finnish) * New translations en.yml (Latvian) * New translations en.yml (Portuguese) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations en.json (Kazakh) * New translations en.yml (Frisian) * New translations simple_form.en.yml (Frisian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Irish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations simple_form.en.yml (Irish) * New translations devise.en.yml (Irish) * New translations en.json (Persian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.json (Welsh) * New translations doorkeeper.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Welsh) * New translations en.json (Spanish, Argentina) * New translations en.json (English, United Kingdom) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (German) * New translations en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.json (Latin) * New translations en.yml (Slovak) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.json (Estonian) * New translations en.yml (Belarusian) * New translations en.json (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations en.yml (Belarusian) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations en.json (Asturian) * New translations en.json (Hindi) * New translations en.yml (Dutch) * New translations en.yml (Swedish) * New translations en.yml (Estonian) * New translations en.yml (Estonian) * New translations en.json (Latvian) * New translations en.yml (Latvian) * New translations en.yml (Slovak) * Normalize * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Arabic) * New translations en.json (Belarusian) * New translations en.json (Bulgarian) * New translations en.json (Catalan) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Irish) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Georgian) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Dutch) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Albanian) * 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 (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Indonesian) * 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 (Thai) * New translations en.json (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations en.json (Estonian) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (English, United Kingdom) * New translations en.json (Burmese) * New translations en.json (Welsh) * New translations en.json (Faroese) * New translations en.json (Esperanto) * 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 (Serbian (Latin)) * 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) * Normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-01-19 02:31:13 +09:00
Claire	60abcb3c4c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.	2023-01-18 17:38:11 +01:00
Claire	3588fbc766	Fix confusing wording in the sign in banner (#22490) ... * Fix confusing wording in the sign in banner * Split into two sentences	2023-01-18 17:15:23 +01:00
Connor Shea	30e895299c	Add listing of followed hashtags (#21773) ... * Add followed_tags route. This at least gets us to the point where the page can actually be rendered, although it doesn't display any hashtags (yet?). Attempting to implement #20763. * Fix minor issues. * I've got the followed tags data partially working But the Hashtag component errors for some reason. Something about the value of the history attribute being invalid. * Fix a mistake in the code * Minor change. * Get the followed hashtags list fully working. Still need to add the Follow/Unfollow buttons, though. * Resolve JS linter issues. * Add pagination logic to followed tags list view. However, it currently loads further pages immediately on page load, so that's not ideal. Need to figure that one out. * Appease the linter. * Apply suggestions from code review Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Fixes and resolve some other feedback. * Use set/update instead of setIn/updateIn. Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-01-18 16:44:33 +01:00
Jeremy Kescher	09b826eaa7	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js	2023-01-11 23:49:36 +01:00
Claire	9765d2b3f8	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.	2023-01-10 09:39:15 +01:00
n0toose	105e1f0ca6	Correct hashtag warning (#22827) ... Posts with any visibility setting that is not 'Public' are prevented from being listed under any hashtag.	2023-01-09 03:18:20 +01:00
Jeremy Kescher	48373a71e3	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml	2023-01-05 23:29:53 +01:00
Eugen Rochko	d11d15748c	New Crowdin updates (#22901) ... * New translations en.json (Norwegian) * New translations en.json (English, United Kingdom) * New translations en.yml (English, United Kingdom) * New translations simple_form.en.yml (English, United Kingdom) * New translations en.json (Norwegian) * New translations en.yml (Norwegian) * New translations en.yml (Norwegian) * New translations simple_form.en.yml (Norwegian) * New translations doorkeeper.en.yml (Norwegian) * New translations en.yml (Hebrew) * New translations en.yml (German) * New translations activerecord.en.yml (German) * New translations doorkeeper.en.yml (German) * New translations en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.yml (Finnish) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Finnish) * New translations en.yml (Finnish) * New translations doorkeeper.en.yml (Finnish) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Bulgarian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Finnish) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations doorkeeper.en.yml (Frisian) * New translations en.yml (Esperanto) * New translations en.json (Estonian) * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Arabic) * New translations en.json (Belarusian) * New translations en.json (Bulgarian) * New translations en.json (Catalan) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Irish) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Georgian) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Dutch) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Albanian) * 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 (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Indonesian) * 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 (Thai) * New translations en.json (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations en.json (Estonian) * 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 (Welsh) * New translations en.json (Faroese) * New translations en.json (Esperanto) * 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 (Serbian (Latin)) * 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) * Normalize * New translations en.json (Catalan) * New translations en.json (German) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.json (Italian) * New translations en.json (Dutch) * New translations en.json (Slovenian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Icelandic) * New translations en.json (Indonesian) * New translations en.json (Latvian) * New translations en.json (Welsh) * New translations en.json (Faroese) * New translations en.json (Esperanto) * New translations en.json (Serbian (Latin)) * New translations simple_form.en.yml (Galician) * New translations en.json (Danish) * New translations en.json (Japanese) * New translations en.json (Korean) * New translations en.yml (Japanese) * Normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-01-06 01:03:53 +09:00
Claire	6c20dad201	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`	2023-01-05 14:16:25 +01:00
Sean Whalen	8cff96d94d	Replace hide toot with hide post (#22385) ... * Change "Hide toot" to "Hide post" * Update status_action_bar.js Replace "Hide toot" with "Hide post"	2023-01-05 13:45:01 +01:00
Jeremy Kescher	2379efb52f	Merge remote-tracking branch 'upstream/main' into reactions ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml	2022-12-21 23:45:28 +01:00
Claire	b248aa4d3e	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-21 15:59:39 +01:00
fef	7cbe6dc3e8	rebase with upstream	2022-12-20 18:27:51 +01:00
Eugen Rochko	2889c68610	New Crowdin updates (#22182) ... * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations en.json (Breton) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations devise.en.yml (Breton) * New translations doorkeeper.en.yml (Breton) * New translations en.json (Bosnian) * New translations en.json (French, Quebec) * New translations simple_form.en.yml (French, Quebec) * New translations activerecord.en.yml (French, Quebec) * New translations devise.en.yml (French, Quebec) * New translations doorkeeper.en.yml (French, Quebec) * New translations en.json (Sinhala) * New translations simple_form.en.yml (Sinhala) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations doorkeeper.en.yml (Sinhala) * New translations en.json (Cornish) * New translations en.json (Kannada) * New translations devise.en.yml (Kannada) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations activerecord.en.yml (Asturian) * New translations devise.en.yml (Asturian) * New translations simple_form.en.yml (Aragonese) * New translations activerecord.en.yml (Aragonese) * New translations devise.en.yml (Aragonese) * New translations doorkeeper.en.yml (Aragonese) * New translations simple_form.en.yml (Occitan) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations en.json (Igbo) * New translations en.json (Corsican) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations doorkeeper.en.yml (Corsican) * New translations en.json (Sardinian) * New translations simple_form.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations doorkeeper.en.yml (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations activerecord.en.yml (Kabyle) * New translations devise.en.yml (Kabyle) * New translations doorkeeper.en.yml (Kabyle) * New translations en.json (Ido) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations devise.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Catalan) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Finnish) * New translations en.json (Irish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Georgian) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Dutch) * New translations en.json (Punjabi) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Tamil) * New translations en.json (Bengali) * New translations en.json (Marathi) * New translations en.json (Croatian) * New translations en.json (Kazakh) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Telugu) * New translations en.json (English, United Kingdom) * New translations en.json (Burmese) * New translations en.json (Uyghur) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Latin) * New translations en.json (Bosnian) * New translations en.json (Cornish) * New translations en.json (Kannada) * New translations en.json (Asturian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * 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 (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Arabic) * New translations en.yml (Belarusian) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (German) * New translations en.yml (Greek) * New translations en.yml (Frisian) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hungarian) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Korean) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * 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 (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Thai) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Malay) * New translations en.yml (Welsh) * New translations en.yml (Faroese) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Latin) * New translations en.yml (French, Quebec) * New translations en.yml (Sinhala) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Aragonese) * New translations en.yml (Occitan) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Scots) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Ido) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Latin) * New translations simple_form.en.yml (French, Quebec) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Frisian) * New translations activerecord.en.yml (Latin) * New translations devise.en.yml (Frisian) * New translations devise.en.yml (Latin) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Frisian) * New translations doorkeeper.en.yml (Hungarian) * New translations doorkeeper.en.yml (Italian) * New translations doorkeeper.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Latin) * New translations en.json (Belarusian) * New translations en.json (Catalan) * New translations en.json (Danish) * New translations en.json (Finnish) * New translations en.json (Turkish) * New translations en.yml (Belarusian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations doorkeeper.en.yml (Danish) * Normalize locale files * New translations en.json (German) * New translations en.json (Swedish) * New translations en.json (Estonian) * New translations en.json (Latvian) * New translations en.json (Welsh) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Latvian) * 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 (Czech) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Welsh) * New translations en.json (Ukrainian) * New translations en.json (Chinese Traditional) * New translations en.json (Estonian) * New translations en.yml (Swedish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Italian) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations en.json (Catalan) * New translations en.json (Slovenian) * New translations en.json (Faroese) * New translations en.json (Asturian) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations en.yml (Slovenian) * New translations en.yml (Faroese) * New translations doorkeeper.en.yml (German) * New translations doorkeeper.en.yml (Slovenian) * New translations doorkeeper.en.yml (Faroese) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.json (Greek) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * Normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-12-16 12:46:39 +09:00
Claire	f3a4d57be1	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring	2022-12-15 20:25:25 +01:00
Holden Foreman	c761e7a5ef	Fix language surrounding disability in prompts for alt text and other media descriptions (#20923)	2022-12-15 18:46:13 +01:00
Francis Murillo	c50e9d078a	Render current day formats in the client timezone (#21878) ... * Fix remaining plain %time to %time.formatted * Add %time.relative-formatted to client format dates on the current day * Add missing comma dangle to formats * Use client side message format instead of the server * Add fallback message to relatve_format.today * Remove unused translation key and fix js lint issue Co-authored-by: Effy Elden <effy@effy.space>	2022-12-15 16:35:25 +01:00
Yamagishi Kazutoshi	58200132d0	FormattedMessage must be used directly (#20982) ... * `FormattedMessage` must be used directly * rollback	2022-12-15 16:20:46 +01:00