You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		5 years ago
..
activitypub	Fix incoming federation in whitelist mode (#12185)	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Ensure pack is set when rendering OTP prompt	5 years ago
concerns	Add account migration UI (#11846)	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_follow_controller.rb	Restful refactor of accounts/ routes (#2133)	8 years ago
account_unfollow_controller.rb	Restful refactor of accounts/ routes (#2133)	8 years ago
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
custom_css_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
instance_actors_controller.rb	Fix reverse-proxy caching of instance actor object (#11561)	5 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
media_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
media_proxy_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago