373 Commits (9bdad8f14e145440fea0a49a4c8af0233e093bd2)

Author SHA1 Message Date
ThibG 96f905f409 Add optimistic lock to avoid race conditions when handling votes (#10196)
6 years ago
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 833ffce2df Store remote votes URI (#10158)
6 years ago
Eugen Rochko 230a012f00
Add polls (#10111)
6 years ago
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 364f2ff9aa
Add featured hashtags to profiles (#9755)
6 years ago
Eugen Rochko d14c276e58
Add option to overwrite imported data (#9962)
6 years ago
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 75b1488cf4 Add tombstones for remote statuses (#9830)
6 years ago
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka fb0c906c71 Revert "Revert "Add handler for Move activity (#9629)""
6 years ago
Eugen Rochko a49d43d112
Add scheduled statuses (#9706)
6 years ago
Thibaut Girka bb96a74637 Revert "Add handler for Move activity (#9629)"
6 years ago
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0f938ff29c
Add handler for Move activity (#9629)
6 years ago
Eugen Rochko 5d2fc6de32
Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3c033c4352
Add moderation warnings (#9519)
6 years ago
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Adam Copp 7d00e4edbd Make custom emoji domains case insensitive #9351 (#9474)
6 years ago
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka 53d0293d25 Add database support for list show-reply preferences
6 years ago
Thibaut Girka 55edfd6e0e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 4afda5444a
Change identities id column to a bigint (#9371)
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d6b9a62e0a
Extract counters from accounts table to account_stats table (#9295)
6 years ago
Thibaut Girka c13cfeac09 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko eef8d9a5f7
Add locality check to ActivityPub::FetchRemoteAccountService (#9109)
6 years ago
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 4ea718ef18
Migrate all old direct messages to new conversations schema (#9085)
6 years ago
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko fd5285658f
Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko a38a452481
Add unread indicator to conversations (#9009)
6 years ago
Eugen Rochko ddd30f331c
Improve support for aspects/circles (#8950)
6 years ago
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth (#8906)
6 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 774ac47373
Add conversations API (#8832)
6 years ago
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social 1f98eae1cf Lint pass (#8876)
6 years ago
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 025a06d322
Add missing indices for ON DELETE CASCADE constraints (#8332)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 80148d8edd Split custom filter migration script using the post-deployment migration system
6 years ago
Eugen Rochko 464daffdf9
Upgrade Doorkeeper to 4.4.1 (#8197)
6 years ago
Eugen Rochko 8e111b753a
Move status counters to separate table, count replies (#8104)
6 years ago
Eugen Rochko 434628d98f Expect relays to answer with accept/reject (#8179)
6 years ago
Eugen Rochko 39e361a56d
Expect relays to answer with accept/reject (#8179)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko bb21c6414d
Remove unused indexes (#7829)
6 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
6 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
6 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko 18e1de6a16
Migrate old web push subscriptions to ensure deliveries (#7764)
6 years ago
David Yip 26573ad7e6
Thread scopes through #matches?. #454.
6 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko a16e06bbf5
Deduplicate accounts and make unique username/domain index case-insensitive (#7658)
6 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
6 years ago
Akihiko Odaki ed4bae182b Revert index change on statuses for api/v1/accounts account_id statuses (#7484)
6 years ago
Akihiko Odaki 42a1231245 Improve index on statuses for api/v1/accounts account_id statuses (#7476)
6 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
6 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
6 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
6 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
6 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Eugen Rochko 6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
6 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 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
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
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 4a64181461 Allow keywords to match either substrings or whole words.
7 years ago
David Yip 9093e2de7a Add KeywordMute model.
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
nullkal 6c54d2e583 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 97c02c3389 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago