226 Commits (fbc25bdd2dfbc0c2316c5bdae6b8da0c047375c2)

Author SHA1 Message Date
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
Akihiko Odaki ed4bae182b Revert index change on statuses for api/v1/accounts account_id statuses (#7484)
7 years ago
Akihiko Odaki 42a1231245 Improve index on statuses for api/v1/accounts account_id statuses (#7476)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
7 years ago
David Yip 78c145d3cb
db: make schema.rb version subsume bookmarks migration.
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
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