267 Commits (ccf5ddfd8823139a9b22d0a0d7aad3c2a6e6a5ca)

Author SHA1 Message Date
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
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
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
Ondřej Hruška 1eeead616d Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
7 years ago
Matt Jankowski e31cd944c2 Move create/destroy actions for api/v1/statuses to namespace (#3678)
7 years ago
Matt Jankowski dc717cf425 Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
7 years ago
Eugen Rochko 9eefd60136 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
7 years ago
Eugen Rochko 143ab47410 Fix #3063 - Add dynamic app manifest (#3563)
7 years ago
Daigo 3 Dango e1142e190b Redirect to streaming_api_base_url (#3579)
7 years ago
Matt Jankowski 1066fd1ab5 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
7 years ago
Matt Jankowski 81ce4e4318 Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
7 years ago
alpaca-tc 46ca699d72 Toggle sensitive from admin page (#3261)
7 years ago
Matt Jankowski fecc2c2f47 Refactor of API timeline actions (#3263)
7 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
7 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
7 years ago
alpaca-tc 9ae89c6a2f Render sidekiq scheduler (#2898)
7 years ago
Yamagishi Kazutoshi 397369fc66 Fix redirect path for admin (#2871)
7 years ago
Matt Jankowski 232b822d86 Replace best_in_place editor on admin settings page (#2789)
7 years ago
Kaylee fae1ed48e3 Add option to disable two factor auth in admin accounts panel. (#2584)
7 years ago
Matt Jankowski 6712d98c58 Add spec coverage and refactor authorize_follows controller (#2505)
8 years ago
Eugen f89e26bdd5 Followers-only post federation (#2111)
8 years ago
Evan Minto 227f45402d ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
Ash Furrow eb7db6f8da Admin UI for confirming users (#2245)
8 years ago