9303 Commits (807b83ce9087d19dbadf53f94e2bbbdbae20ce2f)

Author	SHA1	Message	Date
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
Eugen Rochko	e3d08a9e28	Change global `locale` param to `lang` to avoid conflicts (#17592)	3 years ago
helloworldstack	22f110a892	Fix sign in token and warning emails failed to send in some cases (#17589)	3 years ago
Claire	bd4fb02bfb	[Glitch] Fix opening the emoji picker scrolling the single-column view to the top ... Port 5b5b9deebd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	a564a06739	[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden ... Port ab98d2e539 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	5718a2e280	Fix issue with glitch-soc's theming system	3 years ago
Eugen Rochko	394042c91b	[Glitch] Add appeals ... Port SCSS changes from 82f8d19424 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	cdd0af5a1c	[Glitch] Fix privacy policy link not being visible on small screens ... Port 77529aba86 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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	49e1162a30	Fix issues when attempting to appeal an old strike (#17554) ... * Display an error when an appeal could not be submitted * Do not offer users to appeal old strikes * Fix 500 error when trying to appeal a strike that is too old * Avoid using an extra translatable string	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	ab98d2e539	Fix edge case where settings/admin page sidebar would be incorrectly hidden (#17580)	3 years ago
Claire	3b266118a8	Fix toggling sidebar on mobile in admin pages	3 years ago
Claire	efb2377148	Change relays handling to not record boosts (#17571) ... * Change relays handling to not record boosts * Update tests	3 years ago
Claire	4d49bb4b52	Fix performance of server-side filtering (#17575) ... Fixes #17567	3 years ago
Claire	488c4e1712	Change dasbhoard links for “new users” and “active users” (#17570) ... Make them filter for local accounts by default	3 years ago
Eugen Rochko	82f8d19424	Add appeals (#17364) ... * Add appeals * Add ability to reject appeals and ability to browse pending appeals in admin UI * Add strikes to account page in settings * Various fixes and improvements - Add separate notification setting for appeals, separate from reports - Fix style of links in report/strike header - Change approving an appeal to not restore statuses (due to federation complexities) - Change style of successfully appealed strikes on account settings page - Change account settings page to only show unappealed or recently appealed strikes * Change appealed_at to overruled_at * Fix missing method error	3 years ago
Jeong Arm	0ad6f982af	Fix admin statuses page order with media (#17538)	3 years ago
Jeong Arm	cf8fee1379	Add `from:` query operator to search syntax (#16526) ... * Add 'by:userhandle' parameter to search api * Use search syntax for "by" prefix * Codeclimate * Use 'from' instead of 'by'	3 years ago
Eugen Rochko	77529aba86	Fix privacy policy link not being visible on small screens (#17533) ... Fix #17482	3 years ago
Eugen Rochko	518ac93f00	Fix duplicate accounts when searching by IP range in admin UI (#17524)	3 years ago
Claire	3ff513bd3b	[Glitch] Fix controls for unchangeable properties on status edit not being disabled ... Port d10eb06cb4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	56442ee90a	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Holly	45309f7748	Make the settings button go to settings when opened in a new tab	3 years ago
Claire	e806b2325e	Fix empty batch statuses selection causing a 500 error (#17532) ... * Fix empty batch statuses selection causing a 500 error * Simplify current_params	3 years ago
Claire	d10eb06cb4	Fix controls for unchangeable properties on status edit not being disabled (#17531) ... Fixes #17520	3 years ago
Claire	89e2e403ce	Fix attempts at distributing Update activities for local-only posts	3 years ago
Eugen Rochko	1c420fca57	[Glitch] Fix layout of the report page on smaller screens in admin UI ... Port f53e4c250e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	e5e6857bd7	[Glitch] Add notifications when a reblogged status has been updated ... Port front-end changes from 8ffc48ebfa to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	7c32406859	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	f53e4c250e	Fix layout of the report page on smaller screens in admin UI (#17523) ... Fix #17491	3 years ago
Claire	6ec8ae5723	Fix missing javascript in some admin pages	3 years ago
Claire	2846bfddc2	Add support for multiple source files per pack	3 years ago
Jeong Arm	63c1a70f35	Enable domain purge button on suspended domains too (#17209) ... * Enable domain purge button on suspended domains too * Change unless to if	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
Eugen Rochko	b8f957e5f7	[Glitch] Change actions in reports to require only one click ... Port SCSS changes from 9b42aad433 Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	e9a7485dcc	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	9b42aad433	Change actions in reports to require only one click (#17487)	3 years ago
Eugen Rochko	51573dfbc9	Change reblogs to not count towards hashtag trends anymore (#17501)	3 years ago
Eugen Rochko	e331119201	Fix deletes not being signed in authorized fetch mode (#17484) ... Fix #17483	3 years ago
Claire	2e551a9c6e	Fix Undo Announce sometimes inlining the originally Announced status (#17516) ... * Change tests to have more specific expectations on sent ActivityPub payloads * Check that payload doesn't actually contain the contents of the boosted toot * Fix Undo Announce sometimes inlining the originally Announced status	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
Eugen Rochko	9e57680f64	[Glitch] Chore: Disable menu items for editing statuses in web UI (#17497) ... Port 64a94a889b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	838f800808	[Glitch] Add editing for published statuses ... Port cb76142d9e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	d377c690a4	Add ability to change content-type when editing a toot ... Content-type defaults to edited toot's content-type to avoid surprising behaviors when using clients that do not support this feature.	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
Claire	c6de53c1a9	Fix NoMethodError in StatusUpdateDistributionWorker (#17499) ... * Add tests * Fix NoMethodError in StatusUpdateDistributionWorker * Fix tests	3 years ago
Claire	2e7bc0fbf5	Fix poll votes not being properly reset on poll change (#17498) ... * Fix poll votes not being properly reset on poll change * Fix and add tests * Fix poll update handling when the number of options changes	3 years ago
Eugen Rochko	6dfda3670f	Fix outdated iso-639 reference in update status service (#17496)	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
Eugen Rochko	2c9def57b3	Add `category` and `rule_ids` params to `POST /api/v1/reports` (#17492)	3 years ago
Claire	c3725e1e19	Add content_type to status_edits	3 years ago
Eugen Rochko	4ffee8156d	[Glitch] Add edit history to web UI ... Port 948da1a958 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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
Claire	e689495a81	Please Codeclimate	3 years ago
Claire	1af75ba990	Rework actions modal to bring it closer to upstream and fix modal stacking issue	3 years ago
Claire	d92bd7c906	Remove unused noModal prop	3 years ago
Claire	952342d251	Some more refactoring	3 years ago
Claire	f14193d3f4	Refactor dropdown and action modal code slightly ... Simplify it a bit and make it closer to upstream	3 years ago
Eugen Rochko	6732217dd0	Change languages to be listed under standard instead of native name in admin UI (#17485)	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
Eugen Rochko	b0021ca3d5	Fix error in suggestions API due to typo (#17486) ... Regression from #17479	3 years ago
Claire	bab90c9e1b	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	a44cc7931a	Remove language detection through cld3 (#17478) ... * Remove language detection through cld3 * Update app/helpers/languages_helper.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Eugen Rochko	1e5989c612	Add global `locale` param (#17464) ... - Remove the session-based locale stickyness	3 years ago
Eugen Rochko	d979087a98	Fix localization of cold-start follow recommendations (#17479)	3 years ago
Claire	edd7dad3e2	Fix Ruby 2.5 incompatibility (#17465)	3 years ago
Eugen Rochko	73a585dd64	Fix structured data parsing from links choking on bad data (#17403) ... * Fix structured data parsing from links choking on bad data - Fix og:url meta tag being prioritized over canonical link tag - Fix structured data parsing choking on commented-out CDATA declarations - Fix HTML entities in title, description, provider_name, author_name - Change structured data parsing to attempt every JSON-LD script tag * Remove unnecessary slash escapes from CDATA regex pattern	3 years ago
Claire	42fdf52f0c	Fix replies collection incorrectly looping (#17462) ... * Refactor tests * Add tests * Fix replies collection incorrectly looping	3 years ago
Claire	621d92114d	Fix errors when multiple Delete are received for a given actor (#17460)	3 years ago
Claire	aaace9f1db	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.	3 years ago
Claire	5d53b3c8a7	Fix instance actor not being dereferenceable (#17457) ... * Add tests * Fix instance actor not being dereferenceable * Fix tests * Fix tests for real	3 years ago
Claire	c94ff7c869	Move glitch-soc-specific theming methods to ThemingConcern	3 years ago
Claire	4944068bd0	Make theme-selection fall back to default ones if configured is not found	3 years ago
Eugen Rochko	25d1195a04	Fix error on account relationships page in admin UI (#17444)	3 years ago
Claire	b3190c2cd6	Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	3 years ago
Claire	ec8cf0e39b	Fix response_to_recipient? CTE (#17427)	3 years ago
Claire	b891d09d2f	Compact JSON-LD signed incoming activities (#17426) ... Co-authored-by: Puck Meerburg <puck@puck.moe>	3 years ago
Claire	eee2c187ee	Fix response_to_recipient? CTE	3 years ago
Claire	77cc434f2b	Fix compacted JSON-LD possibly causing compatibility issues on forwarding	3 years ago
Puck Meerburg	9d92e9204f	Compact JSON-LD signed incoming activities	3 years ago
Claire	2341754c70	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	2657ca3b5e	Fix requiring an extra restart after recent post-deployment migrations (#17422) ... Follow-up to #16409	3 years ago
Claire	a2bc2e14c6	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	8919f6cf63	Change public profile pages to be disabled for unconfirmed users (#17385) ... Fixes #17382 Note that unconfirmed and unapproved accounts can still be searched for and their (empty) account retrieved using the REST API.	3 years ago
Claire	de596a03c0	Fix Sidekiq warning when pushing DMs to direct timeline	3 years ago
Claire	daab277c0e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.	3 years ago
Claire	33ea1c9008	Fix Sidekiq warnings about JSON serialization (#17381) ... * Fix Sidekiq warnings about JSON serialization This occurs on every symbol argument we pass, and every symbol key in hashes, because Sidekiq expects strings instead. See https://github.com/mperham/sidekiq/pull/5071 We do not need to change how workers parse their arguments because this has not changed and we were already converting to symbols adequately or using `with_indifferent_access`. * Set Sidekiq to raise on unsafe arguments in test mode In order to more easily catch issues that would produce warnings in production code.	3 years ago
Claire	56a49e9334	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream changed a header but we had different default headers. Applied the same change, and also dropped HSTS headers redundant with Rails'.	3 years ago
Claire	6e8d231e27	Fix local distribution of edited statuses (#17380) ... Because `FanOutOnWriteService#update?` was broken, edits were considered as new toots and a regular `update` payload was sent.	3 years ago
Eugen Rochko	b6364cf1ad	Fix poll updates being saved as status edits (#17373) ... Fix #17344	3 years ago
Claire	599b27788a	Add some explanation text on the CAPTCHA confirmation page	3 years ago
Claire	ea32eb89e1	Change CAPTCHA handling to be only on email verification ... This simplifies the implementation considerably, and while not providing ideal UX, it's the most flexible approach.	3 years ago
Claire	6988e6ecc3	Add ability to set hCaptcha either on registration form or on e-mail validation ... Upshot of CAPTCHA on e-mail validation is it does not need to break the in-band registration API.	3 years ago
Claire	a9faba63f1	Disable `registrations` flag in /api/v1/instance when CAPTCHA is enabled ... This is to avoid apps trying and failing at using the registrations API, which does not let us require a CAPTCHA and cannot be clearly signaled as unavailable.	3 years ago
Claire	2d4faa5cfd	Disable captcha if registrations are disabled for various reasons	3 years ago
Claire	c209cf5a09	Renew Rails session ID on successful registration	3 years ago
Claire	d36eb0503f	Please CodeClimate	3 years ago
Claire	5c88cb1a67	Add optional hCaptcha support ... Fixes #1649 This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then enabling the admin setting at `/admin/settings/edit#form_admin_settings_captcha_enabled` Subsequently, a hCaptcha widget will be displayed on `/about` and `/auth/sign_up` unless: - the user is already signed-up already - the user has used an invite link - the user has already solved the captcha (and registration failed for another reason) The Content-Security-Policy headers are altered automatically to allow the third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same rules as above.	3 years ago
Claire	d045ba2add	Fix link_to_login argument handling when a block is passed (#17345)	3 years ago
Claire	73eeb58f10	[Glitch] Change `percent` to `rate` in retention metrics API ... Port 41d64ee271 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	1800e05513	[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share ... Port 335049cc33 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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	e92ac5b769	Fix error-prone SQL queries (#15828) ... * Fix error-prone SQL queries in Account search While this code seems to not present an actual vulnerability, one could easily be introduced by mistake due to how the query is built. This PR parameterises the `to_tsquery` input to make the query more robust. * Harden code for Status#tagged_with_all and Status#tagged_with_none Those two scopes aren't used in a way that could be vulnerable to an SQL injection, but keeping them unchanged might be a hazard. * Remove unneeded spaces surrounding tsquery term * Please CodeClimate * Move advanced_search_for SQL template to its own function This avoids one level of indentation while making clearer that the SQL template isn't build from all the dynamic parameters of advanced_search_for. * Add tests covering tagged_with, tagged_with_all and tagged_with_none * Rewrite tagged_with_none to avoid multiple joins and make it more robust * Remove obsolete brakeman warnings * Revert "Remove unneeded spaces surrounding tsquery term" The two queries are not strictly equivalent. This reverts commit 86f16c537e06c6ba4a8b250f25dcce9f049023ff.	3 years ago
Claire	41d64ee271	Change `percent` to `rate` in retention metrics API (#16910)	3 years ago
Claire	06f653972a	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288) ... * Remove support for OAUTH_REDIRECT_AT_SIGN_IN Fixes #15959 Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form to instead redirect to the external OmniAuth login provider. However, it did not prevent the log-in form on /about introduced by #10232 from appearing, and completely broke with the introduction of #15228. As I restoring that previous log-in flow without introducing a security vulnerability may require extensive care and knowledge of how OmniAuth works, this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time being. * Add OMNIAUTH_ONLY environment variable to enforce external log-in only * Disable user registration when OMNIAUTH_ONLY is set to true * Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider	3 years ago
Claire	12bb24ea35	Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287) ... Fixes #15959 Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form to instead redirect to the external OmniAuth login provider. However, it did not prevent the log-in form on /about introduced by #10232 from appearing, and completely broke with the introduction of #15228. As I restoring that previous log-in flow without introducing a security vulnerability may require extensive care and knowledge of how OmniAuth works, this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time being.	3 years ago
Claire	8114f4208f	Remove leftover database columns from Devise::Models::Rememberable (#17191) ... * Remove leftover database columns from Devise::Models::Rememberable * Update fix-duplication maintenance script * Improve errors/warnings in the fix-duplicates maintenance script	3 years ago
Claire	335049cc33	Fix text being incorrectly pre-selected in composer textarea on /share (#17339) ... Fixes #17295	3 years ago
Claire	68a9057420	Add post edited notice in admin and public UIs (#17335) ... * Add edited toot flag on public pages * Add toot edit flag to admin pages	3 years ago
Claire	458f232d21	Add content-type to status source in glitch-soc	3 years ago
Eugen Rochko	cb8ec71677	[Glitch] Add support for editing for published statuses ... Port front-end changes from 06b698a723 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	01e495563e	Merge branch 'main' into glitch-soc/merge-upstream	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	a427958026	Fix error when using raw distribution worker (#17334) ... Regression from #16697	3 years ago
Eugen Rochko	bfbfbf5032	Fix error when processing poll updates (#17333) ... Regression from #16697	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	6ae170697a	Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream ... Merge upstream changes	3 years ago
Claire	ad5fd97277	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Jeong Arm	be15674215	Fix NameError on ActivityPub::FetchFeaturedCollectionService (#17326) ... Related: #16954	3 years ago
Claire	8904dac905	Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs ... Refactor glitch-soc's theme handling	3 years ago
Claire	5d38a8573c	Please CodeClimate	3 years ago
Claire	a250aefe77	Move controller theming code to concern	3 years ago
Claire	833a5e4e52	Fix `pinned` attribute not being set for private self-posts (#17304)	3 years ago
Eugen Rochko	a5cb48879d	[Glitch] Add notifications for statuses deleted by moderators ... Port front-end changes from 2fb76550a9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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
Claire	a10833e909	Fix `pinned` attribute not being set for private self-posts	3 years ago
Eugen Rochko	2fb76550a9	Add notifications for statuses deleted by moderators (#17204)	3 years ago
Claire	b20dafb566	[Glitch] Add support for private pinned posts ... Port JS changes from 5aade2baac to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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	21828806b3	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	91c1fbf714	Fix missing media: 'all' on default skins	3 years ago
Claire	a3a9d4d789	Refactor theming HAML template a bit	3 years ago
Claire	c8973773bc	Refactor theme config loading	3 years ago
Claire	37dadd4512	Refactor some more	3 years ago
Claire	10bef4493c	Refactor glitch-soc's theme handling	3 years ago
Claire	928890bd38	Fix admin interface crash when displaying deleted user (#17301)	3 years ago
Jeong Arm	923eda5cd5	[Glitch] Gradually increase retry waiting for media processing ... Port 52b05dad34 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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
Eugen Rochko	7b3972c270	Remove IP tracking columns from users table (#16409)	3 years ago
Jeong Arm	52b05dad34	Gradually increase retry waiting for media processing (#17271)	3 years ago
Claire	817072e9c7	[Glitch] Fix media descriptions not being used for client-side filtering ... Port 651e997a98 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	338c47b6c6	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Jeong Arm	db10cd8d15	Remove custom emojis on domain purge (#17210)	3 years ago
Claire	651e997a98	Fix media descriptions not being used for client-side filtering (#17206) ... Fix oversight in #13837	3 years ago
Rens Groothuijsen	5baeb90bd4	[Glitch] Fix tag rendering error in hashtag column settings ... Port 9d43863426 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	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
Eugen Rochko	9a8784829f	Fix warnings on Rails boot (#16946)	3 years ago