about summary refs log tree commit diff
path: root/app/controllers
AgeCommit message (Expand)Author
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Fix POST /api/v1/follows error when already following (#4878)Eugen Rochko
2017-09-10Default follows for new users (#4871)Eugen Rochko
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
2017-09-06Switch to static URIs, new URI format in both protocols for new statuses (#4815)Eugen Rochko
2017-09-05Fix #4794 - Fake instant follow in API response when account is believed unlo...Eugen Rochko
2017-09-04Show pinned statuses only in the top of the profile page (#4803)nullkal
2017-09-03Instantly upgrade account to ActivityPub if we receive ActivityPub payload (#...Eugen Rochko
2017-09-01Make PreviewCard records reuseable between statuses (#4642)Eugen Rochko
2017-08-31Embed modal (#4748)Eugen Rochko
2017-08-31Add sharedInbox to actors (#4737)Eugen Rochko
2017-08-30Update status embeds (#4742)Eugen Rochko
2017-08-26authorize-follow-requests-after-unlocking (#4658)masarakki
2017-08-25Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)nullkal
2017-08-25Pinned statuses (#4675)Eugen Rochko
2017-08-24Fetch reblogs as Announce activity instead of Note object (#4672)unarist
2017-08-24Fix typo in admin/status_controller.rb (#4679)HIKARU KOBORI
2017-08-23Use checkboxes for application scope setting (#4671)nullkal
2017-08-23Fix up the applications area (#4664)Eugen Rochko
2017-08-22Application prefs section (#2758)Colin Mitchell
2017-08-21Support more variations of ActivityPub keyId in signature (#4630)Eugen Rochko
2017-08-21ActivityPub migration procedure (#4617)Eugen Rochko
2017-08-21Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credential...Eugen Rochko
2017-08-18Don't send Link header when don't know prev and next links (#4633)Yamagishi Kazutoshi
2017-08-16Redesign public profiles (#4608)Eugen Rochko
2017-08-16Make share intent modal to make "signed in as" shown. (#4611)Clworld
2017-08-15Fix require_user! behavior when not logged in (#4604)abcang
2017-08-14Add protocol handler. Handle follow intents (#4511)Eugen Rochko
2017-08-14Set correct content-type for ActivityPub JSON (#4592)Eugen Rochko
2017-08-13Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)Eugen Rochko
2017-08-13ActivityPub delivery (#4566)Eugen Rochko
2017-08-09Add Digest header to requests with body, handle acct and URI keyId (#4565)Eugen Rochko
2017-08-08Add ActivityPub inbox (#4216)Eugen Rochko
2017-08-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-08-03Redirect to PasswordController#new when reset_password_token is invalid (#4506)nullkal
2017-08-01Merge upstream (#111)kibigo!
2017-07-30Multiple frontend support (#110)Gô Shoemake
2017-07-26Fix #4026 - Accept backup codes for disabling 2FA (#4382)Eugen Rochko
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25Merge queries in Api::V1::FavouritesController (#4359)Akihiko Odaki
2017-07-23feat: Enable push subscription for mobile devices by default (#4321)Sorin Davidoi
2017-07-22Merge that good fresh upstream shitbeatrix-bitrot
2017-07-21New notification cleaning mode (#89)Ondřej Hruška
2017-07-20Add button to re-subscribe to all accounts from a domain (#4285)Eugen Rochko
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
2017-07-20Fix webfinger retries (#4275)Eugen Rochko
2017-07-19Add feature to revoke sessions (#4259)Yamagishi Kazutoshi
2017-07-19Correct OStatus inflection (Ostatus -> OStatus) (#4255)Eugen Rochko