254 Commits (44b1a39682f7b93642726695980bbd600ee529fe)

Author SHA1 Message Date
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
7 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 59b42188a7
Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Eugen Rochko bd0791d800
Add redraft function (#7735)
7 years ago
Akihiko Odaki 5bf5003384 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a7d726c383
Improve counter caches on Status and Account (#7644)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
7 years ago
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
Akihiko Odaki 0de82dd316 Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist dd6f9a1b82 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 198a9a4fa4 Remove local_only scope in Status (#4977)
7 years ago
Eugen Rochko dd6ede554f Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
7 years ago
Eugen Rochko 11bddd31ce Fix locking migration on statuses table. Nullable column and NO default value (#4825)
7 years ago
Eugen Rochko e7adbf572a Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 4c76402ba1 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Eugen Rochko e2685ccc81 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Eugen Rochko 880a5eb25c Fix boolean columns sometimes having a null value (#4162)
7 years ago
Eugen Rochko e48d3bfd01 Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
7 years ago
Eugen Rochko 0190aac240 Fix regression from #3842 (#3892)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Matt Jankowski 022008a2a6 Language detection defaults to nil (#3666)
8 years ago
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern (#3490)
8 years ago
Matt Jankowski b25e42a77f Misc tidying and clean ups (#3445)
8 years ago
Jack Jennings 3a2003ba86 Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 8fd174298d Cover AccountsController more in spec (#3229)
8 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
8 years ago
beatrix 724fc3cbdf guard against empty domain block list in status scope (#3161)
8 years ago
Eugen Rochko f8ee136c29 Fix federated timeline excluding local toots when any domain blocks are set (#3151)
8 years ago
Eugen Rochko f1ab70649b Add buttons to block and unblock domain (#3127)
8 years ago
Matt Jankowski 6e4c7d6211 Conditional validations no longer accept strings for if/unless (#3124)
8 years ago
Eugen Rochko 620d0d8029 Account domain blocks (#2381)
8 years ago
alpaca-tc 59ceeae8ea Refactor Status#ancestors/descendants (#3092)
8 years ago
alpaca-tc a2a2af244c Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko af706583bd Fix change of status callbacks not setting in_reply_to_account_id and (#3072)
8 years ago
Eugen Rochko d0dd9eb5b5 Feature conversations muting (#3017)
8 years ago
alpaca-tc e9810cbad6 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
8 years ago
Eugen Rochko 5abdc77c80 Add conversation model, <ostatus:conversation /> (#3016)
8 years ago
yhirano 298796cc7b annotate models (#2697)
8 years ago
Matt Jankowski f025cc6782 Filter on allowed user language preferences (#2361)
8 years ago
Matt Jankowski effb08edbb More status specs (#2564)
8 years ago
Eugen Rochko d4fedf84e0 Cache Status#ancestors recursive query results (#2527)
8 years ago
Tomohiro Suwa 1f805a6377 Don't need to include ActiveModel::Validations (#2521)
8 years ago
Evan Minto 66fd8e7821 ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
alpaca-tc 2c0d756ad9 Extract error messages to locale file (#2162)
8 years ago
839 e2a1b574ab Avoid dynamic methods due to processing speed (#2080)
8 years ago