190 Commits (34ba45e47c7cf68429001532607d12064215aca6)

Author SHA1 Message Date
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi b80a35092e Redirect to reports when moderator (#5733)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko e9bb7e62b1 Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko ad769409f7 Embed modal (#4748)
7 years ago
Eugen Rochko 1b20fe79b4 Add sharedInbox to actors (#4737)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Eugen Rochko 2dba0368f8 Redesign public profiles (#4608)
7 years ago
Eugen Rochko 0e5c8372e7 Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko f18739fd60 Add ActivityPub inbox (#4216)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Eugen Rochko 3360187a90 Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Yamagishi Kazutoshi c946795bc3 Redirect user profile page to short URL when HTML format (#4328)
7 years ago
beatrix-bitrot 8deb2072ef Merge that good fresh upstream shit
7 years ago
Ondřej Hruška 87d95a1eb5 New notification cleaning mode (#89)
7 years ago
Eugen Rochko 9d8d1d90e0 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
Yamagishi Kazutoshi 9392d10250 Add feature to revoke sessions (#4259)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago