204 Commits (b7b718df0d6dcc3f9fe2cf4a83bfb19a24a1726f)

Author SHA1 Message Date
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
6 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko ecec45ff9b Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Eugen Rochko 16173535d9 Add redraft function (#7735)
7 years ago
Akihiko Odaki 3114ac9655 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
Jenkins a76f40890e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9e3f9b8250 Improve counter caches on Status and Account (#7644)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG f2ecedaab5 Fixes/do not override timestamps (#7336)
7 years ago
Eugen Rochko 1a653fff95 Add entity cache (#7271)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
David Yip 48f5f736a0 db: make schema.rb version subsume bookmarks migration.
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 0c2a08adeb Remove text requirement when media attached from statuses (#6672)
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 e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
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 b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 6f3321fe4f set local_only in a before_create callback instead of status service
7 years ago
Erin 7fc6f40a88 remove vestigial Status#local_only? definition
7 years ago
Erin 278d34a0ec Status#not_local_only scope should match nils too
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 3db3ca1258 Fix unnecessary order (#5807)
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
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago