836 Commits (8833e0fab04872832e0e2490cebd85bf12ab77cf)

Author SHA1 Message Date
Thibaut Girka 3d6c594903 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 907694df6a Add autofollow option to invites (#7805)
7 years ago
David Yip 4692eed7bd Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip f9c8642a11 Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 39930a8432 Fix has_one association on Web::PushSubscription (#7767)
7 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko ecec45ff9b Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Yamagishi Kazutoshi 29f4196d87 Fix fetch of remote image with multiple Content-Type headers (#7749)
7 years ago
Yamagishi Kazutoshi 7ed181c41c Add missing dot for remote image (#7751)
7 years ago
David Yip 63a5f8a4e4 Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
7 years ago
David Yip 9f9aa39eb5 Escape metacharacters in non-whole-word keyword mutes. Fixes #533.
7 years ago
Eugen Rochko 16173535d9 Add redraft function (#7735)
7 years ago
David Yip 3413105ec7 Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
7 years ago
nightpool 0378f74430 Fix context performance by partially reverting #7083 (#7734)
7 years ago
Yamagishi Kazutoshi a936ccd126 Detect extname from Content-Type (#7733)
7 years ago
David Yip 2bb5842541 Thread scopes through #matches?. #454.
7 years ago
Akihiko Odaki 3114ac9655 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
David Yip 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 650e3e346b Remove trending hashtags (#7711)
7 years ago
David Yip d55d5ccc9d keyword mute: Store keywords as a list
7 years ago
David Yip 827d1ea864 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3833c8b690 Use different algorithm for trending tags (#7697)
7 years ago
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
Eugen Rochko dc7bf28635 Reduce wasted work in RemoveStatusService due to inactive followers (#7672)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 776b996964 Rescue Mastodon::DimensionsValidationError in Remoteable (#7662)
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 8a3b9d26fb Track trending tags (#7638)
7 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 03c8890e09 Validate that e-mail resolves with MX and it's not blacklisted (#7631)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
Eugen Rochko 70e678da43 Improve payload format of Web Push API now that it's open (#7521)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko 52a2498f60 Fix nil error in StatusFilter (#7470)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG b59416500e Catch Paperclip processing failures (fixes #6378) (#7439)
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
David Yip 106a0d5c70 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
Eugen Rochko 4055ce490c Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Eugen Rochko 0de45574e0 4 profile fields max, store only 255 characters per name/value (#7348)
7 years ago
Eugen Rochko 8913ccb434 Store home feeds for 7 days instead of 14 (#7354)
7 years ago
Daggertooth b60e38c985 Escape metachars in keywords
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 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip dde7fa8bbe Remove unnecessary code from MediaAttachment#set_type_and_extension.
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG f2ecedaab5 Fixes/do not override timestamps (#7336)
7 years ago
Eugen Rochko 92c5474861 Fix n+1 queries in StatusThreadingConcern (#7321)
7 years ago
Eugen Rochko 5dd68ba919 Fix cache_associated no longer working (#7320)
7 years ago
abcang fcfc44de66 Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko 4258e304c5 Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko d6a2530d73 Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
David Yip e484bd61e0 Also treat non-whole-word mutes as case-insensitive. #450.
7 years ago
Eugen Rochko 1a653fff95 Add entity cache (#7271)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
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
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
Eugen Rochko 39f36c0901 Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
7 years ago
Eugen Rochko 0ad5e05e4a Rescue Mastodon::LengthValidationError in Remoteable (#7228)
7 years ago
Eugen Rochko 85c3f7eb1b Force convert to JPG for preview card thumbnails to avoid animations (#7109)
7 years ago
David Yip 48f5f736a0 db: make schema.rb version subsume bookmarks migration.
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
Eugen Rochko 4f460eba18 Fix warning about using SQL in order for Account#partitioned (#7159)
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
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
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
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
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
MIYAGI Hikaru 62c6b71866 Fix GIFV encoding params (#7098)
7 years ago
Akihiko Odaki 31e1667933 Exclude status itself from context query (#7083)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
Eugen Rochko ebba6fb7f5 Fix UniqueUsernameValidator comparison (#6926)
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 60eafb173f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago