Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
activitypub	Add specs for activitypub collections controller (#9484)	2018-12-10 21:39:25 +01:00
admin	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
auth	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
concerns	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
oauth	Add force_login option to OAuth authorize page (#8655)	2018-09-09 04:10:44 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
well_known	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +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	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb	Add tests for followers_accounts_controller (#7794)	2018-06-13 10:28:39 +09:00
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	2018-06-14 10:49:17 +09:00
home_controller_spec.rb
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
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
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	2018-12-14 20:36:40 +01:00
remote_unfollows_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
shares_controller_spec.rb	Add tests for shares_controller (#7835)	2018-06-18 10:45:20 +09:00
statuses_controller_spec.rb	Fix thread depth computation in statuses_controller (#9426)	2018-12-05 02:12:29 +01:00
stream_entries_controller_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	2019-01-16 19:47:46 +01:00