This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-07 19:53:30 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
disputes	…
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2022-08-31 11:55:27 +02:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
well_known	…
about_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
emojis_controller.rb	…
filters_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
following_accounts_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
health_controller.rb	…
home_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
privacy_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
tags_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00