206 Commits (54608d04862fd435e0fb15562bc945ca437cb5b4)

Author SHA1 Message Date
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
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
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
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
David Yip 2b43b1ab6b db/schema.rb: resolve erroneously-unresolved conflict
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
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
takayamaki 9fb57f8583 add index on statuses for /api/v1/accounts/:account_id/statuses (#6202)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist d2fcd64c31 Use disable_ddl_transaction! to prevent warnings on migration (#6183)
7 years ago
Jenkins 0a2cc2361c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki 2a2ac6c744 more faster index on notifications table (#6108)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang a40aff8dbc Remove duplicate indexes in lists (#5990)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki a90fa13235 Change account_id non-nullable in lists (#5979)
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Jenkins 099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ce3989fc6a Add embed_url to preview cards (#5775)
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki dfceb51d93 add index on stream_entries table (#5793)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
Jenkins 36452d6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 0d0ad983b7 Merge indexes for reblog on statuses table (#5831)
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 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 17bde15f53 Add index of account and reblog to statuses (#5785)
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 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
David Yip 08751360a0 Update annotations on Follow, FollowRequest, and Mute.
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
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago