994 Commits (2f78bd1b423cdcacff6cd1423e399a4a16a6f34e)

Author SHA1 Message Date
Akihiko Odaki 11c19f6cc9 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Rey Tucker 4c91be94d3 request: in the event of failure, try other IPs (#6761) (#6813)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 29f412da2c Fix #6657 - Use target instead of origin in Remove activity (#6664)
7 years ago
Akihiko Odaki e68459fc5b Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki a497940b0f Do not default site_title with site_hostname in InstanceHelper (#6624)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
Eugen Rochko 359e441fb2 Fix missing focalPoint in ActivityPub JSON (#6609)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Jenkins b4f099ac0a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7ac6e09dde Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins e9cbb427a4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 0923d23789 Improve performance of feed_manager_spec (#6517)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Kazushige Tominaga 77f0e250a4 Added fetch_remote_status_service call spec case actibitypub (#6500)
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
7 years ago
Akihiko Odaki 553f6efcb0 Limit the languages used for notification mailer test (#6487)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Jenkins bcd435effe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 845ea13622 Fix URLs incorrectly having trailing hyphen removed (#6465)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip 062f72c593 Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
Kazushige Tominaga 74c0abdcf7 Added FetchRemoteAccountService spec (#6456)
7 years ago
David Yip a5f1c1f469 Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
Kazushige Tominaga ab35601c79 Added #call spec (#6455)
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Kazushige Tominaga c208dc4ce7 Perform request spec (#6446)
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
Kazushige Tominaga 39eb9eec05 Added #link_header spec (#6439)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang d3760fd25c Fix mistake in cache deletion (#6408)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki fabc4af7ff Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 5f9c017c01 Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip f4428a7ba8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira b2632dfad7 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Mike Burns 0b8a96e767 Use be_within instead of eq for a to_f test match (#6275)
7 years ago
Eugen Rochko 000b0baac2 HTML e-mails for NotificationMailer (#6263)
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip eecdc3e6a7 Add examples based on errors seen in #317
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins f10ce3f003 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d4e0d2563c Fix bad URL schemes being accepted (#6219)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi c89bb8ae40 Fix force_ssl conditional (#6201)
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 3bc13de62f Fix enforce HTTPS in production. (#6180)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel bc5487a1c2 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 5ee5272b69 Don't normalize URLs in toots (#6134)
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 95adc48b92 [!] Sanitize incoming classlist properly (#6162)
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
David Yip f722fcb5a6 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki d8a0c19166 Fix XML oEmbed support discovery (#6104)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip 634f0481c3 Examples for Status.as_public_timeline.
7 years ago
David Yip b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Akihiko Odaki 109886507e Remove preview_card fabricator (#5975)
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 7fc5cf7a12 Keep WebPush settings (#5879)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cfe67ba832 Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 2421fd745a Fix too many forwards (#5854)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
ThibG f33fd11c87 Fix handling of temporary failures in ProcessMentionsService (#5842)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 4dd95c79a5 Add tests for Streamable (#5771)
7 years ago
ysksn 5dd8a36c09 Add tests for AccountRelationshipsPresenter (#5805)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
Jenkins 1c33bd3d3a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 4086db0929 Add tests for Remotable (#5768)
7 years ago
Jenkins 9c9b105d43 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang defb2fd0b0 Fix N+1 at notification (#5752)
7 years ago
David Yip cd2d8dc4a4 Update .following_map examples with show-reblogs information.
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
ysksn 42cb1425c6 Add tests for AccountInteractions (#5751)
7 years ago
ysksn a7d85563bd Add a test for Settings::Extend#settings (#5720)
7 years ago
ysksn c09c37af98 Add tests for Status#title (#5718)
7 years ago
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
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
David Yip bcdd0f8b9d Update StatusPolicy to check current_account for local_only? toots.
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
ysksn a766ece166 Add tests for Status#verb (#5717)
7 years ago
David Yip 235b13498f Add some examples for Glitch::KeywordMute::TagMatcher. #208.
7 years ago
ysksn ab48f2b239 Add tests for Status#hidden? (#5719)
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 2c6a2d588c Match keyword mute filter on hashtags. #208.
7 years ago
David Yip dd29a41b61 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix ed1cf698a2 Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706)
7 years ago
ysksn 2e5aec4479 Add a test for Tag#to_param (#5705)
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
ysksn bde85899a5 Add tests for StreamEntry (#5687)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
ysksn 63714ad94a Add a test for SiteUpload#cache_key (#5685)
7 years ago
Yamagishi Kazutoshi 1c83ce9b81 Refactor remote_follow_spec.rb (#5690)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
ysksn 9b7f9f3527 Add tests for Setting (#5683)
7 years ago
David Yip 13ec4a9a20 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
ysksn b390208bfa Add tests for SessionActivation (#5668)
7 years ago
ysksn 56d569aa21 Add tests for RemoteProfile (#5665)
7 years ago
aschmitz 3fe59e7d97 Actually filter blocked reblogs from feed
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
ysksn 9f78fb2132 Add tests for RemoteFollow (#5651)
7 years ago
ysksn 471c7f61d9 Add tests for Notification (#5640)
7 years ago
ysksn 26f52a2551 Add and Remove tests for FollowRequest (#5622)
7 years ago
Nanamachi e1ee50976c Rewrite account_controller_spec (#5633)
7 years ago
ysksn 321a4d35c6 Add tests for MediaAttachment (#5620)
7 years ago
ysksn a69f061c30 Add tests for CustomEmoji#local? and #object_type (#5621)
7 years ago
ysksn 0e22b993e6 Implement tests for Account#refresh! (#5601)
7 years ago
ysksn ffab17400b Add test for Account#save_with_optional_media! (#5603)
7 years ago
ysksn 515afedcd0 Implement tests for Account#possibly_stale? (#5591)
7 years ago
David Yip d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 4472c5723a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip 22f9b4f2c0 Also filter notifications containing muted keywords.
7 years ago
David Yip 1d726a72c6 Fix example description.
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip 3b2bf30644 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip 8d69329b8e keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
David Yip b2ad79547c Apply keyword mutes to reblogs.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 05ee0aeb8b Allow keywords to match either substrings or whole words.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 2c11e95efd Fix case-insensitive match scenario; test some word ornamentation. #164.
7 years ago
David Yip a3ee8592a8 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip ddcb129101 Spec out KeywordMute interface. #164.
7 years ago
David Yip c123b710ad Add KeywordMute model.
7 years ago
beatrix eed9808f5f hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
aschmitz 4dbdda6b89 Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 7571d79c8d Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
unarist 1fa6d20981 Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 69b74d26cd Use atomUri in Undo activity of Announce (#5376)
7 years ago
Eugen Rochko 3378a3af96 Improve spec of Feed and UserTrackingConcern (#5367)
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
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Nolan Lawson 14db4829dc Update emoji-mart to v2.1.1 (#5256)
7 years ago
Nolan Lawson 651aba0e12 Fix thinking_face emoji autocomplete (#5238)
7 years ago
Ondřej Hruška 851d5c03e2 fix haml quotes in a bid to make travis less grumpy
7 years ago
Nolan Lawson 2b34471d9d Compress and combine emoji data (#5229)
7 years ago
ThibG a89d69a269 Fix regression in FetchRemoteResourceService (#5217)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 2e6db37776 Validate id of ActivityPub representations (#5114)
7 years ago
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago