1030 Commits (8f720be9f3ad314f0c0b0c7c0cc81616ba20e8fd)

Author SHA1 Message Date
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
6 years ago
Shuhei Kitagawa 12fa2500c4 Add missing tests for sessions controller (#7744)
6 years ago
David Yip a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533.
6 years ago
David Yip cf28049f0a
Add a FeedManager example demonstrating non-mention keywords. #454.
6 years ago
David Yip a40e322f4b
Fix spacing in some FeedManager examples.
6 years ago
David Yip 26573ad7e6
Thread scopes through #matches?. #454.
6 years ago
Shuhei Kitagawa 22caa32ba2 Add tests for embeds controller (#7719)
6 years ago
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Shuhei Kitagawa 00512ecf87 Add tests for migrations_controller (#7707)
6 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko a7d726c383
Improve counter caches on Status and Account (#7644)
6 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Shuhei Kitagawa b0b34a5e38 Add a test for emojis_controller (#7652)
6 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
6 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 6d99a0b652 Fix tests for invites controller (regression from 4d81809f36) (#7597)
6 years ago
Shuhei Kitagawa 12e590edd7 Add tests for report notes controller (#7589)
6 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
6 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko 57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown (#7526)
6 years ago
Jenkins 2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Shuhei Kitagawa b48a166c82 Add tests for account_moderation_notes_controller (#7524)
6 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
6 years ago
Shuhei Kitagawa 50491e0d92 Add tests for invites controller (#7441)
6 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
6 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
6 years ago
Yamagishi Kazutoshi ac788ad47e Disable simplecov on CircleCI (#7416)
6 years ago
Shuhei Kitagawa ce35d81db7 Add tests for admin/roles_controller (#7421)
6 years ago
Shuhei Kitagawa 35eff337d5 Add tests for admin/invites_controller (#7412)
6 years ago
Surinna Curtis 01dfd6dbc8 Take the first recognized actor_type. (#7410)
6 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
6 years ago
Yamagishi Kazutoshi 8c35d163a5 Port travis_retry for CI (#7379)
6 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
6 years ago
Shuhei Kitagawa 661f7e6d9d Add tests for admin/custom_emojis_controller (#7350)
6 years ago
Eugen Rochko c73ce7b695
Store home feeds for 7 days instead of 14 (#7354)
6 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Eugen Rochko 6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
6 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Shuhei Kitagawa 28b366d065 Add missing tests for report.rb (#7324)
6 years ago
Eugen Rochko 28bd4b9800
Serialize webfinger XML with Ox instead of Nokogiri (#7319)
6 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
6 years ago
abcang 71a7cea73f Keep notification when muting_notifications is true (#7311)
6 years ago
Eugen Rochko c5dcd7d836
Speed up test suite by not generating RSA keys in test environment (#7296)
6 years ago
Shuhei Kitagawa 6c40e567aa Add missing tests for user.rb (#7306)
6 years ago
Surinna Curtis dc786c0cf4 Support Actors/Statuses with multiple types (#7305)
6 years ago
David Yip 5f8f481425
Also treat non-whole-word mutes as case-insensitive. #450.
6 years ago
MIYAGI Hikaru eb593a5a0c Append '.test' to hostname in stub data (#7260)
7 years ago
Emelia Smith 495303d9b8 Prevent suspended accounts from appearing in AccountSearchService (#7246)
7 years ago
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148)
7 years ago
Eugen Rochko 75c4ab9d12
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
7 years ago
Yamagishi Kazutoshi 648d645c2f Fix randomly fail (similar #7219) (#7225)
7 years ago
Yamagishi Kazutoshi 3f6893c641 Reset locale on registration tests (#7219)
7 years ago
Yamagishi Kazutoshi d10447c3a8 Use raw status code on have_http_status (#7214)
7 years ago
Yamagishi Kazutoshi b438224751 Introduce rspec-retry (#7206)
7 years ago
Eugen Rochko a9c440637c
Improve report layout (#7188)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
Akihiko Odaki a1049e9380 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
Jenkins e3d0d72b29 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
Renato "Lond" Cerqueira 14d86eb0d0 Allow more than the max pins if account is not local (#7105)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8e88a18316 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 09240810b4 Add spec for bookmark endpoints
7 years ago
Akihiko Odaki 519119f657 Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Paul Woolcock 8f800ad691 Change custom emoji search to `ILIKE` instead of `=` (#7099)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard cd0eaa349c Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 07176fed37
Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 2e59751823 Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist a1d0915585 Add a spec for UniqueUsernameValidator (#6927)
7 years ago
Akihiko Odaki 40e5d2303b Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b2a4ffd3a9 Change columns in notifications nonnullable (#6764)
7 years ago
Akihiko Odaki 54b273bf99 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Rey Tucker 36b5703796 request: in the event of failure, try other IPs (#6761) (#6813)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e6520c0270
Fix #6657 - Use target instead of origin in Remove activity (#6664)
7 years ago
Akihiko Odaki a38dbd9c8a Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki ef44c62d17 Do not default site_title with site_hostname in InstanceHelper (#6624)
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Eugen Rochko 44829d8216
Fix missing focalPoint in ActivityPub JSON (#6609)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
Akihiko Odaki 2e8a492e88 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Jenkins 2edf7128f2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki f8f0572ee0 Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko 4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Jenkins 544543e40a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 7124881273 Improve performance of feed_manager_spec (#6517)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Kazushige Tominaga 78936461d7 Added fetch_remote_status_service call spec case actibitypub (#6500)
7 years ago
Akihiko Odaki 9b8a448477 Isolate each specs for cache store (#6450)
7 years ago
Akihiko Odaki a7c50c7aba Limit the languages used for notification mailer test (#6487)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Jenkins e9052ceaaf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 6ef3874b2e Fix URLs incorrectly having trailing hyphen removed (#6465)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip f1f67c46c5
Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
Kazushige Tominaga 718802a05d Added FetchRemoteAccountService spec (#6456)
7 years ago
David Yip d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
Kazushige Tominaga cbe8743e47 Added #call spec (#6455)
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
Jenkins 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Kazushige Tominaga 1167c6dbf8 Perform request spec (#6446)
7 years ago
abcang cf32f7da5c Fix response of signature_verification_failure_reason (#6441)
7 years ago
Kazushige Tominaga 2bb393684b Added #link_header spec (#6439)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 1afc70c990 Fix mistake in cache deletion (#6408)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Mike Burns ea75ae2d1f Use be_within instead of eq for a to_f test match (#6275)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago