about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Expand)Author
2017-09-13Refactor handling of default params for muting to make code cleanerSurinna Curtis
2017-09-13add an explanatory comment to AccountInteractionsSurinna Curtis
2017-09-13Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:i...Surinna Curtis
2017-09-13Expose whether a mute hides notifications in the api/v1/relationships endpointSurinna Curtis
2017-09-13Add muting_notifications? and a notifications argument to mute!Surinna Curtis
2017-09-10Fix a spuriously failing spec that assumed we required short bios like upstreamSurinna Curtis
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Default follows for new users (#4871)Eugen Rochko
2017-09-09Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4David Yip
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
2017-09-07Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)Eugen Rochko
2017-09-07Feat add validation for report comment: characters under 1000 valid (#4833)voidSatisfaction
2017-09-06Fix locking migration on statuses table. Nullable column and NO default value...Eugen Rochko
2017-09-06Switch to static URIs, new URI format in both protocols for new statuses (#4815)Eugen Rochko
2017-09-02Validate data of Imports (#4782)abcang
2017-09-02Fix WebPush (regression from #4524) (#4778)unarist
2017-09-01Make PreviewCard records reuseable between statuses (#4642)Eugen Rochko
2017-09-01Refactor Web::PushSubscription, remove welcome message (#4524)Eugen Rochko
2017-08-30Use request.remote_ip instead of request.ip (#4744)nullkal
2017-08-29Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)Eugen Rochko
2017-08-28rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)abcang
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-24Minor performance improvement for test suite (#4678)Eugen Rochko
2017-08-22Application prefs section (#2758)Colin Mitchell
2017-08-21Periodically remove expired PuSH subscribers (#4654)Eugen Rochko
2017-08-21Do not try to re-subscribe to unsubscribed accounts (#4653)Eugen Rochko
2017-08-16Redesign public profiles (#4608)Eugen Rochko
2017-08-13ActivityPub delivery (#4566)Eugen Rochko
2017-08-08Add ActivityPub inbox (#4216)Eugen Rochko
2017-08-08Add coalesce option to avatar and header convert processor (#4552)Yamagishi Kazutoshi
2017-08-08Revert "Set false to animated options for thumbnail processor" (#4550)Yamagishi Kazutoshi
2017-08-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-07Set false to animated options for thumbnail processor (#4547)Yamagishi Kazutoshi
2017-08-01Merge upstream (#111)kibigo!
2017-08-01fix(web_push_notifications): Send message with welcome notifications (#4471)Sorin Davidoi
2017-07-29Count all URLs in text as 23 characters flat, do not count domain part of use...Eugen Rochko
2017-07-28Fix web push notifications "boost" icon not being loaded (regression from #44...Eugen Rochko
2017-07-28Use consistent icons for web push notifications, same as web UI (#4426)Eugen Rochko
2017-07-28feat(web_push_notifications): Group notifications (#4388)Sorin Davidoi
2017-07-27fix(push_subscription): Use star icon for favourite action (#4396)Sorin Davidoi
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-24Allow domain blocks that only reject media without silencing or suspending (#...sdukhovni
2017-07-23Add rake task mastodon:feeds:build to regenerate all active users' feeds (#4303)Eugen Rochko
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
2017-07-19fix(push_subscription): Guard against malformed favourite notification (#4271)Sorin Davidoi
2017-07-19Add ActivityPub attributes to accounts (#4273)Eugen Rochko
2017-07-19Fix deprecation warning for non-pipeline assets (#4267)Eugen Rochko
2017-07-18Merge changes from upstream with the CSS reload fixOndřej Hruška