208 Commits (482ad7d7c4f522deaea2487a150eeaaa0a795979)

Author SHA1 Message Date
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b2a4ffd3a9 Change columns in notifications nonnullable (#6764)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Jenkins 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 67f7ffa792 Change user_id column non-nullable (#6435)
7 years ago
David Yip e815d6803d
db/schema.rb: resolve erroneously-unresolved conflict
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
takayamaki 6f5c0afe93 add index on statuses for /api/v1/accounts/:account_id/statuses (#6202)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 7347d4f8bb Use disable_ddl_transaction! to prevent warnings on migration (#6183)
7 years ago
Jenkins 6b85dba8da Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki 1494509468 more faster index on notifications table (#6108)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang cfa3f55221 Remove duplicate indexes in lists (#5990)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki 14c4a33cd9 Change account_id non-nullable in lists (#5979)
7 years ago
Erin 434c70fd98 add a local_only column to the statuses table
7 years ago
Jenkins 744447b3c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki c083816c24 Add embed_url to preview cards (#5775)
7 years ago
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki dc1ebd45a3 add index on stream_entries table (#5793)
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
Jenkins 63d47e04c4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 7fb850e987 Merge indexes for reblog on statuses table (#5831)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang a78f66c069 Add index of account and reblog to statuses (#5785)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
David Yip 130aa90d55 Update annotations on Follow, FollowRequest, and Mute.
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 20150659e6 Add uniqueness to block email domains (#5692)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago