mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	2018-01-02 00:11:41 -06:00
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129 )	2018-01-02 05:07:56 +01:00
kibigo!	8aeda4f064	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
Eugen Rochko	fd69694749	Add "signed in as" header to some pages (#4523 )	2017-08-05 04:24:58 +02:00
Matt Jankowski	6619cfe934	Conditional validations no longer accept strings for if/unless (#3124 )	2017-05-19 03:11:23 +02:00
Matt Jankowski	fdd7ee1cc7	Coverage for remote follows (#2694 ) * 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-05-02 00:44:23 +02:00
Matt Jankowski	874a240a58	Clean up generation of account webfinger string (#1477 ) * Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation	2017-04-10 22:58:06 +02:00
Drew DeVault	932b0b2f1f	Remote follow improvements This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.	2017-04-04 20:52:31 -04:00
Eugen Rochko	3e6b5d67dd	Fix uri expansion during remote follow	2017-01-02 12:19:02 +01:00
Eugen Rochko	df2f14d2dd	Adding remote follow button	2017-01-01 19:54:34 +01:00

10 Commits (fc20361bbe22dea978e7dd734f1deba99a36c350)