194 Commits (94db024e4c42027e8c03bf0ecd2aec26ee73a56c)

Author SHA1 Message Date
David Yip da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a24605961a Fixes/do not override timestamps (#7336)
7 years ago
Eugen Rochko a872392cd9
Add entity cache (#7271)
7 years ago
Emelia Smith 60b871d56c Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Yamagishi Kazutoshi 9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
David Yip 78c145d3cb
db: make schema.rb version subsume bookmarks migration.
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
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 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
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 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a71af98401
Push discovered status through streaming API within a time window (#6484)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
David Yip e35a350119
Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Erin c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 288f1293ef set local_only in a before_create callback instead of status service
7 years ago
Erin 0c46058a43 remove vestigial Status#local_only? definition
7 years ago
Erin 24f36ca912 Status#not_local_only scope should match nils too
7 years ago
Erin 6bd18e43ba filter local-only statuses from public pages
7 years ago
Erin 08519cd4f4 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 434c70fd98 add a local_only column to the statuses table
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
William Pitcock 32987004c9 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 269a445c0b Fix unnecessary order (#5807)
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
Daniel Hunsaker cf7e840990 Update model annotations to use BIGINT for IDs (#5461)
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist a1c54220e8 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander b8bae96647 Retoot count increases without reason (#5363)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
beatrix f0a2a6c875 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko 9c8e602163 Fix custom emojis not detected when used in content warning (#5049)
7 years ago