869 Commits (a1894cbc13e07773fe85b0408a80b90234e4d772)

Author SHA1 Message Date
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
David Yip dd29a41b61 Also run the keyword matcher on a status' tags. #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
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
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 3fe59e7d97 Actually filter blocked reblogs from feed
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
Nanamachi e1ee50976c Rewrite account_controller_spec (#5633)
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 22f9b4f2c0 Also filter notifications containing muted keywords.
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 8d69329b8e keyword mutes: also check spoiler (CW) text and reblogged statuses.
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 ebfec40698 Set up /settings/keyword_mutes. #164.
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
beatrix eed9808f5f hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
aschmitz 4dbdda6b89 Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 7571d79c8d Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
unarist 1fa6d20981 Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 69b74d26cd Use atomUri in Undo activity of Announce (#5376)
7 years ago
Eugen Rochko 3378a3af96 Improve spec of Feed and UserTrackingConcern (#5367)
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
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Nolan Lawson 14db4829dc Update emoji-mart to v2.1.1 (#5256)
7 years ago
Nolan Lawson 651aba0e12 Fix thinking_face emoji autocomplete (#5238)
7 years ago
Ondřej Hruška 851d5c03e2 fix haml quotes in a bid to make travis less grumpy
7 years ago
Nolan Lawson 2b34471d9d Compress and combine emoji data (#5229)
7 years ago
ThibG a89d69a269 Fix regression in FetchRemoteResourceService (#5217)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 2e6db37776 Validate id of ActivityPub representations (#5114)
7 years ago
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Nolan Lawson bfea083fbf Add spec for emoji_index_light.js (#5199)
7 years ago
Nolan Lawson 05842e15db Fix emoji sequence bug in substring-trie (#5191)
7 years ago
Eugen Rochko 0783f18274 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki 51f48c8960 Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 2fac5e21c2 Upgrade to React 16 (#5119)
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 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
Eugen Rochko 10a2b3dd4c Follow-up to #4582 and #5027, removing dead code (#5101)
7 years ago
Eugen Rochko 1efe904a28 Fix #5059 - Stop processing payload if it's from local account (#5100)
7 years ago
Eugen Rochko 8b7c639bbe Fix emojify() by generating a mapping to existing Twemoji files (#5080)
7 years ago
Akihiko Odaki 77424c156d Add missing validations in ActivityPub::Activity::Create (#5096)
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 16a5d1450c Switch from EmojiOne to Twemoji, different emoji picker (#5046)
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko f7810f56a1 Make dropdowns render into portal, expand animation (#5018)
7 years ago
aschmitz 618df7a5ee Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Akihiko Odaki b1ba673029 Introduce OStatus::TagManager (#5008)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
unarist 3978894d05 Validate uri presence for remote status (#4985)
7 years ago
unarist 4a4e555fd4 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979)
7 years ago
Akihiko Odaki 8c96e0d496 Remove local_only scope in Status (#4977)
7 years ago
unarist 134feb2ca8 Escape URL parts on formatting local status (#4975)
7 years ago
Eugen Rochko f10a687118 Fix error when following locked accounts (#4896)
7 years ago
Akihiko Odaki d4a1ddd46a Fix filterable_languages method of SettingsHelper (#4966)
7 years ago
Eugen Rochko 2d1048d041 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
ふぁぼ原 c71727ca55 Enable to recognize most kinds of characters as URL paths (#4941)
7 years ago
Surinna Curtis e6a8692d0e minor code style fixes oops
7 years ago
Surinna Curtis 86d02930c7 Add more specs for the /api/v1/mutes/details endpoint
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 5fa430ba7c specs for MuteService notifications params
7 years ago
Surinna Curtis 1e69cc4228 API support for muting notifications (and specs)
7 years ago
Surinna Curtis 6221116794 specs testing that hide_notifications in mutes actually hides notifications
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
ThibG 53a5e16c5f Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)
7 years ago
Eugen Rochko d4fd2a39e6 Clean up and improve generated OpenGraph tags (#4901)
7 years ago
Eugen Rochko e054961051 Fix error when following locked accounts (#4896)
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 078c84fbb5 Fix POST /api/v1/follows error when already following (#4878)
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
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 86cf6905cc Fix errors preventing UnsubscribeService from working (#4866)
7 years ago
unarist 05ef0ead4a Handle stream_entry URL correctly in ActivityPub (#4854)
7 years ago
Eugen Rochko a27821f725 Fix language filter codes (#4841)
7 years ago
Eugen Rochko 6fb8be482b Fetch statuses/following/followers numbers from ActivityPub collections (#4840)
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
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 36872cd22c Show pinned statuses only in the top of the profile page (#4803)
7 years ago
abcang d73174b629 Validate data of Imports (#4782)
7 years ago
aschmitz 8fb6b02b54 Fix StatusLengthValidator tests
7 years ago
unarist 34603e0154 Raise an error for remote url in StatusFinder (#4776)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 02bd661d76 Remove identity context from output of LinkedDataSignature (#4753)
7 years ago
unarist 5a6b15f014 Don't process ActivityPub payload if signature is invalid (#4752)
7 years ago
Eugen Rochko ca76d11434 Forward ActivityPub creates that reply to local statuses (#4709)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
Eugen Rochko 3135d20283 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
unarist 9edbeec86c Fix Delete activity handling when the status has been reblogged (#4729)
7 years ago
unarist e17945907a Fix deletion of status which has been reblogged (#4728)
7 years ago
abcang 4fb007764b rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
7 years ago
Eugen Rochko 5147147da9 Add handling of Linked Data Signatures in payloads (#4687)
7 years ago
nullkal f9ebff4b13 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko cab7fa158a Add configuration to disable private status federation over PuSH (#4582)
7 years ago
unarist bab7127ac9 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
Eugen Rochko d44b84bebd Minor performance improvement for test suite (#4678)
7 years ago
nullkal da85aff49c Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Daigo 3 Dango fd9d66dfd4 Add Mastodon::Source.url (#4643)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
unarist 1cb7c1a273 Fix bugs which OStatus accounts may detected as ActivityPub ready (#4662)
7 years ago
Eugen Rochko d76bd63226 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
Yamagishi Kazutoshi 7503ada9b5 Use URI.join even when S3 enabled (#4652)
7 years ago
Eugen Rochko 39b76d47a5 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Eugen Rochko aee1db8fa1 Improve ActivityPub/OStatus compatibility (#4632)
7 years ago
Yamagishi Kazutoshi c0642a0042 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko ce7e12bd72 Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623)
7 years ago
nightpool 6cce0bb080 use existing inflections instead of custom helper (#4624)
7 years ago
nullkal a90b5796a1 Show what protocol is used for accounts in admin/accounts#index (#4622)
7 years ago
unarist 83b48812e4 Fix ActivityPub follow interaction and add more specs (#4601)
7 years ago
Yamagishi Kazutoshi ac7fb7c820 Add support for searching AP users (#4599)
7 years ago
Eugen Rochko 1c7cbbcb8c Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko 3473aac8d8 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko 34962d9f9d Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Eugen Rochko 1b6ced5887 Add Digest header to requests with body, handle acct and URI keyId (#4565)
7 years ago
Eugen Rochko f18739fd60 Add ActivityPub inbox (#4216)
7 years ago
Ondřej Hruška 913dd13575 Merge remote-tracking branch 'upstream/master'
7 years ago
Sorin Davidoi ed7abec8f5 feat: Cache status height to avoid expensive renders (#4439)
7 years ago
Ondřej Hruška 199affb141 Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)
7 years ago
Ondřej Hruška e11cd9b141 Merged upstream PR #4526
7 years ago
Eugen Rochko fd69694749 Add "signed in as" header to some pages (#4523)
7 years ago
nullkal 62b92a4c0a Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
David Yip 041e5f4b83 Add commit_hash to instance presenter double (#107)
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
Akihiko Odaki ebb58bc36e Cover Api::V1:FavouritesController more (#4409)
7 years ago
Sorin Davidoi 9cb72c6600 fix(dropdown_menu): Open as modal on mobile (#4295)
7 years ago
Akihiko Odaki 7843855f7f Introduce access token fabricators (#4401)
7 years ago
Yamagishi Kazutoshi ba1f0b8426 Fallback to site_hostname when site_title is empty (#4394)
7 years ago
Akihiko Odaki e39c922727 Remove redundant fabrication in the spec for Api::V1::FavouritesController (#4391)
7 years ago
Ondřej Hruška 5eb1a1aaca Fix multipoint shortcode bug (#4387)
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Eugen Rochko fae1d9052b Redesign /terms page (#4338)
7 years ago
Eugen Rochko 6bfadd0390 Bump to 1.5.0rc1 (#4318)
7 years ago
Sorin Davidoi 78ff8d3421 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
beatrix-bitrot 8deb2072ef Merge that good fresh upstream shit
7 years ago
Eugen Rochko 6dce974c85 Fix intermittent test failures due to accidentally reused class instance between threads (#4287)
7 years ago
Eugen Rochko 65a1c48653 Use the same emoji data on the frontend and backend (#4284)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 75ab767791 Fix webfinger retries (#4275)
7 years ago
Eugen Rochko df59dc6639 Refactor ResolveRemoteAccountService (#4258)
7 years ago
Eugen Rochko 3852032953 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Sorin Davidoi fa9c117921 feat(emoji): Add back title attribute (#4253)
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