283 Commits (7061b36c17e0048646e1c18d764ab4a564605ff3)

Author SHA1 Message Date
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 77f972d5b1 Add support for non-public reblogs from ActivityPub (#9841)
6 years ago
Thibaut Girka 4aca9b4e0f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 88faa4ff2d Attempt fixing deadlocks by moving account stats update outside transaction (#9437)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
valerauko 2178c50fed Ensure replied-to is a status not a boost (#9129)
6 years ago
Eugen Rochko 62c0e112ea Extract counters from accounts table to account_stats table (#9295)
6 years ago
Eugen Rochko 7a939f7cfc Remove intermediary arrays when creating hash maps from results (#9291)
6 years ago
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c3005d09e6 Reset status cache when status_stat or media_attachment updates (#9119)
6 years ago
Eugen Rochko cf2ab9c394 Include preview cards in status entity in REST API (#9120)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 92b93a12cb Do not show "limited" visibility in default visibility preference (#8999)
6 years ago
Eugen Rochko 654520ec8c Improve support for aspects/circles (#8950)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
masarakki 86a912d6f0 exclude-other-silenced-accounts (#7528)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
abcang af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6eca34ffb8 Fix error when trying to update counters for statuses that are gone (#8251)
6 years ago
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d9f9083f26 Update reply counters only if the reply is public/unlisted (#8211)
6 years ago
Eugen Rochko bf5acc3eae Move status counters to separate table, count replies (#8104)
6 years ago
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)
7 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
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 490f3146f2 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander 526b66e871 Retoot count increases without reason (#5363)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
Eugen Rochko da257754b5 Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko d2aeb45461 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
unarist 3978894d05 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 8c96e0d496 Remove local_only scope in Status (#4977)
7 years ago
Eugen Rochko 8bb036350a Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
7 years ago
Eugen Rochko 5ad3153b0b Fix locking migration on statuses table. Nullable column and NO default value (#4825)
7 years ago
Eugen Rochko 73c613dcfc Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 3135d20283 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko 5138dde794 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago