168 Commits (f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37)

Author SHA1 Message Date
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko 09a94b575e Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko d1a78eba15 Embed modal (#4748)
7 years ago
Eugen Rochko 2db9ccaf3e Add sharedInbox to actors (#4737)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko ca7ea1aba9 Redesign public profiles (#4608)
7 years ago
Eugen Rochko 3c6503038e Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Eugen Rochko 6270f9ce34 Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Yamagishi Kazutoshi ef16089c6d Redirect user profile page to short URL when HTML format (#4328)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago
Ondřej Hruška 604654ccb4 New notification cleaning mode (#89)
7 years ago
Eugen Rochko 4b911fea03 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Yamagishi Kazutoshi 716f4cb11c Add feature to revoke sessions (#4259)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
Ondřej Hruška 75aafc932e Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
8 years ago
Matt Jankowski 2925372ff4 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
Matt Jankowski 5282ba862a Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
Eugen Rochko 8902e265b4 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
8 years ago
Eugen Rochko 722d152082 Fix #3063 - Add dynamic app manifest (#3563)
8 years ago
Daigo 3 Dango 2985d08951 Redirect to streaming_api_base_url (#3579)
8 years ago
Matt Jankowski 5c63523972 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski de4681b2be Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
8 years ago
alpaca-tc 7ee5fc5d68 Toggle sensitive from admin page (#3261)
8 years ago
Matt Jankowski 4289ed1d13 Refactor of API timeline actions (#3263)
8 years ago
Eugen Rochko 620d0d8029 Account domain blocks (#2381)
8 years ago
Eugen Rochko d0dd9eb5b5 Feature conversations muting (#3017)
8 years ago
alpaca-tc 8c9aff0bef Render sidekiq scheduler (#2898)
8 years ago
Yamagishi Kazutoshi d7c17c32af Fix redirect path for admin (#2871)
8 years ago
Matt Jankowski 2bd132d458 Replace best_in_place editor on admin settings page (#2789)
8 years ago
Kaylee 7880671f35 Add option to disable two factor auth in admin accounts panel. (#2584)
8 years ago
Matt Jankowski 0618f09939 Add spec coverage and refactor authorize_follows controller (#2505)
8 years ago
Eugen 501514960a Followers-only post federation (#2111)
8 years ago
Evan Minto 66fd8e7821 ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago