about summary refs log tree commit diff
path: root/app/controllers/remote_follow_controller.rb
AgeCommit message (Collapse)Author
2020-02-20port tootsuite#11978 to monsterfork: Fix redirecting non-functional accounts ↵Eugen Rochko
on public pages Fix #11969
2020-01-20Original upstream mergeThibG
2019-08-15fix err 500 when someone attempts to follow someone they're already followingmultiple creatures
2019-08-10fix interaction buttons on public pagesmultiple creatures
2018-08-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
2018-08-18Add remote interaction dialog for toots (#8202)Eugen Rochko
* Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests
2018-07-09Merge branch 'master' into glitch-soc/tentative-mergeThibaut Girka
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
2018-07-01Improve embeds (#7919)Eugen Rochko
* Make embeds cacheable by reverse proxy * Make follow button on embeds open remote follow modal Instead of web+mastodon://, also, turn the button blue, and add a sign up prompt to the remote follow modal
2018-01-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02Show mastodon on modal (#6129)Akihiko Odaki
2017-11-20Finalized theme loading and stuffkibigo!
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-05-19Conditional validations no longer accept strings for if/unless (#3124)Matt Jankowski
2017-05-02Coverage for remote follows (#2694)Matt Jankowski
* Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts
2017-04-10Clean up generation of account webfinger string (#1477)Matt Jankowski
* Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation
2017-04-04Remote follow improvementsDrew DeVault
This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.
2017-01-02Fix uri expansion during remote followEugen Rochko
2017-01-01Adding remote follow buttonEugen Rochko