hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/controllers
History
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
 		2019-12-19 13:52:54 +01:00
..
activitypub Add ActivityPub secure mode (#11269) 2019-07-11 20:11:09 +02:00
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
auth Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
concerns Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02: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/master 2019-12-19 13:52:54 +01:00
well_known Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02: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 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-11-20 15:36:09 +01: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 Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
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 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
media_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
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