1311 Commits (fc05a7fb1fc070032369288aa586f0b2720f0d95)

Author SHA1 Message Date
Eugen Rochko bbf9f4f93b Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2e0d617b8b Add moderation warnings (#9519)
6 years ago
Thibaut Girka cabf2772ea Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 20418dc7a7 Add admin setting to disable followers count
6 years ago
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5573216d67 Fix regression in #9539 (#9541)
6 years ago
Eugen Rochko 32bd452b56 Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Eugen Rochko 26140838c4 Do no retry web push workers if the server returns a 4xx response (#9434)
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 0686523e18 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Adam Copp 55ebf8a6e8 Make custom emoji domains case insensitive #9351 (#9474)
6 years ago
Eugen Rochko 8d3910afdd Improve e-mail MX validator and add tests (#9489)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 097d866028 Add setting to not aggregate reblogs (#9248)
6 years ago
Eugen Rochko f551383e4a Cache hashtag sample accounts, and exclude ineligible ones (#9465)
6 years ago
Eugen Rochko ac437d6b25 Fix various things in the directory (#9449)
6 years ago
Takeshi Umeda f2ca159c3b Fix tag mb_chars comparison of profile directory (#9448)
6 years ago
Eugen Rochko fd8ca11f19 Add profile directory (#9427)
6 years ago
Thibaut Girka 4aca9b4e0f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 88faa4ff2d Attempt fixing deadlocks by moving account stats update outside transaction (#9437)
6 years ago
Eugen Rochko 626a544d08 Improve account suspension speed and completeness (#9290)
6 years ago
Thibaut Girka b2e9a23ac9 Add database support for list show-reply preferences
6 years ago
Thibaut Girka 35b6fb4e62 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9606e4dabf Change identities id column to a bigint (#9371)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 80ef517747 Allow hyphens in the middle of remote user names (#9345)
6 years ago
Hugo Gameiro 92238e2f7a add loglevel to ffmpeg in gif upload (#9368)
6 years ago
Eugen Rochko 305556274a Redesign admin accounts index (#9340)
6 years ago
valerauko 2178c50fed Ensure replied-to is a status not a boost (#9129)
6 years ago
Eugen Rochko 1d16575d71 Sort self-replies to the top of descendants (#9320)
6 years ago
Eugen Rochko e49abb3b4f Revert "Sort self-replies to the top of the thread (#9296)" (#9335)
6 years ago
Eugen Rochko 62c0e112ea Extract counters from accounts table to account_stats table (#9295)
6 years ago
Eugen Rochko 76a0c28687 Sort self-replies to the top of the thread (#9296)
6 years ago
Eugen Rochko 7a939f7cfc Remove intermediary arrays when creating hash maps from results (#9291)
6 years ago
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904)
6 years ago
ash lea 5fbafbb54d move some constants to rails environment
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c3005d09e6 Reset status cache when status_stat or media_attachment updates (#9119)
6 years ago
Eugen Rochko cf2ab9c394 Include preview cards in status entity in REST API (#9120)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko db85c8f0f6 Migrate all old direct messages to new conversations schema (#9085)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 40d23fc4d1 Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko e3b2234382 Add unread indicator to conversations (#9009)
6 years ago
Eugen Rochko 92b93a12cb Do not show "limited" visibility in default visibility preference (#8999)
6 years ago
Eugen Rochko 654520ec8c Improve support for aspects/circles (#8950)
6 years ago
Thibaut Girka dbc1b36b61 Allow selecting both default flavour and theme
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 00d31a292c rubocop issues - Cleaning up (#8912)
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 48c2ab8cf5 Limit the number of people that can be followed from one account (#8807)
6 years ago
Eugen Rochko 1ae62b87ed Change admin accounts default sort to most recent (#8813)
6 years ago
Eugen Rochko 24f168e58e Fix link verification for remote accounts (#8868)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 92e5d6b6e5 Fix timeline pagination (#8827)
6 years ago
Eugen Rochko 5ddcdf3753 Support min_id-based pagination in REST API (#8736)
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a7955d39ce Fix performance regression in Account::Field#verifiable? (#8719)
6 years ago
Eugen Rochko d3105031f8 Redesign forms, verify link ownership with rel="me" (#8703)
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira 900d3e214b Fix nil host in remotable (#8508)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quint Guvernator 476ba6e4f0 Fix low-hanging rubocop gripes (#8458)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Eugen Rochko 413a28499d Allow mods to disable login, improve message when login disabled (#8329)
6 years ago
Jakub Mendyk 289b4f2838 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
masarakki 86a912d6f0 exclude-other-silenced-accounts (#7528)
6 years ago
Eugen Rochko 801b0f583f Add confirmation step to account suspensions (#8353)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
Eugen Rochko fe88a4f42c Get rid of all batch order warnings (#8334)
6 years ago
Eugen Rochko 5f37c40de1 Remove annoying Notification#cache_ids scope warning (#8333)
6 years ago
ThibG 09fb9fb07e Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
abcang af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 315ce688be Reduce user active duration from 7 days to 2 days (#8282)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6eca34ffb8 Fix error when trying to update counters for statuses that are gone (#8251)
6 years ago
Eugen Rochko 273e8f0474 Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 20ced948f2 Implement Undo { Accept { Follow } } (fixes #8234) (#8245)
6 years ago
Eugen Rochko d9f9083f26 Update reply counters only if the reply is public/unlisted (#8211)
6 years ago
Eugen Rochko 55094f6941 Show exact number of followers/statuses on export page/in tooltip (#8199)
6 years ago
Eugen Rochko bf5acc3eae Move status counters to separate table, count replies (#8104)
6 years ago
Eugen Rochko 9a1cf4a558 Expect relays to answer with accept/reject (#8179)
6 years ago
Eugen Rochko 3fe1f95dd0 Expect relays to answer with accept/reject (#8179)
6 years ago
Thibaut Girka 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d0b6cbfb92 When follow is removed, remove endorsement (#8149)
6 years ago
Eugen Rochko 6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 1159490f00 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Eugen Rochko ebf836cc69 Enforce username format for remote users, too (#8102)
6 years ago
Eugen Rochko f7910c4164 Convert MOV and WEBM to MP4, raise maximum limit to 40MB (#8101)
6 years ago
Thibaut Girka f866d00fa2 Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 13df3889f0 Redesign public profiles and toots (#8068)
6 years ago
Eugen Rochko 91aadec929 Resize images by area instead of fixed dimensions (#8083)
6 years ago
Thibaut Girka 62b47edf17 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 56fdbc04b3 Fix number of results returned from TrendingTags.get
6 years ago
Eugen Rochko 2f6967913a Display trending hashtags on admin dashboard (#8038)
6 years ago
Thibaut Girka 4ec907e413 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 171c20ce72 Add federation relay support (#7998)
6 years ago
Thibaut Girka 262f7d147d Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka cf8121376b Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 4c70bb6d6d Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko a7039e4fd3 Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko 5bec5c3e6e Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Renato "Lond" Cerqueira c0fbe9e3a4 Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)
6 years ago
Eugen Rochko aa4e75166b Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko d878e3e945 Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka 44e49d2b52 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG ef3ac6e4a7 Fix jpeg files sometimes being returned with a .jpe extension (#7881)
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 38fb602407 Create special case to prefer "jpeg" over "jpe" file extension (#7841)
7 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
7 years ago
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
Eugen Rochko f4e8e39c99 Restore username validation to disallow dots, for now (#6863)
7 years ago
ThibG 7d7a725e82 Fix MENTION_RE to not match nil usernames (#6862)
7 years ago
Jenkins a9bcd383b8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 53b1100144 Permit dots in usernames with conditions (#6844)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Jenkins 3d16993fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel Hunsaker 8f374100ed Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)
7 years ago
David Yip 9ca0336c15 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 51b32f06fa Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 34b3d46480 Rescue when there's no extension in the remotable (#6358)
7 years ago
Eugen Rochko 0c2a08adeb Remove text requirement when media attached from statuses (#6672)
7 years ago
Effy Elden 4a8046df66 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 ba865c44d8 Fix #3807: Increase avatars to 400x400 max (#6651)
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
Eugen Rochko f35356609b Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko c9ed272a4a Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f759ec9d8d Don't resize avatars/headers if their dimensions are already right (#6508)
7 years ago
Eugen Rochko 750f3e64c9 Cache relationships in API (#6482)
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
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
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
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 e365675e0a Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang c1263f5db5 Clear account cache of notification target_status (#6442)
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
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
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
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
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki a90fa13235 Change account_id non-nullable in lists (#5979)
7 years ago
Eugen Rochko 3b69e9b99c Exclude moved accounts from search results (#5984)
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 6f3321fe4f set local_only in a before_create callback instead of status service
7 years ago
Erin 7fc6f40a88 remove vestigial Status#local_only? definition
7 years ago
Erin 278d34a0ec Status#not_local_only scope should match nils too
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Andrea Scarpino e8198cd298 Fix account and tag searches with leading/trailing spaces (#5965)
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Eugen Rochko 46cce9ee4b Ensure link thumbnails are not stretched to super low quality (#5932)
7 years ago
Jenkins 099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi a7f20ed185 Remove duplicate annotate (#5910)
7 years ago
Akihiko Odaki ce3989fc6a Add embed_url to preview cards (#5775)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
Eugen Rochko ff4c28a305 Lists redis clean-up (#5886)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 2421fd745a Fix too many forwards (#5854)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
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
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 3db3ca1258 Fix unnecessary order (#5807)
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 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 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 08751360a0 Update annotations on Follow, FollowRequest, and 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
Eugen Rochko 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
ysksn bf1d4a2cb9 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 21e138379d Prefix cache keys with the matcher type. #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
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
David Yip 13ec4a9a20 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
aschmitz 76008c3e8c Updates per code review
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 26f52a2551 Add and Remove tests for FollowRequest (#5622)
7 years ago
ThibG 4912f539c3 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
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 b8c462c42b Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip 05fecda52d Switch to Regexp.union for building the mute expression.
7 years ago
David Yip 763fd4b275 Only cache the regex text, not the regex itself.
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip e8314ee2a6 KeywordMute matcher: more closely mimic Regexp#=~ behavior.
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 b2ad79547c Apply keyword mutes to reblogs.
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 be472f276d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip aa57929688 Use more idiomatic string concatentation. #164.
7 years ago
David Yip f3a57932c0 Make use of the regex attr_reader. #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 e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 490f3146f2 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander 526b66e871 Retoot count increases without reason (#5363)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
nullkal 4a45cc7566 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog e50cd23407 update indentation
7 years ago
DJ Sundog c7cae1bf0f add faststart to audio transcoding
7 years ago
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Eugen Rochko f37350c08f When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 04fde500e6 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Eugen Rochko cb8ecac1ce After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko 5f137e7ec3 Increase attachment descriptions to 420 characters (#5139)
7 years ago
Eugen Rochko c35e6234ab If HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 282a126b3f Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
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
Eugen Rochko e8871341bf Fix empty query sent to postgres for custom emojis (#5121)
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
unarist df27f599d2 Increase max height of preview card image (#5092)
7 years ago
Eugen Rochko da257754b5 Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko d2aeb45461 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
unarist ca502e7b15 Use file extensions in addition to MIME types for file picker (#5029)
7 years ago
Akihiko Odaki b1ba673029 Introduce OStatus::TagManager (#5008)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
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
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Eugen Rochko 74626108b6 Fix #4908 - Do not keep remote file names, generate random (#4934)
7 years ago
Surinna Curtis 5c5416aa7a fix typos in the migration
7 years ago
Surinna Curtis 3688a48100 Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis d6b0f5fb2c add an explanatory comment to AccountInteractions
7 years ago
Surinna Curtis b2ba83bbda Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
7 years ago
Surinna Curtis d629e90628 Expose whether a mute hides notifications in the api/v1/relationships endpoint
7 years ago
Surinna Curtis 0d5ce9d8e6 Add muting_notifications? and a notifications argument to mute!
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
nullkal 7f432a97a0 Add instance search feature (#4925)
7 years ago
Eugen Rochko 703fd425ff Fix count numbers from ActivityPub not being saved (#4899)
7 years ago
Surinna Curtis 2f872fc0aa Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
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