994 Commits (2f78bd1b423cdcacff6cd1423e399a4a16a6f34e)

Author SHA1 Message Date
David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 154076e8e7 Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Shuhei Kitagawa 995d9e8485 Add missing tests for report.rb (#7324)
7 years ago
Eugen Rochko 68ba4f23e0 Serialize webfinger XML with Ox instead of Nokogiri (#7319)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
abcang fcfc44de66 Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko d6a2530d73 Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
Shuhei Kitagawa a110cce92b Add missing tests for user.rb (#7306)
7 years ago
Surinna Curtis 72793b3fc7 Support Actors/Statuses with multiple types (#7305)
7 years ago
David Yip e484bd61e0 Also treat non-whole-word mutes as case-insensitive. #450.
7 years ago
MIYAGI Hikaru 50e673409f Append '.test' to hostname in stub data (#7260)
7 years ago
Emelia Smith 1071ecfebc Prevent suspended accounts from appearing in AccountSearchService (#7246)
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Eugen Rochko 599aa39aca Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
7 years ago
Yamagishi Kazutoshi 32b71c8a25 Fix randomly fail (similar #7219) (#7225)
7 years ago
Yamagishi Kazutoshi 3637c4983b Reset locale on registration tests (#7219)
7 years ago
Yamagishi Kazutoshi 7da649efb4 Use raw status code on have_http_status (#7214)
7 years ago
Yamagishi Kazutoshi 0d4342e146 Introduce rspec-retry (#7206)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
Akihiko Odaki 540d2ddfe4 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
Jenkins a1894cbc13 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
Renato "Lond" Cerqueira a4732040f0 Allow more than the max pins if account is not local (#7105)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8a9da4c414 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 739f76403f Add spec for bookmark endpoints
7 years ago
Akihiko Odaki 6c2344d4dd Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Paul Woolcock ed21e48ad6 Change custom emoji search to `ILIKE` instead of `=` (#7099)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard 6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
David Yip a60a600a10 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 7f1e924fa9 Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 078aa8b5ae Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 44274257de [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
David Yip 2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 0fb7252ac4 Add a spec for UniqueUsernameValidator (#6927)
7 years ago
Akihiko Odaki acece7a2e6 Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 472fba6771 Change columns in notifications nonnullable (#6764)
7 years ago
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