916 Commits (c2e528916cae422baee3d72a3b4409a23c476b3f)

Author SHA1 Message Date
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
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 3ce1385b25
Add examples based on errors seen in #317
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e4a241abef
Fix bad URL schemes being accepted (#6219)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 8d51ce4290 Fix enforce HTTPS in production. (#6180)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 5ec25ff3e1 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG a8b51124ba Don't normalize URLs in toots (#6134)
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 545095b3ce [!] Sanitize incoming classlist properly (#6162)
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki e0ef7f9d79 Fix XML oEmbed support discovery (#6104)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip 6abb0950c6
Examples for Status.as_public_timeline.
7 years ago
David Yip e35a350119
Examples for Status#set_locality and .as_tag_timeline.
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Akihiko Odaki e56323a4dd Remove preview_card fabricator (#5975)
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz 4de211b80a Break out nested relationship API keys (#5887)
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 4c6b5dbe96
Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 85e97ecab6
Fix too many forwards (#5854)
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
ThibG b8efb5daed Fix handling of temporary failures in ProcessMentionsService (#5842)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 1104ac35d3 Add tests for Streamable (#5771)
7 years ago
ysksn 8c0e77d688 Add tests for AccountRelationshipsPresenter (#5805)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
Jenkins 8f3e5f6128 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 6f609dc4b4 Add tests for Remotable (#5768)
7 years ago
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 53e95c4efc Fix N+1 at notification (#5752)
7 years ago
David Yip e45cb0837b Update .following_map examples with show-reblogs information.
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
ysksn 2590aac863 Add tests for AccountInteractions (#5751)
7 years ago
ysksn 8f638a2bf2 Add a test for Settings::Extend#settings (#5720)
7 years ago
ysksn 9d9b1aff1e Add tests for Status#title (#5718)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
David Yip f6355f6ffb Update StatusPolicy to check current_account for local_only? toots.
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
ysksn 556c07df1f Add tests for Status#verb (#5717)
7 years ago
David Yip c2a92dffc9 Add some examples for Glitch::KeywordMute::TagMatcher. #208.
7 years ago
ysksn 3023725936 Add tests for Status#hidden? (#5719)
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
David Yip 431503bae2 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix 04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
ysksn 7d7df877ef Add a test for Tag#to_param (#5705)
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
ysksn 6d7e05ec1f Add tests for StreamEntry (#5687)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
ysksn 48e27c47a7 Add a test for SiteUpload#cache_key (#5685)
7 years ago
Yamagishi Kazutoshi 1f1838420f Refactor remote_follow_spec.rb (#5690)
7 years ago
Yamagishi Kazutoshi 20150659e6 Add uniqueness to block email domains (#5692)
7 years ago
ysksn 4112a0631f Add tests for Setting (#5683)
7 years ago
David Yip 656d54e945 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
ysksn 60f247c2e7 Add tests for SessionActivation (#5668)
7 years ago
ysksn 2fb722397d Add tests for RemoteProfile (#5665)
7 years ago
aschmitz 9a42f7cbed Actually filter blocked reblogs from feed
7 years ago
aschmitz b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
ysksn 56720ba590 Add tests for RemoteFollow (#5651)
7 years ago
ysksn 07cca6e364 Add tests for Notification (#5640)
7 years ago
ysksn 54b42901df Add and Remove tests for FollowRequest (#5622)
7 years ago
Nanamachi d200e041fe Rewrite account_controller_spec (#5633)
7 years ago
ysksn 64cc129225 Add tests for MediaAttachment (#5620)
7 years ago
ysksn 97fc2da2e0 Add tests for CustomEmoji#local? and #object_type (#5621)
7 years ago
ysksn d307ee79e9 Implement tests for Account#refresh! (#5601)
7 years ago
ysksn cf01326cc1 Add test for Account#save_with_optional_media! (#5603)
7 years ago
ysksn 15c0f6ae56 Implement tests for Account#possibly_stale? (#5591)
7 years ago
David Yip dd28b94cf0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 4f337c020a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip d03b48cea0 Also filter notifications containing muted keywords.
7 years ago
David Yip 641f90e73a Fix example description.
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 4b68e82a19 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip 19826774f0 keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 4a64181461 Allow keywords to match either substrings or whole words.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 9f609bc94e Fix case-insensitive match scenario; test some word ornamentation. #164.
7 years ago
David Yip 603cf02b70 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip 4745d6eeca Spec out KeywordMute interface. #164.
7 years ago
David Yip 9093e2de7a Add KeywordMute model.
7 years ago
beatrix a7be86e875 hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
aschmitz 554c2fd8af Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška 8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 34118169ac Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago