3680 Commits (main)

Author	SHA1	Message	Date
Jeremy Kescher	2df3b9f803	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb	3 weeks ago
Claire	0e76b919b5	Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream	4 weeks ago
Jeremy Kescher	7122d5381c	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/notifications/components/notification.jsx	4 weeks ago
Claire	777984faeb	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	4 weeks ago
Claire	903dc53522	Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream	4 weeks ago
Claire	f2b23aa5f3	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.	4 weeks ago
github-actions[bot]	8a64406d34	New Crowdin Translations (automated) (#2668) ... * New Crowdin translations * Fix bogus translation files --------- Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 weeks ago
github-actions[bot]	799e3be9bd	New Crowdin Translations (automated) (#29726) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 month ago
github-actions[bot]	5db5fa879b	New Crowdin Translations (automated) (#29708) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 month ago
Matt Jankowski	a59f5694fe	Add empty line after ✨magic✨ frozen string comment (#29696)	2 months ago
github-actions[bot]	c007dd5dd2	New Crowdin Translations (automated) (#29687) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Jeremy Kescher	0353a3d759	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/features/ui/components/navigation_panel.jsx	2 months ago
Claire	44bf7b8128	Add notifications of severed relationships (#27511)	2 months ago
Claire	eb3aed9545	Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2 months ago
github-actions[bot]	6c0b1a41a1	New Crowdin Translations (automated) (#29657) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Claire	876aa35350	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2 months ago
Jeremy Kescher	a53f2cf970	Merge branch 'glitch-soc' into develop	2 months ago
Claire	bc6f9befde	Change “Notifications” settings page to “E-mail notifications” (#29646)	2 months ago
Matt Jankowski	6c68c3c0ce	Introduce `inline_svg` gem, minimal usage, prep for material design icons (#29612)	2 months ago
github-actions[bot]	4e61bce4e9	New Crowdin Translations (automated) (#29641) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Claire	cf08a438e7	Add badge on account card in report moderation interface when account is already suspended (#29592)	2 months ago
Matt Jankowski	ecdbf15ebe	Remove unused `link_to_older` and `link_to_newer` helper methods (#29620)	2 months ago
github-actions[bot]	04817e965a	New Crowdin Translations (automated) (#29623) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Claire	82c2af0356	Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607)	2 months ago
Claire	2e49bc97b0	Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream	2 months ago
github-actions[bot]	6865fda593	New Crowdin Translations (automated) (#29603) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Jeremy Kescher	21a23b58ab	Merge branch 'glitch-soc' into develop	2 months ago
Jeremy Kescher	caccc2e0f4	Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb	2 months ago
Claire	e91ede5be6	Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream	2 months ago
Matt Jankowski	049d9171eb	Use `with_options` for shared option in `accounts#show` routing block (#28914)	2 months ago
Matt Jankowski	79e7590578	Clean up `activitypub` module route scope near instance actor (#29579)	2 months ago
Matt Jankowski	65e8349980	Clean up `activitypub` module route scope near collections/boxes (#29580)	2 months ago
Matt Jankowski	18ffd4d925	Add module `instances` route scope in api routes (#29581)	2 months ago
Matt Jankowski	01ecc80118	Add module `accounts` route scope in api routes (#29582)	2 months ago
github-actions[bot]	5aea35de13	New Crowdin Translations (automated) (#29587) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Claire	48134bcd10	Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream	2 months ago
Claire	27ffc09847	Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream	2 months ago
github-actions[bot]	171948b910	New Crowdin Translations (automated) (#29563) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
github-actions[bot]	dc36b961aa	New Crowdin Translations (automated) (#29554) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Claire	a5127d0ef8	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.	2 months ago
Matt Jankowski	a38e424185	Use unchanging github links in docs/comments (#29545)	2 months ago
Eugen Rochko	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2 months ago
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2 months ago
github-actions[bot]	f85168b189	New Crowdin Translations (automated) (#29467) ... Co-authored-by: GitHub Actions <noreply@github.com>	2 months ago
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2 months ago
Claire	45e56db8e4	Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our version.	2 months ago
Jeremy Kescher	6aa17a7c1b	Merge branch 'glitch-soc' into develop	2 months ago
Dave MacLeod	b6b94c971f	Add Interlingue to available_locales (#28630)	2 months ago
Claire	159e500749	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2 months ago
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2 months ago