906 Commits (c03cbb9471be1437f3cf1671b7592966db9c5c0b)

Author SHA1 Message Date
Eugen Rochko 0fb0037ca7
Resize images by area instead of fixed dimensions (#8083)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 69c34f3438
Fix number of results returned from TrendingTags.get
6 years ago
Eugen Rochko 0d13e30ad2
Display trending hashtags on admin dashboard (#8038)
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
ThibG 1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko 6b9e03e002
Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko f89c595ea0
Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Renato "Lond" Cerqueira 4045b50bd6 Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)
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 4b0f27ba78 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 50a2854f92 Fix jpeg files sometimes being returned with a .jpe extension (#7881)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 50689f0d41
Create special case to prefer "jpeg" over "jpe" file extension (#7841)
7 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
7 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
7 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 17dc07f667
Fix has_one association on Web::PushSubscription (#7767)
7 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 59b42188a7
Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Yamagishi Kazutoshi 683707839f Fix fetch of remote image with multiple Content-Type headers (#7749)
7 years ago
Yamagishi Kazutoshi b7b331ad0d Add missing dot for remote image (#7751)
7 years ago
David Yip 68373e799b
Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
7 years ago
David Yip a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533.
7 years ago
Eugen Rochko bd0791d800
Add redraft function (#7735)
7 years ago
David Yip f009fef40b
Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
7 years ago
nightpool 5fb013878f Fix context performance by partially reverting #7083 (#7734)
7 years ago
Yamagishi Kazutoshi dc73241bd9 Detect extname from Content-Type (#7733)
7 years ago
David Yip 26573ad7e6
Thread scopes through #matches?. #454.
7 years ago
Akihiko Odaki 5bf5003384 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
7 years ago
David Yip 37d495eeeb
keyword mute: Store keywords as a list
7 years ago
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 6e6c0e9613
Use different algorithm for trending tags (#7697)
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
Eugen Rochko 461542784b
Reduce wasted work in RemoveStatusService due to inactive followers (#7672)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko e599d7caf2 Rescue Mastodon::DimensionsValidationError in Remoteable (#7662)
7 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
7 years ago
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 63c7b91572 Validate that e-mail resolves with MX and it's not blacklisted (#7631)
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
Eugen Rochko 4b94e9c65e
Improve payload format of Web Push API now that it's open (#7521)
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko f31e58af9e
Fix nil error in StatusFilter (#7470)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG be7eeb7856 Catch Paperclip processing failures (fixes #6378) (#7439)
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
David Yip 143878d9da
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
Eugen Rochko 61a9018607
Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Eugen Rochko 8da4bf0f90
4 profile fields max, store only 255 characters per name/value (#7348)
7 years ago
Eugen Rochko c73ce7b695
Store home feeds for 7 days instead of 14 (#7354)
7 years ago
Daggertooth b25278180a Escape metachars in keywords
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 da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 106a5d7b83
Remove unnecessary code from MediaAttachment#set_type_and_extension.
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a24605961a Fixes/do not override timestamps (#7336)
7 years ago
Eugen Rochko a5293fdf61
Fix n+1 queries in StatusThreadingConcern (#7321)
7 years ago
Eugen Rochko a3d84e705a
Fix cache_associated no longer working (#7320)
7 years ago
abcang 71a7cea73f Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko cae933510c
Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko c5dcd7d836
Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
David Yip 5f8f481425
Also treat non-whole-word mutes as case-insensitive. #450.
7 years ago
Eugen Rochko a872392cd9
Add entity cache (#7271)
7 years ago
Emelia Smith 60b871d56c Implement the ability for instances to define a list of disallowed hashtags (#7176)
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
Yamagishi Kazutoshi 9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
Eugen Rochko 7db7d68136
Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
7 years ago
Eugen Rochko 4ca2f73b12
Rescue Mastodon::LengthValidationError in Remoteable (#7228)
7 years ago
Eugen Rochko bfe26ef67b
Force convert to JPG for preview card thumbnails to avoid animations (#7109)
7 years ago
David Yip 78c145d3cb
db: make schema.rb version subsume bookmarks migration.
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
Eugen Rochko bb58fc003b
Fix warning about using SQL in order for Account#partitioned (#7159)
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
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
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
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
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
MIYAGI Hikaru e6e93ecd8a Fix GIFV encoding params (#7098)
7 years ago
Akihiko Odaki 498327b2e3 Exclude status itself from context query (#7083)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
Eugen Rochko 2a90da1837
Fix UniqueUsernameValidator comparison (#6926)
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 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko da70aca28e
Restore username validation to disallow dots, for now (#6863)
7 years ago
ThibG 6f531d140b Fix MENTION_RE to not match nil usernames (#6862)
7 years ago
Jenkins 6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 93897134ca
Permit dots in usernames with conditions (#6844)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
Jenkins 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel Hunsaker 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)
7 years ago
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1aaec701bb
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 9aba44ea79 Rescue when there's no extension in the remotable (#6358)
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
7 years ago
Effy Elden dd9d00d293 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Eugen Rochko 78d772af86
Fix #3807: Increase avatars to 400x400 max (#6651)
7 years ago
Akihiko Odaki c110fa62ac Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
Eugen Rochko 5cc716688a
Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Ghislain Loaec 3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko 90f12f2e5a
Focal points (#6520)
7 years ago
Eugen Rochko d3a62d2637
Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago