1060 Commits (th-downstream)

Author	SHA1	Message	Date
Skye	76b36ba10d	Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"" ... This reverts commit 8aae9712d9.	9 months ago
Skye	8aae9712d9	Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream" ... This reverts commit fa3b5195fd, reversing changes made to 1b1c4ff940.	9 months ago
Skye	fa3b5195fd	Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream	9 months ago
Kouhai	e9dbe31776	th: Merge remote-tracking branch 'glitch/main'	9 months ago
Kouhai	27f74617cc	th: Merge remote-tracking branch 'glitch/main' (915cd36ac1)	9 months ago
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	10 months ago
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693)	10 months ago
Essem	f578317f53	Add support for emoji reactions ... Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	10 months ago
Claire	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	10 months ago
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	10 months ago
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	10 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	11 months ago
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	11 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	11 months ago
Kouhai	78a9906dfe	Merge remote-tracking branch 'glitch/main' (a21fe8687e)	12 months ago
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	1 year ago
kouhai	1288d4c9b6	th: Merge remote-tracking branch 'glitch/main' (5efa6ac771)	1 year ago
Kouhai	9d32bdbcde	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	1 year ago
Claire	296e8f791e	Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream	1 year ago
Claire	81caafbe84	Fix performances of profile directory (#26842)	1 year ago
Claire	d45dd56874	Fix performances of profile directory (#26842)	1 year ago
Claire	e66f961e05	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	ef01aa71a9	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	cddef4c485	Fix language settings for users having selected the `kmr` language (#26787)	1 year ago
Claire	49c9861551	Fix language settings for users having selected the `kmr` language (#26787)	1 year ago
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	1 year ago
Claire	78a851ae0a	Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream	1 year ago
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	1 year ago
Claire	97238e3496	Add admin notifications for new Mastodon versions (#26582)	1 year ago
Kouhai	7c7355a964	th: Merge remote-tracking branch 'glitch/main' (d033fab0ed)	1 year ago
Claire	1b5d3fdc5e	Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream	1 year ago
Claire	6fba17f6f3	Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream	1 year ago
Claire	2126812f65	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	1 year ago
Claire	b6ca020d02	Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	1 year ago
Claire	7e25e311d5	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	1 year ago
Claire	ccf5f88e43	Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream	1 year ago
Claire	ee702e36e5	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	b4a95b46cd	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	90ec88d58b	Add support for `indexable` attribute on remote actors (#26485) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	3c50a91087	Add support for `indexable` attribute on remote actors (#26485) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	8c7f3c5332	Remove old non-unique index on preview_cards statuses join table (#26447)	1 year ago
Claire	e204d2090f	Remove old non-unique index on preview_cards statuses join table (#26447)	1 year ago
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	33024cca51	Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Kouhai	f8028d190e	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	ea8802a05a	Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream	1 year ago
Claire	6d6acefcc1	Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream	1 year ago
Christian Schmidt	8da99ffb0d	Add alt text for preview card thumbnails (#26184)	1 year ago