about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Expand)Author
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
2017-07-18Add unfollow modal (optional) (#4246)Yamagishi Kazutoshi
2017-07-18Improve admin page (#4121)abcang
2017-07-18fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)Sorin Davidoi
2017-07-15Merge upstream (#81)kibigo!
2017-07-14Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)Eugen Rochko
2017-07-14HTTP signatures (#4146)Eugen Rochko
2017-07-14Fix #4149, fix #1199 - Store emojis as unicode (#4189)Eugen Rochko
2017-07-14Add option to opt out of search engines on public profile/status pages (#4199)Eugen Rochko
2017-07-14add validation to tag name (#4194)masarakki
2017-07-13Web Push Notifications (#3243)Sorin Davidoi
2017-07-13Make tag search case insensitive again (#4184)unarist
2017-07-13Fix boolean columns sometimes having a null value (#4162)Eugen Rochko
2017-07-13Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)Eugen Rochko
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-12Improve UI of admin site settings (#4163)Eugen Rochko
2017-07-11Fix #2848 - Rake task to redownload avatars/headers (#4156)Eugen Rochko
2017-07-10Add setting a always mark media as sensitive (#4136)Yamagishi Kazutoshi
2017-07-07Refactor JSON templates to be generated with ActiveModelSerializers instead o...Eugen Rochko
2017-07-06Add a setting allowing the use of system's default font in Web UI (#4033)Damien Erambert
2017-07-05Explicitly require MIME::Types (#4083)Akihiko Odaki (@fn_aki@pawoo.net)
2017-07-03Remove sort in Feed (#4050)Akihiko Odaki (@fn_aki@pawoo.net)
2017-07-03Rescue exceptions caused by FetchLinkCardService (#4045)abcang
2017-06-30Rescue Addressable::URI::InvalidURIError at Remotable (#4017)abcang
2017-06-28Do not fail to create access token if superapp was never created (#3986)Eugen Rochko
2017-06-27Merge remote-tracking branch 'upstream/master'beatrix-bitrot
2017-06-26don't count bio metadata against bio length on serverSurinna Curtis
2017-06-26update bio length to 500beatrix-bitrot
2017-06-25Bind web UI access tokens to sessions (#3940)Eugen Rochko
2017-06-25Add overview of active sessions (#3929)Eugen Rochko
2017-06-23Revocable sessions (#3616)Sorin Davidoi
2017-06-22Some minor change and spec for Account (#3813)Akihiko Odaki (@fn_aki@pawoo.net)