403 Commits (9859b9df21c31d13c3b6fed0af1e83e650b7d1df)

Author SHA1 Message Date
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
sdukhovni 961f103c35 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Ondřej Hruška 1dda0acdcb Merge pull request #92 from tootsuite/master
7 years ago
Eugen Rochko cf253b725e Fix #4172 - Mutes now block notifications (#4300)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 75ab767791 Fix webfinger retries (#4275)
7 years ago
Sorin Davidoi 04ec8a8f38 fix(push_subscription): Guard against malformed favourite notification (#4271)
7 years ago
Eugen Rochko 81ebd4025a Add ActivityPub attributes to accounts (#4273)
7 years ago
Akihiko Odaki b085c55263 Fix logging in ProcessFeedService (#4270)
7 years ago
Eugen Rochko df59dc6639 Refactor ResolveRemoteAccountService (#4258)
7 years ago
Eugen Rochko 3852032953 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
Akihiko Odaki b0f97d9a87 Introduce Ostatus name space (#4164)
7 years ago
Sorin Davidoi 3d4ae604b8 fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
ThibG 9c1791c546 Optimize uri normalization (#4212)
7 years ago
Eugen Rochko c6e46f7421 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko c5fa4aba91 HTTP signatures (#4146)
7 years ago
Eugen Rochko 5138dde794 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko eb0c9a8831 Fix #4067 - Do not make HTTP round-trip when resolving local URL (#4160)
7 years ago
nightpool 336f1bc5ec Revert "Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)" (#4157)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 002ed7dc62 Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 2e3f13788f Remove redundant inclusion (#4150)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 3db69012fd Fix PrecomputeFeedService for filtered statuses (#4148)
7 years ago
abcang 60df44837e Rescue exceptions related to Goldfinger at FetchRemoteStatusService (#4138)
7 years ago
abcang 7ee3ddac47 Rescue exceptions related to Goldfinger (#4044)
7 years ago
nullkal 07024f56df Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)
7 years ago
Surinna Curtis fd67e58c82 replies to local-only toots default to local-only, and fix some regex bugs
7 years ago
Eugen Rochko 1b16fa4d2f Fix feed author not being enforced in ProcessFeedService (#4092)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
abcang 8041c97d52 Fix Nokogiri::HTML at FetchLinkCardService (#4072)
7 years ago
abcang 43d97dea48 Rescue exceptions caused by FetchLinkCardService (#4045)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) aea653f05d Do not raise an error if PrecomputeFeed could not find any status (#4015)
7 years ago
abcang 572513b0b0 rescue HTTP::ConnectionError (#3992)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f2c73de856 Use multiple pairs for zadd in PrecomputeFeedService (#3990)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) fa7649409b Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
8 years ago
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master'
8 years ago
Surinna Curtis 01f1c9dec6 Eyes with variation-selector-16 now also do local-only
8 years ago
ThibG b9e0e43128 Raise an error if salmon request response is unsatisfactory (#3960)
8 years ago
beatrix-bitrot 002484b9d2 keyword muting and local only tooting WIP
8 years ago
ThibG ee7952c349 Fix conversations (fixes #3869) (#3870)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
ThibG dd67b9e049 Fix #3633 by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService (#3642)
8 years ago
Eugen Rochko c883e96d95 Fix account delete form not accepting password, update suspended (#3745)
8 years ago
Eugen Rochko 6f8f401ea1 Batched remove status service (#3735)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
Eugen Rochko 973d6ef93a Fix #2619 - When redis feed is empty, fall back to database (#3721)
8 years ago