2922 commits

Author	SHA1	Message	Date
fef	7e16a2286d	run i18n-tasks normalize	2022-12-09 23:08:44 +01:00
fef	e3f97f60a6	change reaction api to match other interactions ... Status reactions had an API similar to that of announcement reactions, using PUT and DELETE at a single endpoint. I believe that for statuses, it makes more sense to follow the convention of the other interactions and use separate POST endpoints for create and destroy respectively.	2022-12-09 23:08:42 +01:00
fef	be0bf21f3b	make number of visible reactions a vanilla setting ... Reactions will be backported to the vanilla flavour, which requires all related settings to be accessible from the vanilla settings page rather than the glitch specific settings modal.	2022-12-09 23:04:13 +01:00
fef	079b0d15c5	cherry-pick emoji reaction changes	2022-12-09 23:04:12 +01:00
fef	c3d4a644cf	add backend support for status emoji reactions ... turns out we can just reuse the code for announcement reactions.	2022-12-09 23:04:10 +01:00
Claire	e877bb47b8	Merge branch 'main' into glitch-soc/main	2022-12-09 16:48:55 +01:00
Eugen Rochko	97b6e38a7d	New Crowdin updates (#21954) ... * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations devise.en.yml (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Chinese Traditional) * New translations en.json (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Icelandic) * New translations en.json (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.json (Malay) * New translations en.json (Malay) * New translations activerecord.en.yml (Malay) * New translations devise.en.yml (Malay) * New translations en.yml (Malay) * New translations en.yml (Arabic) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations simple_form.en.yml (Malay) * New translations en.yml (Greek) * New translations en.yml (Russian) * New translations en.yml (Belarusian) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Greek) * New translations en.json (Greek) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations doorkeeper.en.yml (Greek) * New translations en.yml (Greek) * New translations en.yml (Malay) * New translations simple_form.en.yml (Malay) * New translations en.json (Esperanto) * New translations en.yml (Malay) * New translations en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.yml (Belarusian) * New translations en.yml (Vietnamese) * New translations en.yml (Belarusian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.json (Occitan) * New translations en.json (Czech) * New translations en.yml (Hebrew) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations en.json (German) * New translations en.yml (Spanish, Argentina) * New translations en.json (German) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.json (German) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Thai) * New translations activerecord.en.yml (Scots) * New translations en.json (Scottish Gaelic) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations en.yml (Turkish) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Danish) * New translations en.yml (Thai) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Belarusian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Persian) * New translations en.json (Spanish, Mexico) * New translations en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations simple_form.en.yml (Scots) * New translations en.yml (Belarusian) * New translations en.yml (Danish) * New translations en.yml (Scots) * New translations simple_form.en.yml (Scots) * New translations en.json (Scots) * New translations devise.en.yml (Scots) * New translations doorkeeper.en.yml (Scots) * New translations en.yml (Greek) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations en.json (German) * New translations en.yml (Belarusian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Argentina) * New translations en.json (German) * New translations en.json (Esperanto) * New translations en.json (French) * New translations en.yml (Esperanto) * New translations en.yml (Belarusian) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Belarusian) * New translations devise.en.yml (Esperanto) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Lithuanian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.json (Esperanto) * New translations en.json (Vietnamese) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Latvian) * New translations en.yml (Belarusian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.yml (Hebrew) * New translations en.yml (Welsh) * New translations en.yml (Hebrew) * New translations en.yml (Russian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Slovak) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * normalize * New translations en.yml (Belarusian) * normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-12-10 00:12:56 +09:00
Michal Dvorak	859db01268	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
Claire	9a3d91f629	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.	2022-12-07 09:03:42 +01:00
Claire	3d40282f1b	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
Mikhail Paulyshka	f80c3d40e8	enable be locale (#22022) ... It already has 80+% completion, which is enough for everyday use. Test instance runs on https://meowstodon.net/	2022-12-07 00:00:56 +01:00
Claire	3be6aff1a8	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-04 17:22:57 +01:00
Eugen Rochko	6119668e45	New Crowdin updates (#21599) ... * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Spanish) * New translations activerecord.en.yml (Esperanto) * New translations doorkeeper.en.yml (Spanish) * New translations devise.en.yml (Spanish) * New translations devise.en.yml (Esperanto) * New translations en.json (Spanish) * New translations en.yml (Danish) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Faroese) * New translations en.yml (Faroese) * New translations en.json (German) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Belarusian) * New translations doorkeeper.en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.yml (Bulgarian) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations en.json (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.json (Czech) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Faroese) * New translations devise.en.yml (Catalan) * New translations en.yml (German) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.json (Danish) * New translations en.json (Ukrainian) * New translations en.json (Galician) * New translations doorkeeper.en.yml (Catalan) * New translations simple_form.en.yml (German) * New translations en.json (Danish) * New translations en.yml (English, United Kingdom) * New translations simple_form.en.yml (Faroese) * New translations en.json (Danish) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations en.json (Urdu (Pakistan)) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Faroese) * New translations en.yml (German) * New translations en.json (Urdu (Pakistan)) * New translations simple_form.en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.json (Scots) * New translations activerecord.en.yml (Scots) * New translations en.json (Finnish) * New translations en.json (Finnish) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations activerecord.en.yml (Asturian) * New translations devise.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations en.yml (Belarusian) * New translations en.json (Romanian) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations doorkeeper.en.yml (Romanian) * New translations doorkeeper.en.yml (Galician) * New translations activerecord.en.yml (Romanian) * New translations en.yml (Russian) * New translations en.yml (Estonian) * New translations en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations en.json (Czech) * New translations en.yml (Bulgarian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Serbian (Cyrillic)) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.json (Breton) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations simple_form.en.yml (Galician) * New translations devise.en.yml (Italian) * New translations en.json (Bulgarian) * New translations en.yml (Bulgarian) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations devise.en.yml (Italian) * New translations en.json (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Italian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.json (Serbian (Latin)) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Italian) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations simple_form.en.yml (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Belarusian) * New translations en.yml (Thai) * New translations en.json (English, United Kingdom) * New translations en.yml (Belarusian) * New translations en.yml (Thai) * New translations en.yml (Estonian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.json (Russian) * New translations en.yml (Icelandic) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations en.yml (Belarusian) * New translations en.yml (Thai) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Thai) * New translations en.json (Esperanto) * New translations en.yml (Thai) * New translations en.yml (Belarusian) * New translations en.yml (Thai) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations en.yml (Belarusian) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.yml (Thai) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations en.yml (Belarusian) * New translations en.yml (Thai) * New translations en.yml (Belarusian) * New translations en.json (Bulgarian) * New translations en.yml (Bulgarian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Bulgarian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Estonian) * New translations en.json (Ukrainian) * New translations en.yml (Estonian) * New translations en.json (Esperanto) * New translations en.yml (Estonian) * New translations en.yml (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Persian) * New translations en.yml (Belarusian) * New translations en.json (Esperanto) * New translations en.json (Greek) * New translations en.json (Persian) * New translations en.json (Scots) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Thai) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Finnish) * New translations en.yml (Estonian) * New translations en.yml (German) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Estonian) * New translations devise.en.yml (German) * New translations simple_form.en.yml (German) * New translations en.yml (Finnish) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.json (Spanish) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Thai) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (German) * New translations en.yml (Ukrainian) * New translations en.json (Spanish, Mexico) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations en.json (German) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.json (Korean) * New translations en.json (Scottish Gaelic) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Thai) * New translations en.yml (Japanese) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Estonian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Spanish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Belarusian) * New translations en.json (Serbian (Cyrillic)) * New translations simple_form.en.yml (Serbian (Cyrillic)) * normalize * New translations en.json (German) * New translations en.json (Serbian (Cyrillic)) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-12-02 23:03:06 +09:00
Claire	a2e7997592	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.	2022-11-28 11:33:34 +01:00
Claire	098ced7420	Remove support for Ruby 2.6 (#21477) ... As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193 at least one of our dependencies already dropped support for Ruby 2.6, and we had removed Ruby 2.6 tests from the CI over a year ago (#16861). So stop advertising Ruby 2.6 support, bump targeted version, and drop some compatibility code.	2022-11-27 20:41:39 +01:00
Claire	d587a268fd	Add logging for Rails cache timeouts (#21667) ... * Reduce redis cache store connect timeout from default 20 seconds to 5 seconds * Log cache store errors	2022-11-27 20:37:37 +01:00
Eugen Rochko	3d906d8e62	New Crowdin updates (#20942) ... * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations doorkeeper.en.yml (Belarusian) * New translations devise.en.yml (Finnish) * New translations en.json (Norwegian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Esperanto) * New translations en.yml (Scots) * New translations en.yml (Italian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.yml (Esperanto) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (German) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Belarusian) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Estonian) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Estonian) * New translations en.json (Estonian) * New translations en.yml (Italian) * New translations doorkeeper.en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations en.yml (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Estonian) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations en.yml (Faroese) * New translations en.yml (Scots) * New translations simple_form.en.yml (Belarusian) * New translations doorkeeper.en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (Hungarian) * New translations en.json (Bengali) * New translations en.yml (Estonian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Welsh) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (German) * New translations en.yml (Russian) * New translations en.yml (Estonian) * New translations en.json (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Serbian (Latin)) * New translations en.json (Belarusian) * New translations en.yml (Belarusian) * New translations devise.en.yml (Serbian (Latin)) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations doorkeeper.en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (German) * New translations devise.en.yml (German) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Belarusian) * New translations doorkeeper.en.yml (Belarusian) * New translations en.json (Spanish) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.yml (Belarusian) * New translations en.json (German) * New translations en.yml (Welsh) * New translations en.json (Asturian) * New translations simple_form.en.yml (German) * New translations en.yml (Faroese) * New translations en.yml (Belarusian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations en.json (Belarusian) * New translations en.yml (Belarusian) * New translations devise.en.yml (Asturian) * New translations en.json (Spanish) * New translations en.json (French, Quebec) * New translations en.yml (Faroese) * New translations en.yml (Scots) * New translations en.json (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (French, Quebec) * New translations en.yml (Scots) * New translations en.yml (Belarusian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations simple_form.en.yml (Belarusian) * New translations devise.en.yml (Serbian (Latin)) * New translations en.yml (Japanese) * New translations en.json (Serbian (Latin)) * New translations en.yml (Faroese) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Estonian) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Estonian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Catalan) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Estonian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations devise.en.yml (German) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Estonian) * New translations en.yml (Romanian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Estonian) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (German) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations en.yml (Scots) * New translations en.yml (Bulgarian) * New translations simple_form.en.yml (Bulgarian) * New translations en.yml (Asturian) * New translations devise.en.yml (Asturian) * New translations en.yml (Scots) * New translations simple_form.en.yml (Hebrew) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Scots) * New translations en.yml (Belarusian) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.yml (Bulgarian) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations en.json (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Dutch) * New translations en.json (Ukrainian) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Faroese) * New translations en.yml (Faroese) * New translations en.yml (Scots) * New translations en.yml (Scots) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Czech) * New translations en.json (Malayalam) * New translations en.yml (Scots) * New translations en.json (Czech) * New translations en.json (Hindi) * New translations en.json (Malayalam) * New translations activerecord.en.yml (Serbian (Latin)) * New translations en.yml (Scots) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations en.json (Czech) * New translations en.json (Serbian (Cyrillic)) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Scots) * New translations en.json (Czech) * New translations en.json (Frisian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Scots) * New translations en.yml (Belarusian) * New translations devise.en.yml (Frisian) * New translations en.json (Czech) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations en.yml (Faroese) * New translations en.yml (Belarusian) * New translations en.yml (Ukrainian) * New translations en.yml (Bulgarian) * New translations en.json (Italian) * New translations en.json (Ukrainian) * New translations en.json (Spanish, Mexico) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Faroese) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations devise.en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Italian) * New translations en.json (Ukrainian) * New translations en.json (Spanish, Mexico) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Italian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * Add `app/javascript/mastodon/locales/whitelist_be.json` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-11-25 09:40:05 +09:00
Claire	367db8222f	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 21:56:05 +01:00
Eugen Rochko	0a78631e86	New Crowdin updates (#20759) ... * New translations en.json (German) * New translations en.json (Italian) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.json (Dutch) * New translations en.json (Esperanto) * New translations en.json (Dutch) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Faroese) * New translations en.json (Esperanto) * New translations en.json (Irish) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.json (Scots) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Scots) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations en.json (Lithuanian) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Thai) * New translations en.yml (Slovenian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Georgian) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Korean) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations en.yml (Arabic) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ido) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Italian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Frisian) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Silesian) * 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 (Sanskrit) * New translations en.yml (Taigi) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Asturian) * New translations en.yml (Burmese) * New translations en.yml (Igbo) * New translations en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Occitan) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Bengali) * New translations en.yml (Telugu) * 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 (Hindi) * New translations en.yml (English, United Kingdom) * New translations en.yml (Kannada) * New translations en.yml (Welsh) * New translations en.yml (Uyghur) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Russian) * New translations en.yml (Italian) * New translations en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Japanese) * New translations en.yml (Armenian) * New translations en.json (Hebrew) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Czech) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Afrikaans) * New translations en.yml (Hungarian) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Indonesian) * New translations en.yml (Ido) * New translations en.yml (Persian) * New translations simple_form.en.yml (Polish) * New translations en.yml (Breton) * New translations en.yml (Sinhala) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Vietnamese) * 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 (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Malay) * New translations en.yml (Corsican) * New translations en.yml (Occitan) * New translations en.yml (Sardinian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kabyle) * New translations en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Bengali) * 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 (Ukrainian) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Frisian) * 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 (Swedish) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Scottish Gaelic) * 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 (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Ido) * 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 (Serbian (Latin)) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Hebrew) * New translations en.yml (Korean) * New translations en.yml (Dutch) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Kurmanji (Kurdish)) * normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-11-17 21:59:15 +09:00
Claire	5ef92dff57	Remove glitch-soc-specific translations of upstreamed feature (domain block import)	2022-11-17 12:08:59 +01:00
Claire	aec61a703f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.	2022-11-17 12:01:37 +01:00
Claire	ab7d99e035	Fix various issues with domain block import (#1944) ... - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded	2022-11-17 11:42:20 +01:00
Rose	4f15fd0ba1	Fix style for hashes (#20518) ... * Fix style for hashes Make the style for hashes consistent. * New style More consistency	2022-11-17 11:05:39 +01:00
lenore gilbert	c373148b3d	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) ... * Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit 94e98864e3) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commit b91196f4b7) * Fix authorization check in domain blocks controller (cherry picked from commit 7527937758) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit 9094c2f52c) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit 26ff48ee48) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2022-11-17 11:05:09 +01:00
Ell Bradshaw	e7deea62d1	Remove last references to "silencing" in UI text (#20637) ... * Remove last references to "silencing" in en and en_GB locales * Remove stray the, rephrase a bit * Revert changes to generated files I assume these will get updated via Crowdin	2022-11-17 11:01:51 +01:00
Claire	00b2720ef0	Change automatic post deletion configuration to be accessible to redirected users (#20774) ... Fixes #20550	2022-11-17 10:55:23 +01:00
Claire	7955d4b959	Add form-action CSP directive (#20781)	2022-11-17 10:55:03 +01:00
Claire	eb80789b0b	Fix misleading wording about waitlists (#20850)	2022-11-17 10:54:33 +01:00
trwnh	a2931d19ae	Add missing admin scopes (fix #20892) (#20918)	2022-11-17 10:50:21 +01:00
Claire	8c56441b4a	Add form-action CSP directive (#1948)	2022-11-16 16:28:48 +01:00
Claire	1901829f9a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.	2022-11-16 08:30:00 +01:00
Eugen Rochko	a1738f8991	New Crowdin updates (#20580) ... * New translations en.json (Catalan) * New translations en.yml (Chinese Traditional) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Ukrainian) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Hungarian) * New translations en.json (Slovak) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Turkish) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (Thai) * New translations en.json (Irish) * New translations en.yml (Norwegian) * New translations en.yml (German) * New translations en.json (Romanian) * New translations en.yml (Danish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Norwegian) * New translations en.yml (Russian) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations en.yml (Danish) * New translations en.json (Catalan) * New translations en.yml (Norwegian) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Norwegian) * New translations en.json (Catalan) * New translations en.json (Portuguese, Brazilian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Latvian) * New translations en.json (Irish) * New translations en.json (Swedish) * New translations en.yml (Galician) * New translations en.json (Latvian) * New translations en.yml (Latvian) * New translations en.json (Kabyle) * New translations en.yml (Welsh) * New translations en.json (Breton) * New translations en.json (Kabyle) * New translations en.yml (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations en.json (Malay) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Malay) * New translations activerecord.en.yml (Malay) * New translations devise.en.yml (Malay) * New translations doorkeeper.en.yml (Malay) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Malay) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Malay) * New translations en.yml (Dutch) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (English, United Kingdom) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Malay) * New translations devise.en.yml (Welsh) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations devise.en.yml (Malay) * New translations en.json (Vietnamese) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Catalan) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Malay) * New translations devise.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Catalan) * New translations en.json (Norwegian) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Norwegian) * New translations devise.en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Norwegian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Korean) * New translations en.json (Esperanto) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Norwegian) * New translations en.json (Welsh) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Norwegian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations devise.en.yml (Korean) * New translations en.json (Asturian) * New translations en.json (Asturian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-11-15 14:37:37 +09:00
Eugen Rochko	43b0b2f3f4	Fix wrong directive unsafe-wasm-eval to wasm-unsafe-eval (#20729)	2022-11-15 03:39:06 +01:00
prplecake	b46b7c3d5e	Use "unsafe-wasm-eval" instead of "unsafe-eval" in script-src CSP (#20606) ... * Add "unsafe-eval" to script-src CSP * Use 'unsafe-wasm-eval' instead of 'unsafe-eval'	2022-11-15 03:22:38 +01:00
Claire	767630be24	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: Upstream removed blank lines.	2022-11-14 20:27:31 +01:00
Eugen Rochko	21fd25a269	Fix rate limiting for paths with formats (#20675)	2022-11-14 20:26:31 +01:00
Claire	32c70d2f09	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.	2022-11-14 08:35:55 +01:00
trwnh	b59ce0a60f	Move V2 Filter methods under /api/v2 prefix (#20622) ... * Move V2 Filter methods under /api/v2 prefix * move over the tests too	2022-11-14 08:34:07 +01:00
Matt Corallo	9d039209cc	Add Cache-Control header to openstack-stored files (#20610) ... When storing files in S3, paperclip is configured with a Cache-Control header indicating the file is immutable, however no such header was added when using OpenStack storage. Luckily Paperclip's fog integration makes this trivial, with a simple `fog_file` `Cache-Control` default doing the trick.	2022-11-14 05:26:49 +01:00
Eugen Rochko	cf36ee99bb	New Crowdin updates (#20476) ... * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.json (Japanese) * New translations en.yml (Czech) * New translations en.json (Esperanto) * New translations en.yml (Norwegian) * New translations en.json (Spanish, Argentina) * New translations en.json (Latvian) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Russian) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Norwegian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.json (Malayalam) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Thai) * New translations devise.en.yml (Welsh) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Irish) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Esperanto) * New translations en.yml (Irish) * New translations en.json (Norwegian) * New translations en.json (Polish) * New translations en.yml (Polish) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations en.json (Turkish) * New translations en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Thai) * New translations en.yml (Chinese Simplified) * New translations en.yml (Polish) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations simple_form.en.yml (Slovak) * New translations en.json (Thai) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Norwegian) * New translations en.json (Finnish) * New translations en.json (Norwegian) * New translations simple_form.en.yml (Norwegian) * New translations en.yml (Thai) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Arabic) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.yml (Greek) * New translations en.yml (German) * New translations en.yml (Hungarian) * New translations en.yml (Hebrew) * New translations en.yml (Finnish) * New translations en.yml (Basque) * New translations en.yml (Frisian) * New translations en.yml (Danish) * New translations en.yml (Catalan) * New translations en.yml (Bulgarian) * New translations en.yml (Arabic) * New translations en.yml (Afrikaans) * New translations en.yml (French) * New translations en.yml (Romanian) * New translations en.yml (Spanish) * New translations en.yml (Czech) * New translations en.yml (Armenian) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Chinese Traditional) * New translations en.yml (Swedish) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Slovenian) * New translations en.yml (Thai) * New translations en.yml (Galician) * New translations en.yml (Russian) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Slovak) * New translations en.yml (Japanese) * New translations en.yml (Portuguese) * New translations en.yml (Polish) * New translations en.yml (Punjabi) * New translations en.yml (Norwegian) * New translations en.yml (Dutch) * New translations en.yml (Macedonian) * New translations en.yml (Lithuanian) * New translations en.yml (Korean) * New translations en.yml (Georgian) * New translations en.yml (Italian) * New translations en.yml (Ukrainian) * New translations en.yml (Albanian) * New translations en.yml (Turkish) * New translations en.yml (Ido) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Sinhala) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Burmese) * New translations en.yml (Cornish) * New translations en.yml (Breton) * 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 (Malayalam) * New translations en.yml (Telugu) * New translations en.yml (English, United Kingdom) * 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 (Igbo) * New translations en.yml (Chinese Simplified) * New translations en.yml (Afrikaans) * New translations en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Thai) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Catalan) * New translations en.yml (Greek) * New translations en.yml (Italian) * New translations en.yml (Slovenian) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Basque) * New translations en.yml (Norwegian) * New translations en.yml (Portuguese) * New translations en.yml (Icelandic) * New translations en.json (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.json (Albanian) * New translations en.yml (Albanian) * New translations en.yml (French) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Esperanto) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Hebrew) * New translations en.yml (Norwegian) * New translations en.yml (German) * New translations en.json (Spanish) * New translations en.yml (Finnish) * New translations en.json (Norwegian) * New translations en.yml (Latvian) * New translations en.yml (Esperanto) * New translations en.json (German) * New translations en.json (Esperanto) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Esperanto) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-11-14 01:14:31 +09:00
David Hewitt	290d78cea4	Allow unsetting x-amz-acl S3 Permission headers (#20510) ... Some "S3 Compatible" storage providers (Cloudflare R2 is one such example) don't support setting ACLs on individual uploads with the `x-amz-acl` header, and instead just have a visibility for the whole bucket. To support uploads to such providers without getting unsupported errors back, lets use a black `S3_PERMISSION` env var to indicate that these headers shouldn't be sent. This is tested as working with Cloudflare R2.	2022-11-13 06:57:10 +01:00
helloworldstack	e9e4938bc9	Fix casing and spacing of words (#20504)	2022-11-13 03:33:20 +01:00
Claire	93912f0498	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.	2022-11-12 13:28:03 +01:00
Claire	d37f426f95	Add back missing glitch-soc admin settings (#1919) ... Fixes #1890	2022-11-12 13:24:53 +01:00
Claire	af89b14628	Add extended description for glitch-soc only “hide followers count" setting	2022-11-12 11:31:05 +01:00
Claire	6a96b17a2d	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
Claire	fdfacb0ec0	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" ... This reverts commit bfc539cfb4.	2022-11-12 10:17:22 +01:00
Eugen Rochko	e1af21cfd0	New Crowdin updates (#20258) ... * New translations en.json (Asturian) * New translations en.yml (Telugu) * New translations en.yml (Tamil) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.json (Latvian) * New translations en.yml (Hindi) * New translations en.yml (Malay) * New translations en.yml (Asturian) * New translations en.json (Occitan) * New translations simple_form.en.yml (Basque) * 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 (Catalan) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (Irish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Sinhala) * New translations en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Sanskrit) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.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 (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Galician) * 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 (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Croatian) * New translations activerecord.en.yml (Icelandic) * 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 (Corsican) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Slovak) * New translations activerecord.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations activerecord.en.yml (Japanese) * New translations activerecord.en.yml (Albanian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Swedish) * New translations activerecord.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Galician) * New translations activerecord.en.yml (Georgian) * New translations activerecord.en.yml (Italian) * New translations activerecord.en.yml (Catalan) * New translations activerecord.en.yml (Czech) * New translations activerecord.en.yml (Romanian) * New translations activerecord.en.yml (French) * New translations activerecord.en.yml (Spanish) * New translations activerecord.en.yml (Afrikaans) * New translations activerecord.en.yml (Arabic) * New translations activerecord.en.yml (Bulgarian) * New translations activerecord.en.yml (Armenian) * New translations activerecord.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations activerecord.en.yml (Frisian) * New translations activerecord.en.yml (Basque) * New translations activerecord.en.yml (Finnish) * New translations activerecord.en.yml (Irish) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (Hungarian) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Sardinian) * New translations activerecord.en.yml (Indonesian) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Persian) * New translations activerecord.en.yml (Asturian) * New translations activerecord.en.yml (Occitan) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Tatar) * New translations activerecord.en.yml (Corsican) * New translations en.yml (Burmese) * New translations en.yml (Igbo) * New translations activerecord.en.yml (Malayalam) * New translations activerecord.en.yml (Sinhala) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Tamil) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Estonian) * New translations activerecord.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations activerecord.en.yml (Welsh) * New translations activerecord.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations en.json (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.json (Hungarian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Slovenian) * New translations en.json (Swedish) * New translations en.json (Chinese Simplified) * New translations en.json (Vietnamese) * New translations en.json (Icelandic) * New translations en.json (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Korean) * New translations activerecord.en.yml (Bulgarian) * New translations devise.en.yml (Bulgarian) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Romanian) * New translations en.json (Catalan) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Norwegian) * New translations en.json (Vietnamese) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Latvian) * New translations devise.en.yml (Bulgarian) * New translations en.json (Hebrew) * New translations en.json (Arabic) * New translations en.json (Catalan) * New translations en.yml (Korean) * New translations en.json (Turkish) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Scottish Gaelic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Bulgarian) * New translations en.json (Thai) * New translations en.json (Bulgarian) * New translations en.yml (Ukrainian) * New translations en.json (Indonesian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (German) * New translations en.json (Portuguese) * New translations en.json (Spanish) * New translations en.json (Danish) * New translations en.json (Ukrainian) * New translations en.json (Tamil) * New translations en.json (Chinese Traditional) * New translations simple_form.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations en.json (Norwegian) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.json (Korean) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Arabic) * New translations en.json (Arabic) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.json (Norwegian) * New translations en.yml (Norwegian) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Basque) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Norwegian) * New translations en.yml (Norwegian) * New translations en.json (Latvian) * New translations simple_form.en.yml (Occitan) * New translations devise.en.yml (Esperanto) * New translations en.yml (Czech) * New translations en.json (German) * New translations en.json (Czech) * New translations en.json (French) * New translations en.yml (Hebrew) * New translations en.json (Norwegian) * New translations en.json (Irish) * New translations en.yml (Dutch) * New translations en.json (Ukrainian) * New translations en.json (Romanian) * New translations en.json (Russian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations doorkeeper.en.yml (Chinese Traditional) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-11-12 15:56:25 +09:00
Yamagishi Kazutoshi	19a8563905	Fix ENV (#20377)	2022-11-11 01:33:32 +01:00
F	9feba112a7	Make enable_starttls configurable by envvars (#20321) ... ENABLE_STARTTLS is designed to replace ENABLE_STARTTLS_AUTO by accepting three values: 'auto' (the default), 'always', and 'never'. If ENABLE_STARTTLS isn't provided, we fall back to ENABLE_STARTTLS_AUTO. In this way, this change should be fully backwards compatible. Resolves #20311	2022-11-10 21:06:21 +01:00