423 Commits (a340e653df30a90910675f09284059055a598d46)

Author SHA1 Message Date
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e7e577dd6e
Enforce username format for remote users, too (#8102)
6 years ago
Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0fb0037ca7
Resize images by area instead of fixed dimensions (#8083)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko da8fe8079e
Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
6 years ago
David Yip 99b2bc2668
keyword mute: Add missing scope for regex escape test
7 years ago
David Yip e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533.
7 years ago
David Yip 26573ad7e6
Thread scopes through #matches?. #454.
7 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a7d726c383
Improve counter caches on Status and Account (#7644)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko c73ce7b695
Store home feeds for 7 days instead of 14 (#7354)
7 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Shuhei Kitagawa 28b366d065 Add missing tests for report.rb (#7324)
7 years ago
abcang 71a7cea73f Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko c5dcd7d836
Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
Shuhei Kitagawa 6c40e567aa Add missing tests for user.rb (#7306)
7 years ago
David Yip 5f8f481425
Also treat non-whole-word mutes as case-insensitive. #450.
7 years ago
MIYAGI Hikaru eb593a5a0c Append '.test' to hostname in stub data (#7260)
7 years ago
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148)
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
Jenkins e3d0d72b29 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
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
David Yip f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
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
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 9b8a448477 Isolate each specs for cache store (#6450)
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
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
David Yip d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234.
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
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
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
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
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 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
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
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 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 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
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
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 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
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 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 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 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
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3283868e28 Improve spec of Feed and UserTrackingConcern (#5367)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Eugen Rochko 887cd94e96 Increase attachment descriptions to 420 characters (#5139)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Akihiko Odaki 0de82dd316 Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist dd6f9a1b82 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 198a9a4fa4 Remove local_only scope in Status (#4977)
7 years ago
Surinna Curtis d880b3182b minor code style fixes oops
7 years ago
Surinna Curtis 0f2af2a974 Add specs for how mute! interacts with muting_notifications?
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
voidSatisfaction 8185f98872 Feat add validation for report comment: characters under 1000 valid (#4833)
7 years ago
Eugen Rochko e7adbf572a Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
abcang 6ec1aa372d Validate data of Imports (#4782)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Eugen Rochko 53b2b1b238 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
masarakki a49be27145 add validation to tag name (#4194)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
unarist c2753fdfb4 Make tag search case insensitive again (#4184)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f85dbe83c8 Remove sort in Feed (#4050)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7d8e3721ae Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
7 years ago
beatrix-bitrot 49ba78d6f8 fix account spec broken by change to 500char bios
7 years ago
Sorin Davidoi 2211e8d1cd Revocable sessions (#3616)
7 years ago
Eugen Rochko 3f59238207 Add important test for full-width hashtags (#3911)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e27f792c24 Some minor change and spec for Account (#3813)
7 years ago
Eugen Rochko 0190aac240 Fix regression from #3842 (#3892)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 3d13f6ea0c Cover Block more (#3837)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 6eefccdacc Cover DomainBlock more (#3838)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) d55f207274 Cover Export more (#3840)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 05e4728de7 Cover Favourite more (#3841)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) b51945f096 Spec AccountDomainBlock (#3816)
8 years ago
Eugen Rochko dc8a6244fc Fix #2619 - When redis feed is empty, fall back to database (#3721)
8 years ago
Eugen Rochko c207b4bb33 Fix db:seed - only run some validations when the field was changed (#3592)
8 years ago
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636)
8 years ago
unarist 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626)
8 years ago
unarist 004672aa6c Fix tag search order and not to use tsvector (#3611)
8 years ago
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern (#3490)
8 years ago
Eugen Rochko f7a30e2fae Added support for configurable reserved usernames (fix of #1382) (#3566)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 42844df966 Spec ScopedSettings (#3559)
8 years ago
Matt Jankowski d1e08bd38c Handle nil and blank cases in Account finders (#3500)
8 years ago
Matt Jankowski 2cc3111a77 Expand spec coverage and refactor the `Account.find_` methods (#3485)
8 years ago
Akihiko Odaki 7db98aa70e Refactor User and spec (#3431)
8 years ago
Jack Jennings 3a2003ba86 Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki bf575a1f5e Introduce recent to Follow (#3247)
8 years ago
Matt Jankowski e1b42e9aa0 Add coverage for ReportFilter and AccountFilter (#3236)
8 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
8 years ago
Eugen Rochko d3be2b582a More tests for public timeline method (#3171)
8 years ago
Eugen Rochko 620d0d8029 Account domain blocks (#2381)
8 years ago
alpaca-tc 682b68438e Improve Account#triadic_closures (#3079)
8 years ago
alpaca-tc a2a2af244c Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko d0dd9eb5b5 Feature conversations muting (#3017)
8 years ago