406 Commits (0fd3f87ea29b2072da20f0d8693d547ad6b6c03a)

Author SHA1 Message Date
Jenkins a76f40890e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9e3f9b8250 Improve counter caches on Status and Account (#7644)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 8913ccb434 Store home feeds for 7 days instead of 14 (#7354)
7 years ago
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
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
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
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
Jenkins a1894cbc13 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
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
David Yip 7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master
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
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
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
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
David Yip a5f1c1f469 Fill out some examples for Glitch::FilterHelper. #234.
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
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
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
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
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 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
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
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 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 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
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
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 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
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 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 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 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
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3378a3af96 Improve spec of Feed and UserTrackingConcern (#5367)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Eugen Rochko 5f137e7ec3 Increase attachment descriptions to 420 characters (#5139)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
unarist 3978894d05 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 8c96e0d496 Remove local_only scope in Status (#4977)
7 years ago
Surinna Curtis e6a8692d0e minor code style fixes oops
7 years ago
Surinna Curtis 8a965eba19 Add specs for how mute! interacts with muting_notifications?
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
voidSatisfaction ac63da7732 Feat add validation for report comment: characters under 1000 valid (#4833)
7 years ago
Eugen Rochko 73c613dcfc Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
abcang d73174b629 Validate data of Imports (#4782)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Eugen Rochko d76bd63226 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Eugen Rochko 39b0588256 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
masarakki d0a037ae79 add validation to tag name (#4194)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
unarist ae26d7b557 Make tag search case insensitive again (#4184)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) d5586563c7 Remove sort in Feed (#4050)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) fa7649409b Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
7 years ago
beatrix-bitrot c6302f6fc4 fix account spec broken by change to 500char bios
7 years ago
Sorin Davidoi 1280559503 Revocable sessions (#3616)
8 years ago
Eugen Rochko 8fb81e1372 Add important test for full-width hashtags (#3911)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 561ca10d86 Some minor change and spec for Account (#3813)
8 years ago
Eugen Rochko e7810e4031 Fix regression from #3842 (#3892)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 481f277e58 Cover Block more (#3837)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) ac1f0e49f0 Cover DomainBlock more (#3838)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) c8020b2105 Cover Export more (#3840)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 5fcbc71c35 Cover Favourite more (#3841)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e990a4a566 Spec AccountDomainBlock (#3816)
8 years ago
Eugen Rochko 973d6ef93a Fix #2619 - When redis feed is empty, fall back to database (#3721)
8 years ago
Eugen Rochko 006594e181 Fix db:seed - only run some validations when the field was changed (#3592)
8 years ago
Yamagishi Kazutoshi 5da41e0cae Improve RuboCop rules (compatibility to Code Climate) (#3636)
8 years ago
unarist c40e5aea44 Use "match_array" only for order independent assertions (#3626)
8 years ago
unarist 117d333a84 Fix tag search order and not to use tsvector (#3611)
8 years ago
Matt Jankowski d339ac2c76 Introduce StatusThreadingConcern (#3490)
8 years ago
Eugen Rochko 4a6ceb24c9 Added support for configurable reserved usernames (fix of #1382) (#3566)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 1653be63ac Spec ScopedSettings (#3559)
8 years ago
Matt Jankowski 25990c77c0 Handle nil and blank cases in Account finders (#3500)
8 years ago
Matt Jankowski ff4d3f11b5 Expand spec coverage and refactor the `Account.find_` methods (#3485)
8 years ago
Akihiko Odaki 20d016f430 Refactor User and spec (#3431)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 4f023cb001 Introduce recent to Follow (#3247)
8 years ago
Matt Jankowski 8c11626321 Add coverage for ReportFilter and AccountFilter (#3236)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
Eugen Rochko a55019c3bf More tests for public timeline method (#3171)
8 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
8 years ago
alpaca-tc b8b7be1e4a Improve Account#triadic_closures (#3079)
8 years ago
alpaca-tc 0d7dc192c3 Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
8 years ago
alpaca-tc 4b5edb0d16 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
8 years ago
Eugen Rochko 12ef99556e Add conversation model, <ostatus:conversation /> (#3016)
8 years ago
Jack Jennings cd56acd184 Add specs for current Status#permitted? implementation (#2982)
8 years ago
Matt Jankowski bddb03a089 Improve allowed language handling (#2897)
8 years ago
Matt Jankowski 05b8a950c6 Stream entry specs and refactor to use delegate (#2827)
8 years ago
Matt Jankowski 5393dbf4a2 Misc spec coverage improvements (#2821)
8 years ago
masarakki 23bf01bcd6 use Twitter::Extractor for creating links (#2502)
8 years ago
Kaylee fae1ed48e3 Add option to disable two factor auth in admin accounts panel. (#2584)
8 years ago
Yamagishi Kazutoshi 70f9858e6f Fix subscription expiration condition (#2715)
8 years ago
Matt Jankowski c44ef23e50 Filter on allowed user language preferences (#2361)
8 years ago
Matt Jankowski 4f155a3c86 Reports spec for media attachments, clean up method (#2660)
8 years ago
Akihiko Odaki a28863bf95 Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)
8 years ago
Akihiko Odaki 7cd8e61b5a Use PostgreSQL inheritance for blocks and mutes (#2520)
8 years ago
Joël Quenneville e9ebe097ec Add tests to the Feed model (#2594)
8 years ago
Matt Jankowski 3e819257ab More status specs (#2564)
8 years ago
Matt Jankowski d120a7ac99 Add spec for Status.as_home_timeline (#2451)
8 years ago
Francis Chong 395608442d Add media dimensions (#2448)
8 years ago