246 Commits (25cfabce267f95ecfae6663626fe5b88d537a6ff)

Author SHA1 Message Date
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
Eugen Rochko 4e7288d18a Fix boolean columns sometimes having a null value (#4162)
7 years ago
Eugen Rochko 348de9dbc3 Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
7 years ago
Eugen Rochko e7810e4031 Fix regression from #3842 (#3892)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Matt Jankowski b439018342 Language detection defaults to nil (#3666)
8 years ago
Matt Jankowski d339ac2c76 Introduce StatusThreadingConcern (#3490)
8 years ago
Matt Jankowski 533a8cc68b Misc tidying and clean ups (#3445)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 9cc7a3c209 Cover AccountsController more in spec (#3229)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
beatrix 4f3b6cc3be guard against empty domain block list in status scope (#3161)
8 years ago
Eugen Rochko de5e67238b Fix federated timeline excluding local toots when any domain blocks are set (#3151)
8 years ago
Eugen Rochko 5695449335 Add buttons to block and unblock domain (#3127)
8 years ago
Matt Jankowski 6619cfe934 Conditional validations no longer accept strings for if/unless (#3124)
8 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
8 years ago
alpaca-tc 5523fd6efb Refactor Status#ancestors/descendants (#3092)
8 years ago
alpaca-tc 0d7dc192c3 Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko bd7dc50186 Fix change of status callbacks not setting in_reply_to_account_id and (#3072)
8 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
8 years ago
alpaca-tc 4b5edb0d16 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
8 years ago
Eugen Rochko 12ef99556e Add conversation model, <ostatus:conversation /> (#3016)
8 years ago
yhirano e5eb070430 annotate models (#2697)
8 years ago
Matt Jankowski c44ef23e50 Filter on allowed user language preferences (#2361)
8 years ago
Matt Jankowski 3e819257ab More status specs (#2564)
8 years ago
Eugen Rochko 886aa14cfc Cache Status#ancestors recursive query results (#2527)
8 years ago
Tomohiro Suwa 7bb45d9ed5 Don't need to include ActiveModel::Validations (#2521)
8 years ago
Evan Minto 227f45402d ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
alpaca-tc e40ea6cd9d Extract error messages to locale file (#2162)
8 years ago
839 95e8ab21a1 Avoid dynamic methods due to processing speed (#2080)
8 years ago
Eugen Rochko 8867792e53 Rename cache key to exclude_account_ids_for:id, adjust formatting
8 years ago
Eugen Rochko 8af5ceb661 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
8 years ago
alpaca-tc 4f0d96aa5e Required foreign keys (#2003)
8 years ago
Effy Elden d52abe1cc7 Merge branch 'master' into fix/cache_blocking
8 years ago
Matt Jankowski a3a4fe2163 Simplify the og:image and og:description code in stream_entries/show (#1934)
8 years ago
Keiji Yoshimi 6ca3a6c9f4 cache blockings for reducing queries.
8 years ago
Eugen d30a82a22f Fix #1339 - better Atom titles (#1343)
8 years ago
Joël Quenneville 8a67fb5eca DRY up reblog vs original status check
8 years ago