406 Commits (b9a2ceca359099207334a9e2155b98ae7165da15)

Author SHA1 Message Date
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Yamagishi Kazutoshi 3e7a541e09 Change RuboCop rules to loose (#4464)
7 years ago
nullkal 6654c30033 Fix an error when a user tries to search nonexistent remote user (regression from #4275) (#4400)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
sdukhovni 06d905f415 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Ondřej Hruška 6913426e48 Merge pull request #92 from tootsuite/master
7 years ago
Eugen Rochko a929f7e6ac Fix #4172 - Mutes now block notifications (#4300)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275)
7 years ago
Sorin Davidoi dcb9497148 fix(push_subscription): Guard against malformed favourite notification (#4271)
7 years ago
Eugen Rochko bbdcfd6baf Add ActivityPub attributes to accounts (#4273)
7 years ago
Akihiko Odaki f0d6550f16 Fix logging in ProcessFeedService (#4270)
7 years ago
Eugen Rochko 8400bee3b1 Refactor ResolveRemoteAccountService (#4258)
7 years ago
Eugen Rochko a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Akihiko Odaki 89b988cab5 Introduce Ostatus name space (#4164)
7 years ago
Sorin Davidoi 8387b3928e fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
ThibG 05cd37097c Optimize uri normalization (#4212)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Eugen Rochko e2685ccc81 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 1764c32b9e Fix #4067 - Do not make HTTP round-trip when resolving local URL (#4160)
7 years ago
nightpool 1c6c6b271c Revert "Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)" (#4157)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 425acecfdb Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 29f314a502 Remove redundant inclusion (#4150)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7bacdd718a Fix PrecomputeFeedService for filtered statuses (#4148)
7 years ago
abcang 617208053c Rescue exceptions related to Goldfinger at FetchRemoteStatusService (#4138)
7 years ago
abcang 307f3e0dd7 Rescue exceptions related to Goldfinger (#4044)
7 years ago
nullkal 007ab330e6 Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)
7 years ago
Surinna Curtis 3464bb30f8 replies to local-only toots default to local-only, and fix some regex bugs
7 years ago
Eugen Rochko 1c1819a78a Fix feed author not being enforced in ProcessFeedService (#4092)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
abcang 5e6acf9601 Fix Nokogiri::HTML at FetchLinkCardService (#4072)
7 years ago
abcang a6d02cff36 Rescue exceptions caused by FetchLinkCardService (#4045)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7362469d89 Do not raise an error if PrecomputeFeed could not find any status (#4015)
7 years ago
abcang b342c81c17 rescue HTTP::ConnectionError (#3992)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f79c10162e Use multiple pairs for zadd in PrecomputeFeedService (#3990)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7d8e3721ae Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
7 years ago
beatrix-bitrot ddafde942c Merge remote-tracking branch 'upstream/master'
7 years ago
Surinna Curtis a6f5111c79 Eyes with variation-selector-16 now also do local-only
7 years ago
ThibG a91d968cab Raise an error if salmon request response is unsatisfactory (#3960)
7 years ago
beatrix-bitrot 93fc8aa14c keyword muting and local only tooting WIP
7 years ago
ThibG 15b43f555d Fix conversations (fixes #3869) (#3870)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
7 years ago
Eugen Rochko f3be605286 Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
7 years ago
ThibG 51b2f789bd Fix #3633 by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService (#3642)
7 years ago
Eugen Rochko 91c71471ab Fix account delete form not accepting password, update suspended (#3745)
7 years ago