2696 Commits (bf6b66bf32ceeec7b03be9012c404dd94bb4ce41)

Author	SHA1	Message	Date
Claire	ff9d647aa6	Fix empty “Server rules violation” report option (#18165)	3 years ago
Claire	7eb54adc71	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	0f11d6ee6d	New Crowdin updates (#18074) ... * New translations en.yml (German) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [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 simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations devise.en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.yml (Irish) [ci skip] * New translations en.yml (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations activerecord.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Scottish Gaelic) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations simple_form.en.yml (Scottish Gaelic) [ci skip] * New translations activerecord.en.yml (Scottish Gaelic) [ci skip] * New translations devise.en.yml (Scottish Gaelic) [ci skip] * New translations doorkeeper.en.yml (Scottish Gaelic) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	0069bebafe	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	1ae83e0796	New Crowdin updates (#18062) ... * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.yml (Japanese) * New translations en.json (Catalan) * New translations en.yml (Greek) * New translations en.yml (Chinese Traditional) * New translations en.yml (Turkish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Latvian) * New translations en.yml (Czech) * New translations en.yml (Russian) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Korean) * New translations en.yml (Vietnamese) * New translations en.yml (Catalan) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Italian) * New translations en.yml (Hungarian) * New translations en.yml (Thai) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations simple_form.en.yml (Irish) * New translations activerecord.en.yml (Irish) * New translations devise.en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations en.yml (Ukrainian) * New translations en.yml (Thai) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.yml (Vietnamese) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (German) * New translations en.json (German) * New translations en.json (German) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Turkish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Eugen Rochko	e0a1c43a69	New Crowdin updates (#18032) ... * New translations en.json (Vietnamese) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Japanese) * New translations en.yml (French) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Turkish) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.json (Vietnamese) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (German) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations en.yml (French) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Chinese Simplified) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (French) * New translations en.yml (Catalan) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Catalan) * New translations en.json (Vietnamese) * New translations doorkeeper.en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (Spanish) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (Thai) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Bengali) * New translations en.yml (Malay) * New translations en.yml (Marathi) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Telugu) * New translations en.yml (Welsh) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Breton) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Sinhala) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Standard Moroccan Tamazight) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	f9719b106c	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	71d83f4e61	New Crowdin updates (#17995) ... * New translations en.json (Catalan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Sanskrit) * New translations en.yml (Asturian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Kabyle) * New translations en.yml (Cornish) * New translations en.yml (Ido) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Czech) * New translations en.json (Hungarian) * New translations en.yml (Kannada) * New translations en.yml (Sinhala) * New translations en.yml (Bengali) * New translations en.yml (Hindi) * New translations en.yml (Marathi) * New translations en.yml (Croatian) * 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 (Breton) * New translations en.yml (Telugu) * New translations en.yml (Welsh) * New translations en.yml (Esperanto) * 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.json (Icelandic) * New translations en.json (Vietnamese) * New translations en.yml (Korean) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Icelandic) * New translations en.json (Korean) * New translations en.json (Polish) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations en.yml (Vietnamese) * New translations en.yml (Chinese Traditional) * New translations en.json (Chinese Traditional) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.json (Latvian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Latvian) * New translations en.yml (Spanish) * New translations en.json (Spanish) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Slovak) * 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 (Dutch) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * 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 (Norwegian) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * 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 (Basque) * 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 (Armenian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Polish) * New translations en.json (Swedish) * New translations en.yml (Italian) * New translations en.json (Italian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.json (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Arabic) * New translations en.yml (Arabic) * New translations simple_form.en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Czech) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Greek) * New translations en.json (Greek) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Czech) * New translations en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations simple_form.en.yml (Danish) * New translations en.yml (Galician) * New translations en.json (Galician) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (French) * New translations en.yml (Indonesian) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Armenian) * New translations en.json (Armenian) * New translations en.yml (Italian) * New translations en.json (Italian) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (Spanish, Argentina) * New translations en.json (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations doorkeeper.en.yml (Polish) * New translations doorkeeper.en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Catalan) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	d4f25d52dd	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.	3 years ago
Claire	c9a5121ae5	Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream (#17987)	3 years ago
Eugen Rochko	330c279c0c	New Crowdin updates (#17897) ... * New translations en.yml (Danish) * New translations en.yml (German) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hungarian) * New translations en.yml (Hebrew) * New translations en.yml (Catalan) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (Arabic) * New translations en.yml (Armenian) * New translations en.yml (Afrikaans) * New translations en.yml (Polish) * New translations en.yml (Punjabi) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Portuguese) * New translations en.yml (Albanian) * New translations en.yml (Dutch) * New translations en.yml (Turkish) * New translations en.yml (Chinese Traditional) * 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 (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Norwegian) * New translations en.yml (Korean) * New translations en.yml (Macedonian) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Vietnamese) * New translations en.yml (Lithuanian) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Galician) * New translations en.yml (Georgian) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (German) * New translations en.yml (Icelandic) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Italian) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Danish) * New translations en.json (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Latvian) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Indonesian) * New translations en.yml (Czech) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Korean) * New translations en.yml (Spanish) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Portuguese) * New translations en.yml (Polish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Italian) * New translations en.yml (Galician) * New translations en.yml (French) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations simple_form.en.yml (Galician) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Breton) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Latvian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Catalan) * New translations en.yml (Latvian) * New translations en.yml (Catalan) * New translations en.yml (Latvian) * New translations en.yml (Icelandic) * New translations en.yml (Chinese Traditional) * New translations en.yml (Swedish) * New translations en.yml (Russian) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Turkish) * New translations en.yml (Polish) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Italian) * New translations en.yml (Spanish) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.json (Arabic) * New translations en.json (Arabic) * New translations en.json (Arabic) * New translations en.json (Breton) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations en.yml (Vietnamese) * New translations en.yml (Korean) * New translations en.yml (Vietnamese) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalzie` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	d43028a0d3	Fix potentially missing statuses when reconnecting to websocket (#17981) ... * Fix potentially missing statuses when reconnecting to websocket * Add gap on reconnect rather than maintaining it constantly	3 years ago
Claire	7103869d62	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	00d429879f	Fix older items possibly disappearing on timeline updates (#17980) ... In some rare cases, when receiving statuses out of order from the streaming API then polling from the REST API, it was possible for the `expandNormalizedTimeline` function to remove older items from the timeline. This commit ensures that any item from the replaced slice that is older than the oldest item retrieved from the API gets added back to the replaced slice.	3 years ago
Eugen Rochko	cea2cd9a56	Add pagination for trending statuses in web UI (#17976)	3 years ago
Claire	b0781a933d	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.	3 years ago
Claire	623f8717c8	Fix possible duplicate statuses in timelines in some edge cases (#17971) ... In some rare cases, when receiving statuses out of order from the streaming API then polling from the REST API, it was possible for the `expandNormalizedTimeline` function to insert duplicates in the timeline, which would then result in several bugs. This commits ensures that there are no duplicates inserted in the timeline.	3 years ago
Claire	77a8515b59	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
CommanderRoot	07f1888854	Replace deprecated String.prototype.substr() (#17949) ... * Replace deprecated String.prototype.substr() .substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated * Change String.prototype.substring() to String.prototype.slice() .substring() and .slice() work very similary but .slice() is a bit faster and stricter * Add ESLint rule to forbid usage of .substr and .substring .substr() is deprecated and .substring() is very similar to .slice() so better to use .slice() at all times Signed-off-by: Tobias Speicher <rootcommander@gmail.com>	3 years ago
Claire	bdaf4179b3	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	7d12456777	New Crowdin updates (#17864) ... * New translations doorkeeper.en.yml (Kazakh) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Hindi) * New translations doorkeeper.en.yml (Welsh) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Esperanto) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Tatar) * New translations doorkeeper.en.yml (Malayalam) * New translations doorkeeper.en.yml (Breton) * New translations doorkeeper.en.yml (Sinhala) * New translations doorkeeper.en.yml (Occitan) * New translations activerecord.en.yml (Czech) * New translations devise.en.yml (Polish) * New translations activerecord.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations devise.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations devise.en.yml (Russian) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Korean) * New translations devise.en.yml (Czech) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations activerecord.en.yml (German) * New translations devise.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations devise.en.yml (Greek) * New translations activerecord.en.yml (Basque) * New translations devise.en.yml (Basque) * New translations activerecord.en.yml (Finnish) * New translations devise.en.yml (Finnish) * New translations devise.en.yml (Hebrew) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Hungarian) * New translations devise.en.yml (Hungarian) * New translations activerecord.en.yml (Armenian) * New translations devise.en.yml (Armenian) * New translations activerecord.en.yml (Italian) * New translations devise.en.yml (Italian) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations activerecord.en.yml (Georgian) * New translations devise.en.yml (Georgian) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Swedish) * New translations devise.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Kazakh) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations en.json (Albanian) * New translations en.yml (Scottish Gaelic) * New translations en.json (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Scottish Gaelic) * New translations en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Polish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations en.yml (Indonesian) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.yml (Thai) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Galician) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Latvian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Chinese Traditional) * New translations en.yml (Catalan) * New translations en.yml (Korean) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Czech) * New translations en.yml (Albanian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.json (Persian) * New translations en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Indonesian) * New translations en.json (Persian) * New translations en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Italian) * New translations en.yml (Vietnamese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	250ce1608d	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.	3 years ago
mayaeh	37c1fe7de1	Add a hashtag public link to the trending hashtag page (#17140) ... * Add a hashtag public link to the hashtag management page * Add support for element 'target' to Counter.js. Remove 'rel' element. * Update app/javascript/mastodon/components/admin/Counter.js Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	d85a5fa593	New Crowdin updates (#17829) ... * New translations en.json (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations doorkeeper.en.yml (Indonesian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Sinhala) * New translations en.yml (Breton) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.yml (Chinese Traditional) * New translations en.yml (Latvian) * New translations en.yml (Icelandic) * New translations en.yml (Swedish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.yml (Thai) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Thai) * New translations en.yml (Danish) * New translations en.yml (Spanish) * New translations en.yml (Spanish, Argentina) * New translations en.json (Japanese) * New translations en.yml (German) * New translations en.yml (Hungarian) * New translations en.yml (Italian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Chinese Simplified) * New translations en.yml (Indonesian) * New translations en.yml (Turkish) * New translations en.json (Persian) * New translations simple_form.en.yml (Persian) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations en.yml (Thai) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations activerecord.en.yml (Dutch) * New translations en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.yml (Korean) * New translations en.yml (Galician) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	cce98a6a2d	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	1c1c2ce0a1	Fix crash when search fails in web UI (#17853)	3 years ago
Claire	f56a3dc4e2	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.	3 years ago
Eugen Rochko	354415e7ce	Add hint about missing media attachment description in web UI (#17845)	3 years ago
Eugen Rochko	a0777e8681	New Crowdin updates (#17817) ... * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Russian) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations en.json (Catalan) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations en.json (Catalan) * New translations en.json (Slovak) * New translations en.json (Catalan) * New translations simple_form.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations devise.en.yml (Catalan) * New translations devise.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations devise.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Ukrainian) * New translations devise.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Danish) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.yml (Japanese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.json (Russian) * New translations en.json (Russian) * New translations en.json (Russian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	7b22ba977a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.	3 years ago
Claire	343975b2f6	Fix Sanskrit translation not being used when selected (#17820) ... It is still a very partial translation, though, and the localeData I added is very partial as well, but at least it now uses the strings that actually got translated, instead of using English strings.	3 years ago
Claire	6a1249b975	Remove old files for renamed translation (#17818) ... Follow-up to #17812 in which `kmr` has been renamed to `ku`	3 years ago
Eugen Rochko	53647d0f8b	New Crowdin updates (#17771) ... * 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 (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * 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 simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Albanian) * New translations doorkeeper.en.yml (Asturian) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * 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 (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Malayalam) * 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 (Breton) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Portuguese, Brazilian) * 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 (Norwegian Nynorsk) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * 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 (Esperanto) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Dutch) * New translations doorkeeper.en.yml (Norwegian) * New translations doorkeeper.en.yml (Polish) * New translations doorkeeper.en.yml (Portuguese) * New translations doorkeeper.en.yml (Russian) * New translations doorkeeper.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovenian) * New translations doorkeeper.en.yml (Albanian) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Turkish) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Galician) * New translations doorkeeper.en.yml (Persian) * New translations doorkeeper.en.yml (Georgian) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Bulgarian) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Asturian) * New translations doorkeeper.en.yml (Korean) * New translations devise.en.yml (Asturian) * New translations doorkeeper.en.yml (Romanian) * New translations doorkeeper.en.yml (French) * New translations doorkeeper.en.yml (Spanish) * New translations doorkeeper.en.yml (Arabic) * New translations doorkeeper.en.yml (Catalan) * New translations doorkeeper.en.yml (Japanese) * New translations doorkeeper.en.yml (Czech) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (German) * New translations doorkeeper.en.yml (Greek) * New translations doorkeeper.en.yml (Finnish) * New translations doorkeeper.en.yml (Hebrew) * New translations doorkeeper.en.yml (Hungarian) * New translations doorkeeper.en.yml (Armenian) * New translations doorkeeper.en.yml (Italian) * New translations doorkeeper.en.yml (Tamil) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Romanian) * New translations doorkeeper.en.yml (Sardinian) * New translations doorkeeper.en.yml (Kabyle) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (French) * New translations devise.en.yml (Esperanto) * New translations devise.en.yml (Romanian) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (French) * New translations activerecord.en.yml (Spanish) * New translations devise.en.yml (Spanish) * New translations activerecord.en.yml (Arabic) * New translations devise.en.yml (Arabic) * New translations activerecord.en.yml (Bulgarian) * New translations devise.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Corsican) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Marathi) * New translations doorkeeper.en.yml (Thai) * New translations doorkeeper.en.yml (Croatian) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Kazakh) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Hindi) * New translations doorkeeper.en.yml (Welsh) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Esperanto) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Tatar) * New translations doorkeeper.en.yml (Malayalam) * New translations doorkeeper.en.yml (Breton) * New translations doorkeeper.en.yml (Sinhala) * New translations doorkeeper.en.yml (Occitan) * New translations activerecord.en.yml (Czech) * New translations devise.en.yml (Polish) * New translations activerecord.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations devise.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations devise.en.yml (Russian) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Korean) * New translations devise.en.yml (Czech) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (German) * New translations devise.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations devise.en.yml (Greek) * New translations activerecord.en.yml (Basque) * New translations devise.en.yml (Basque) * New translations activerecord.en.yml (Finnish) * New translations devise.en.yml (Finnish) * New translations devise.en.yml (Hebrew) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Hungarian) * New translations devise.en.yml (Hungarian) * New translations activerecord.en.yml (Armenian) * New translations devise.en.yml (Armenian) * New translations activerecord.en.yml (Italian) * New translations devise.en.yml (Italian) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations activerecord.en.yml (Georgian) * New translations devise.en.yml (Georgian) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Swedish) * New translations devise.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations devise.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Kazakh) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	24c1b04f9c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.	3 years ago
Eugen Rochko	1b9b9585e6	New Crowdin updates (#17742) ... * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Macedonian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Galician) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Tamil) * New translations en.json (Lithuanian) * New translations en.json (Georgian) * New translations en.json (Slovenian) * New translations en.json (French) * New translations en.json (Persian) * New translations en.json (Arabic) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Norwegian) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (Japanese) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Armenian) * New translations en.json (Occitan) * New translations en.json (Bengali) * New translations en.json (Telugu) * New translations en.json (Marathi) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Uyghur) * New translations en.json (Welsh) * New translations en.json (Esperanto) * New translations en.json (Malay) * New translations en.json (Hindi) * New translations en.json (Estonian) * New translations en.json (Kazakh) * New translations en.json (Croatian) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Silesian) * New translations en.json (Taigi) * New translations en.json (Ido) * New translations en.json (Kabyle) * New translations en.json (Sanskrit) * New translations en.json (Sardinian) * New translations en.json (Corsican) * New translations en.json (Sinhala) * New translations en.json (Serbian (Latin)) * New translations en.json (Asturian) * New translations en.json (Scottish Gaelic) * New translations en.json (Kannada) * New translations en.json (Cornish) * New translations en.json (Breton) * New translations en.json (Malayalam) * New translations en.json (Tatar) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Vietnamese) * New translations en.json (Spanish, Argentina) * New translations en.yml (Japanese) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Chinese Traditional) * New translations en.json (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations en.json (Catalan) * New translations en.json (Greek) * New translations en.json (German) * New translations en.json (Icelandic) * New translations en.json (Russian) * New translations en.json (Swedish) * New translations en.json (Russian) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.json (Indonesian) * New translations doorkeeper.en.yml (Russian) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.json (Latvian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.json (Asturian) * New translations en.yml (Danish) * New translations en.yml (Asturian) * New translations en.json (Danish) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Danish) * New translations en.json (Portuguese) * New translations en.yml (Danish) * New translations simple_form.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Italian) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.json (Spanish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Greek) * New translations en.yml (Chinese Traditional) * New translations en.yml (Latvian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Japanese) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (Icelandic) * New translations en.yml (Slovenian) * New translations en.json (Slovenian) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Catalan) * New translations en.yml (Russian) * New translations en.yml (Italian) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (Turkish) * New translations en.yml (Indonesian) * New translations en.json (Turkish) * New translations en.yml (Indonesian) * New translations en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.yml (Tatar) * New translations en.json (Tatar) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations en.yml (Tatar) * New translations en.json (Tatar) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	fc205f34a1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mayaeh	500a3e1d3a	Changed to display the "Explore" in "Getting-Started" at all resolutions (#17762)	3 years ago
Eugen Rochko	95ea5b2f7d	Fix public timelines being inaccessible on one stage of responsive layout in web UI (#17760) ... Fix #17756	3 years ago
mayaeh	24f375d79e	Change the "Explore" icon from fa-globe to fa-hashtag (#17757)	3 years ago
mayaeh	0a9273ffb2	Add menu column of explore to getting-started (#17755)	3 years ago
Claire	f9d00306e0	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	6c0080f6bf	New Crowdin updates (#17674) ... * New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.json (Norwegian) * New translations en.yml (Catalan) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Catalan) * New translations en.json (Slovenian) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Latvian) * New translations en.json (Indonesian) * 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 (Croatian) * New translations en.json (Kazakh) * New translations en.json (Estonian) * New translations en.json (Hindi) * New translations en.json (Icelandic) * New translations en.json (Malay) * New translations en.json (Welsh) * New translations en.json (Esperanto) * 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 (Sinhala) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Galician) * New translations en.json (Basque) * New translations en.json (Polish) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Portuguese) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.json (Slovak) * 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 (Cornish) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Swedish) * New translations en.json (Catalan) * New translations en.json (Polish) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Turkish) * New translations simple_form.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations en.yml (French) * New translations en.json (Russian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (German) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.json (Spanish) * New translations en.json (Chinese Traditional) * New translations en.yml (Spanish) * New translations en.yml (Chinese Traditional) * New translations en.json (Indonesian) * New translations en.yml (Italian) * New translations en.yml (Danish) * New translations en.json (Italian) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Slovenian) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.json (Portuguese) * New translations simple_form.en.yml (Portuguese) * New translations en.yml (Danish) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.json (Portuguese) * New translations en.json (Latvian) * New translations en.yml (Danish) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.yml (Danish) * New translations en.json (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.json (Spanish, Mexico) * New translations en.yml (Russian) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Russian) * New translations en.json (Sinhala) * New translations en.yml (Sinhala) * New translations en.json (Greek) * New translations doorkeeper.en.yml (Sinhala) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Japanese) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Turkish) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Slovak) * New translations en.json (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Slovak) * New translations en.json (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.json (Esperanto) * New translations en.yml (Danish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.yml (Danish) * Fix * Run `bundle exec i18n-tasks normalize -l da` * New translations en.yml (Danish) * Run `bundle exec i18n-tasks normalize -l da` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	f677c1619a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well.	3 years ago
Eugen Rochko	f5346541fd	Add polls and media attachments to edit comparison modal in web UI (#17727)	3 years ago
Eugen Rochko	380aef66ae	Fix being able to add more than 4 hashtags to hashtag column in web UI (#17729)	3 years ago
Eugen Rochko	594c595fa5	Chore: Update translatable strings (#17723)	3 years ago
Eugen Rochko	11e848bf95	Change design of federation pages in admin UI (#17704) ... * Change design of federation pages in admin UI * Fix query performance in instance media attachments measure * Fix reblogs being included in instance languages dimension	3 years ago
Claire	09306d7c3c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.	3 years ago
Eugen Rochko	563964dd80	Change appearance of account cards in web UI (#17689) ... * Change appearance of account cards in web UI * Various fixes and improvements * Various fixes and improvements	3 years ago
Josh Soref	1c070bd94c	Spelling (#17705) ... * spelling: account Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: affiliated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: appearance Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: autosuggest Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: cacheable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: component Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: conversations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: domain.example Clarify what's distinct and use RFC friendly domain space. Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: environment Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: exceeds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: functional Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: inefficiency Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: not Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: notifications Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: occurring Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: position Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: progress Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: promotable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reblogging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: repetitive Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: resolve Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: saturated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: similar Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: strategies Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: success Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: targeting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: thumbnails Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unauthorized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unsensitizes Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: validations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: various Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>	3 years ago
Claire	44a1a7a02d	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	97eaac87fa	Remove profile directory link from main navigation panel (#17688)	3 years ago
Claire	4795ee7f2c	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	2b90261718	New Crowdin updates (#17628) ... * New translations en.yml (Swedish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Turkish) * New translations en.yml (Italian) * New translations en.json (Spanish, Argentina) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations en.yml (Welsh) * New translations en.json (Welsh) * New translations activerecord.en.yml (Welsh) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Finnish) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Greek) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Japanese) * New translations en.yml (Chinese Traditional) * New translations en.yml (Italian) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (French) * New translations en.yml (Thai) * New translations en.yml (Indonesian) * New translations en.yml (Danish) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (German) * New translations en.yml (Thai) * New translations en.yml (Icelandic) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Hungarian) * New translations en.json (Norwegian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Catalan) * New translations en.json (Slovenian) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Latvian) * New translations en.json (Indonesian) * 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 (Croatian) * New translations en.json (Kazakh) * New translations en.json (Estonian) * New translations en.json (Hindi) * New translations en.json (Icelandic) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (Welsh) * 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 (Sinhala) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Galician) * New translations en.json (Basque) * New translations en.json (Polish) * New translations en.json (Finnish) * 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 (Punjabi) * New translations en.json (Portuguese) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.json (Slovak) * 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 (Cornish) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * 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 (French) * New translations en.json (Catalan) * New translations en.json (French) * New translations en.json (Albanian) * New translations en.json (Catalan) * New translations en.yml (Albanian) * New translations en.json (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.json (French) * New translations en.json (Danish) * New translations en.json (Danish) * New translations en.json (Icelandic) * New translations en.json (Danish) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Hungarian) * New translations en.json (Ukrainian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Hungarian) * New translations en.json (Greek) * New translations en.json (Finnish) * New translations en.json (Russian) * New translations en.json (Greek) * New translations en.json (Hungarian) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.yml (Finnish) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.json (German) * New translations en.json (German) * New translations en.json (Chinese Simplified) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.json (Thai) * New translations en.json (Turkish) * New translations en.json (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Thai) * New translations en.json (Spanish) * New translations en.json (Spanish) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations en.yml (Swedish) * New translations en.json (Swedish) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations activerecord.en.yml (Asturian) * New translations en.json (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Danish) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * Run `bundle exec i18n-tasks normalize` * Fix Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	d2eb561d32	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	00fcfa176f	Chore: Update translatable strings (#17495)	3 years ago
Eugen Rochko	45341c5287	Fix not showing loading indicator when searching in web UI (#17655)	3 years ago
Eugen Rochko	c49b23819b	Fix report submit button not being disabled during submission in web UI (#17654) ... Add loading indicator for status selection step in report dialog in web UI	3 years ago
Claire	8e04ac45be	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.	3 years ago
Claire	f75cd229f3	Fix media modal footer's “external link” not being a link (#17561)	3 years ago
Claire	cbf951569e	Fix reply button on media modal not giving focus to compose form (#17626) ... * Avoid compose form and modal management fighting for focus * Fix reply button on media modal footer not giving focus to compose form	3 years ago
Eugen Rochko	19b4c36e40	Add explore page to web UI (#17123) ... * Add explore page to web UI * Fix not removing loaded statuses from trends on mute/block action	3 years ago
Claire	e8d278d3e1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	543d13ed7a	Fix reporting from profile (#17632) ... * Fix reporting from profile * Clean up dead code	3 years ago
Claire	4df1f0e721	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	7e91581be0	Change report modal to include category selection in web UI (#17565) ... * Change report modal to include category selection in web UI * Various fixes and improvements - Change thank you text to be different based on category - Change starting headline to be different for account and status reports - Change toggle components to have a checkmark when checked - Fix report dialog being cut off on small screens - Fix thank you screen offering mute or block if already muted or blocked - Refactor toggle components in report dialog into one component * Change wording on final screen * Change checkboxes to be square when multiple options are possible	3 years ago
Claire	c58e2f4775	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.	3 years ago
Eugen Rochko	eef9eec5d3	Add notifications for new sign-ups (#16953)	3 years ago
Eugen Rochko	bbd1b979e7	New Crowdin updates (#17593) ... * New translations en.json (Catalan) * New translations en.json (Turkish) * New translations en.json (Macedonian) * 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 (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Korean) * 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 (Tamil) * New translations en.json (Spanish, Argentina) * New translations en.json (Lithuanian) * New translations en.json (Georgian) * New translations en.json (Slovenian) * New translations en.json (French) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Norwegian) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (Spanish) * New translations en.json (Japanese) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Cornish) * New translations en.json (Silesian) * New translations en.json (Taigi) * New translations en.json (Ido) * New translations en.json (Kabyle) * New translations en.json (Sanskrit) * New translations en.json (Sardinian) * New translations en.json (Corsican) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Serbian (Latin)) * New translations en.json (Asturian) * New translations en.json (Scottish Gaelic) * New translations en.json (Kannada) * New translations en.json (Sinhala) * New translations en.json (Marathi) * New translations en.json (Breton) * New translations en.json (Malayalam) * New translations en.json (Tatar) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Uyghur) * New translations en.json (Esperanto) * New translations en.json (Welsh) * New translations en.json (Telugu) * New translations en.json (Malay) * New translations en.json (Hindi) * New translations en.json (Latvian) * New translations en.json (Estonian) * New translations en.json (Kazakh) * New translations en.json (Croatian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Japanese) * New translations en.json (Japanese) * New translations en.json (Chinese Traditional) * New translations en.json (Danish) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.json (Korean) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Chinese Simplified) * New translations en.yml (Thai) * New translations devise.en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Catalan) * New translations simple_form.en.yml (Thai) * New translations en.json (Galician) * New translations en.json (Greek) * New translations en.json (Polish) * New translations en.json (Hebrew) * New translations en.json (Icelandic) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Chinese Traditional) * New translations en.yml (Russian) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Swedish) * New translations simple_form.en.yml (Russian) * New translations en.json (Turkish) * New translations en.json (Chinese Traditional) * New translations en.json (Albanian) * New translations en.json (Vietnamese) * New translations en.json (Latvian) * New translations en.json (Hungarian) * New translations en.json (Spanish, Argentina) * New translations en.json (Italian) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.json (Finnish) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Hebrew) * New translations en.yml (Hebrew) * New translations en.json (Spanish) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.json (Ukrainian) * New translations en.yml (Indonesian) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Russian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (Hungarian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (Galician) * New translations en.json (French) * New translations en.json (Russian) * New translations activerecord.en.yml (Latvian) * New translations en.yml (French) * New translations en.yml (French) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
luzpaz	b97e7364f3	Fix various typos (#17621) ... Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`	3 years ago
Claire	ddf6fa684b	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	2bf51dc42c	New Crowdin updates (#17514) ... * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Galician) * New translations en.yml (Japanese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Hebrew) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (German) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.yml (German) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Polish) * New translations en.json (Polish) * New translations en.json (Icelandic) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations en.yml (Albanian) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.yml (Albanian) * New translations en.yml (Indonesian) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.json (Korean) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Spanish) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Spanish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Malay) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Galician) * New translations en.yml (Hungarian) * New translations en.yml (Galician) * New translations en.yml (Catalan) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Breton) * New translations en.json (Breton) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Vietnamese) * New translations en.yml (Portuguese) * New translations en.yml (Ukrainian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Portuguese) * New translations en.yml (Ukrainian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Italian) * New translations en.yml (French) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations en.yml (Latvian) * New translations en.json (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Galician) * New translations en.yml (Russian) * New translations en.yml (Indonesian) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Traditional) * Ran `yarn manage:translations` * Ran `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	175446f293	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.	3 years ago
Claire	5b5b9deebd	Fix opening the emoji picker scrolling the single-column view to the top (#17579) ... Fixes #17577	3 years ago
Claire	56442ee90a	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	d10eb06cb4	Fix controls for unchangeable properties on status edit not being disabled (#17531) ... Fixes #17520	3 years ago
Claire	7c32406859	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	8ffc48ebfa	Add notifications when a reblogged status has been updated (#17404) ... * Add notifications when a reblogged status has been updated * Change wording to say "edit" instead of "update" and add missing controls * Replace previous update notifications with the most up-to-date one	3 years ago
Claire	e9a7485dcc	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	84bd87e444	New Crowdin updates (#16858) ... * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations devise.en.yml (French) [ci skip] * New translations devise.en.yml (French) [ci skip] * New translations activerecord.en.yml (French) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Scottish Gaelic) [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 (Thai) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations activerecord.en.yml (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations activerecord.en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations devise.en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations devise.en.yml (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations devise.en.yml (Slovenian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.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 simple_form.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Scottish Gaelic) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Sardinian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Sorani (Kurdish)) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (French) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.yml (Esperanto) [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.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * Ran `i18n-tasks normalize` * Ran `yarn manage:translations` * Add space Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	b7882a75d2	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.	3 years ago
Eugen Rochko	64a94a889b	Chore: Disable menu items for editing statuses in web UI (#17497) ... Feature must be unlocked in a separate release for max. compatibility	3 years ago
Eugen Rochko	cb76142d9e	Add editing for published statuses (#17320) ... * Add editing for published statuses * Fix change of multiple-choice boolean in poll not resetting votes * Remove the ability to update existing media attachments for now	3 years ago
Claire	0845bee8d6	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.	3 years ago
Eugen Rochko	948da1a958	Add edit history to web UI (#17390) ... * Add edit history to web UI * Change history reducer to store items per status * Fix missing loading prop	3 years ago
Claire	67028c4779	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.	3 years ago
Claire	41d64ee271	Change `percent` to `rate` in retention metrics API (#16910)	3 years ago
Claire	335049cc33	Fix text being incorrectly pre-selected in composer textarea on /share (#17339) ... Fixes #17295	3 years ago
Claire	686eaacbc8	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.	3 years ago
Eugen Rochko	06b698a723	Add support for editing for published statuses (#16697) ... * Add support for editing for published statuses * Fix references to stripped-out code * Various fixes and improvements * Further fixes and improvements * Fix updates being potentially sent to unauthorized recipients * Various fixes and improvements * Fix wrong words in test * Fix notifying accounts that were tagged but were not in the audience * Fix mistake	3 years ago
Claire	485cf5c0c1	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.	3 years ago
Eugen Rochko	2fb76550a9	Add notifications for statuses deleted by moderators (#17204)	3 years ago
Claire	de7f936b96	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.	3 years ago
Claire	5aade2baac	Add support for private pinned posts (#16954) ... * Add support for private pinned toots * Allow local user to pin private toots * Change wording to avoid "direct message"	3 years ago
Claire	577c74d422	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.	3 years ago
Jeong Arm	52b05dad34	Gradually increase retry waiting for media processing (#17271)	3 years ago
Claire	338c47b6c6	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	651e997a98	Fix media descriptions not being used for client-side filtering (#17206) ... Fix oversight in #13837	3 years ago
Claire	2136aa2759	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream.	3 years ago
Rens Groothuijsen	9d43863426	Fix tag rendering error in hashtag column settings (#17184) ... * Flatten tags in configuration to regular array before converting to JSON * Render filter tags using toJS instead of toJSON	3 years ago
Claire	65987b3956	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	36347cf494	Change title of retention chart (#16909) ... Changes from “Retention” to “User retention rate by month after sign-up”. This should make it much clearer to people not familiar with retention charts what it actually means.	3 years ago
Claire	179f1d3a78	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.	3 years ago
David Sterry	65ee707755	ignore hashtag suggestions if they vary only in case (#16460) ... * ignore hashtag suggestions if they vary only in case * remove console.logs and unused args * consistently add space when dismissing suggestions * linting	3 years ago
Claire	759226e116	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.	3 years ago
Claire	5305dada6c	Fix searching for additional hashtags in hashtag column (#17054)	3 years ago
Claire	ad3668eb5f	Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) ... Fixes #16799	3 years ago
Eugen Rochko	4375813ea7	Remove Keybase integration (#17045)	3 years ago
Claire	784e38f70b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`	3 years ago
Claire	202862753a	Fix handling of recursive toots in WebUI (#17041)	3 years ago
Eugen Rochko	ad73becf3e	Add trending links (#16917) ... * Add trending links * Add overriding specific links trendability * Add link type to preview cards and only trend articles Change trends review notifications from being sent every 5 minutes to being sent every 2 hours Change threshold from 5 unique accounts to 15 unique accounts * Fix tests	3 years ago
Claire	21e3306721	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mayaeh	108e2e28cd	ran `yarn manage:translations en` (#16912)	3 years ago
Claire	50f32a06a7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.	3 years ago
Sasha Sorokin	7bd0eec51f	Split context for filter bar and unread markers (#16865) ... On notifications page, in settings, "Show" for quick filter bar and unread notifications markers use the same string, while being placed in the separate contexts - under different settings categories. This commit splits the contexts, creating new strings: - "Show filter bar" in place of "Show" for filter bar; - "Highlight unread notifications" in place of "Show" for unread notification markers, which are now simply called "Highlighting"; - There's also "Unread notifications" in place of "Unread notification markers" string to accompany the changes to "Show" string under that category. All new strings have new IDs, which will cause previous strings to invalidate on the next translation update and new strings to be created. This will help Mastodon translators to know that there are changes and improve translation in accordance to the source string update.	3 years ago
Eugen Rochko	60bcba779b	New Crowdin updates (#16354) ... * New translations en.json (Latvian) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [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 simple_form.en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations activerecord.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations doorkeeper.en.yml (Latvian) [ci skip] * New translations devise.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations simple_form.en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Sinhala) [ci skip] * New translations en.yml (Sardinian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Scottish Gaelic) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Tatar) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations en.yml (Sorani (Kurdish)) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Kurmanji (Kurdish)) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations devise.en.yml (French) [ci skip] * Run `i18n-tasks normalize` * Run `yarn manage:translations` * Trim unnecessary line breaks Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	59c1b87a3e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.	3 years ago
Eugen Rochko	cad446611c	Add graphs and retention metrics to admin dashboard (#16829)	3 years ago
Claire	817b0e20d2	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.	3 years ago
Sasha Sorokin	0f50a97175	Add single option votes tooltip in polls (#16849) ... Adds a tooltip when hovering over the percentages in a poll showing how many votes were cast for that option. Also removes descriptions from messages here since they are not picked up by Crowdin anyway and might be confusing to other developers :) Fixes #16820	3 years ago
Claire	377a18effd	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Mélanie Chauvel	6f00276f06	Improve hover and focus style in columns settings (#16222) ... * Make focus visible on switches and text buttons in columns settings * Make hover/focus visible on left/right arrows in columns settings Use same style as for station action bar (reply/boost/fav/etc.) * Tab first to “Pin/Unpin” before left/right arrows in columns settings	3 years ago
Claire	36fc7dd7d1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Mashiro	9dd04c3f19	Fix drawer tab menu routes in advanced web ui (#16793)	3 years ago
Claire	32dd0ca48f	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	8cfa8908eb	Fix incorrect use of old WebUI paths (#16773) ... * Fix incorrect use of old WebUI paths PR #16171 renamed some routes but missed some occurrences. Without #16772, this leads to unreachable routes in those cases. * Fix floating action button being displayed on statuses and compose screen	3 years ago
Claire	1de7061d5e	Add aliases for WebUI routes that were renamed in #16171 (#16772) ... * Add aliases for some WebUI routes that were renamed in #16171 Accounts and statuses routes need more work as they use different parameters. * Add aliases for /statuses/* routes * Add aliases for /accounts/* WebUI routes Does not correctly set the “active” state on the navigation tabs but this is a minor issue. * Fix some routes * Fix /accounts/:id/{media,followers,following} not loading on legacy routes	3 years ago
Claire	231787710a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.	3 years ago
Eugen Rochko	ce84967ee4	Change routing paths to use usernames in web UI (#16171)	3 years ago
Claire	d856b8f239	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
matildepark	28796d1342	Fix follow request count to dynamically update (#16652)	3 years ago
Claire	9957c6e8cb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	35a4765381	Fix crash if a notification contains an unprocessed media attachment (#16573) ... * Refactor AttachmentList * Do not crash if a notification contains an unprocessed media attachment Fixes #16530 * Fix spacing in compact form	3 years ago
Claire	8391d975d7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.	3 years ago
Takeshi Umeda	810945c95b	Fix logout link not working in safari (#16574)	3 years ago
Claire	de0c97de2f	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	4166ecfedb	Add confirmation modal when closing media edit modal with unsaved changes (#16518) ... * Add confirmation modal when closing media edit modal with unsaved changes * Move focal point media state to redux so it does not get erased by confirmation dialog * Change upload modal behavior to keep it open while saving changes Instead of closing it immediately and losing changes if they fail to save… * Make it work with react-intl 2.9	3 years ago
Claire	d65262ae8b	Fix “open” link of media modal not closing modal (#16524)	3 years ago
Claire	572ae686f0	Fix crashes with Microsoft Translate on Microsoft Edge (#16525) ... Fixes #16509 Microsoft Edge with translation enabled rewrites the DOM in ways that confuse react and prevent it from working properly. Wrapping the offending parts in a span avoids this issue.	3 years ago
Claire	977da6fee8	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	4235b0d031	Fix replying from modal (#16516) ... Fixes #16515 Not using a router object somehow made `this.history` lag behind the real browser history whenever pushing a new history item in `replyCompose`. Not using the context-provided router in this case was an oversight made when porting glitch-soc changes in #16499.	3 years ago
Claire	1d79ecf729	Fix minor code quality issues (#16502)	3 years ago
Claire	0495e0642e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.	3 years ago
Claire	ab4c1478b6	Change references to tootsuite/mastodon to mastodon/mastodon (#16491) ... * Change references to tootsuite/mastodon to mastodon/mastodon * Remove obsolete test fixture * Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG And a few other places	3 years ago
Claire	628e5823c3	Improve modal flow and back button handling (#16499) ... * Refactor shouldUpdateScroll passing So far, shouldUpdateScroll has been manually passed down from the very top of the React component hierarchy even though it is a static function common to all ScrollContainer instances, so replaced that with a custom class extending ScrollContainer. * Generalize “press back to close modal” to any modal and to public pages * Fix boost confirmation modal closing media modal	3 years ago
Claire	c3b64f4a84	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.	3 years ago
David Sterry	b4d598b554	Fix #16407 (#16432)	3 years ago
Claire	40f2ef9a50	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	9e0305041f	Fix WebUI crash when a toot with a playing video gets deleted (#16384) ... * Fix WebUI crash when a toot with a playing video gets deleted * Fix pop-up player not closing the moment a status is deleted	3 years ago
Claire	ac3dd7cae6	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: upstream-updated dependency (redis) textually too close to glitch-specific one (redcarpet). Ported upstream change.	3 years ago