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.

Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
activitypub	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
admin	Fix remote and staff-removed statuses leaving media behind for a day (#11638)	2019-08-22 04:17:12 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
auth	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
concerns	Change locale detection to run once per session (#8657)	2019-07-21 18:08:02 +02:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
well_known	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
authorize_interactions_controller_spec.rb	Optimize the process of following someone (#9220)	2018-11-08 21:05:42 +01:00
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	2019-08-16 19:15:05 +02:00
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
relationships_controller_spec.rb	Add relationship manager UI (#10268)	2019-03-16 11:23:22 +01:00
remote_follow_controller_spec.rb	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	2018-12-14 20:36:40 +01:00
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	2019-08-16 19:15:05 +02:00
statuses_controller_spec.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	2019-01-16 19:47:46 +01:00