216 Commits (8c906efad0fe585263c4736687d13cc3ebf7dae4)

Author SHA1 Message Date
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