about summary refs log tree commit diff
path: root/spec/controllers
AgeCommit message (Expand)Author
2018-04-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-03Improve require_admin! and require_staff! filters (#7018)Emelia Smith
2018-04-02Feature: Report improvements (#6967) (#7000)Emelia Smith
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-05Redirect from Web tag timeline to public tag timeline if not signed in (#6633)Akihiko Odaki
2018-03-04Set the default locale in config (#6580)Akihiko Odaki
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
2018-02-21Fix bug in relationships API introduced by #6482 (#6527)Eugen Rochko
2018-02-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-08Fix response of signature_verification_failure_reason (#6441)abcang
2018-01-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-22Rename ResolveRemoteAccountService to ResolveAccountService (#6327)Akihiko Odaki
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-21Redirect to 2FA creation page when otp_secret is not available (#6314)Aboobacker MK
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-18Fix regeneration marker not expiring (#6290)Eugen Rochko
2018-01-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-17Fix home regeneration (#6251)Eugen Rochko
2018-01-10Thank you, Officer MurphyDavid Yip
2018-01-10Add examples based on errors seen in #317David Yip
2018-01-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Revert #5772 (#6221)Eugen Rochko
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Fix force_ssl conditional (#6201)Yamagishi Kazutoshi
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Fix email confirmation link not updating email (#6187)Patrick Figel
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-03Allow to dereference Follow object for ActivityPub (#5772)Akihiko Odaki
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2017-12-12Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)Eugen Rochko
2017-12-09Rate limit by user instead of IP when API user is authenticated (#5923)Eugen Rochko
2017-12-09Keep WebPush settings (#5879)abcang
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-06Break out nested relationship API keys (#5887)aschmitz
2017-11-28Allow hiding of reblogs from followed users (#5762)aschmitz
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Remove empty strings (#5732)ysksn
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Optional notification muting (#5087)Surinna Curtis
2017-11-10Per-user reblog hiding implementation/fixes/testsaschmitz
2017-11-09Rewrite account_controller_spec (#5633)Nanamachi
2017-10-21Set up /settings/keyword_mutes. #164.David Yip
2017-10-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-13Improve spec of Feed and UserTrackingConcern (#5367)Eugen Rochko
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-09Fix pagination in Api::V1::BlocksController (#5285)Akihiko Odaki
2017-10-07Add moderation note (#5240)nullkal
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-28 14:21:11 +0000