778 Commits (f43c2f12f38aef0d4a909f6f12968cd7bccfef98)

Author SHA1 Message Date
David Yip 4a64181461 Allow keywords to match either substrings or whole words.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
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
beatrix a7be86e875 hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
aschmitz 554c2fd8af Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška 8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 34118169ac Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
unarist 6f490b4bfe Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
Yamagishi Kazutoshi d5b767c374 Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 8125fdc19f Use atomUri in Undo activity of Announce (#5376)
7 years ago
Eugen Rochko 3283868e28 Improve spec of Feed and UserTrackingConcern (#5367)
7 years ago
Lex Alexander b8bae96647 Retoot count increases without reason (#5363)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Akihiko Odaki cc796298c9 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Nolan Lawson 057db0ecd0 Update emoji-mart to v2.1.1 (#5256)
7 years ago
Nolan Lawson 72d939b69f Fix thinking_face emoji autocomplete (#5238)
7 years ago
Ondřej Hruška dcd8ff5308
fix haml quotes in a bid to make travis less grumpy
7 years ago
Nolan Lawson fd7f0732fe Compress and combine emoji data (#5229)
7 years ago
ThibG 2559d9166c Fix regression in FetchRemoteResourceService (#5217)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 63f0979799 Validate id of ActivityPub representations (#5114)
7 years ago
ThibG dfaa219f88 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Nolan Lawson 813c5f2f52 Add spec for emoji_index_light.js (#5199)
7 years ago
Nolan Lawson 334a446313 Fix emoji sequence bug in substring-trie (#5191)
7 years ago
Eugen Rochko 47ecd652d3 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki cdacac8c6c Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko eb605141ff Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko ebb8c89207 Upgrade to React 16 (#5119)
7 years ago
Eugen Rochko f4ca116ea8 After 7 days of repeated delivery failures, give up on inbox (#5131)
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
Eugen Rochko e528114c53 Follow-up to #4582 and #5027, removing dead code (#5101)
7 years ago
Eugen Rochko cf7fbf2c56 Fix #5059 - Stop processing payload if it's from local account (#5100)
7 years ago
Eugen Rochko 510df0ac55 Fix emojify() by generating a mapping to existing Twemoji files (#5080)
7 years ago
Akihiko Odaki 98936bfcdf Add missing validations in ActivityPub::Activity::Create (#5096)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko 846cd4e838 Switch from EmojiOne to Twemoji, different emoji picker (#5046)
7 years ago
Akihiko Odaki 0de82dd316 Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko 034fab39ab Make dropdowns render into portal, expand animation (#5018)
7 years ago
aschmitz 669fe9ee06 Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Akihiko Odaki bb4d005a83 Introduce OStatus::TagManager (#5008)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist dd6f9a1b82 Validate uri presence for remote status (#4985)
7 years ago
unarist 1eab53ee10 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979)
7 years ago
Akihiko Odaki 198a9a4fa4 Remove local_only scope in Status (#4977)
7 years ago
unarist ec36df97c4 Escape URL parts on formatting local status (#4975)
7 years ago
Eugen Rochko ad8e856a5b Fix error when following locked accounts (#4896)
7 years ago
Akihiko Odaki 48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966)
7 years ago
Eugen Rochko 472df24579 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
ふぁぼ原 3816943e6b Enable to recognize most kinds of characters as URL paths (#4941)
7 years ago
Surinna Curtis d880b3182b minor code style fixes oops
7 years ago
Surinna Curtis 83b3a0389c Add more specs for the /api/v1/mutes/details endpoint
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 500c465226 specs for MuteService notifications params
7 years ago
Surinna Curtis eaaf2170fe API support for muting notifications (and specs)
7 years ago
Surinna Curtis 5c2e1869f0 specs testing that hide_notifications in mutes actually hides notifications
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
ThibG 550ff677da Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)
7 years ago
Eugen Rochko 8f8e677630 Clean up and improve generated OpenGraph tags (#4901)
7 years ago
Eugen Rochko 0ef9d45d05 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko c450ddb613 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
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
Eugen Rochko 90712d4293 Fix errors preventing UnsubscribeService from working (#4866)
7 years ago
unarist a12572e074 Handle stream_entry URL correctly in ActivityPub (#4854)
7 years ago
Eugen Rochko 1caf11ddcc Fix language filter codes (#4841)
7 years ago
Eugen Rochko a4caa7eb62 Fetch statuses/following/followers numbers from ActivityPub collections (#4840)
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
Eugen Rochko 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 2293466edd Show pinned statuses only in the top of the profile page (#4803)
7 years ago
abcang 6ec1aa372d Validate data of Imports (#4782)
7 years ago
aschmitz e18ed4bbc7 Fix StatusLengthValidator tests
7 years ago
unarist 6a4e2db661 Raise an error for remote url in StatusFinder (#4776)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 9a5ae09620 Remove identity context from output of LinkedDataSignature (#4753)
7 years ago
unarist f7937d903c Don't process ActivityPub payload if signature is invalid (#4752)
7 years ago
Eugen Rochko 7b8f262840 Forward ActivityPub creates that reply to local statuses (#4709)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
Eugen Rochko 4c76402ba1 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
unarist 938cd2875b Fix Delete activity handling when the status has been reblogged (#4729)
7 years ago
unarist 7876aed134 Fix deletion of status which has been reblogged (#4728)
7 years ago
abcang ce9a5f358e rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
7 years ago
Eugen Rochko 00840f4f2e Add handling of Linked Data Signatures in payloads (#4687)
7 years ago
nullkal c2af138113 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Eugen Rochko cf615abbf9 Add configuration to disable private status federation over PuSH (#4582)
7 years ago
unarist b01a19fe39 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
Eugen Rochko c66fe2aeba Minor performance improvement for test suite (#4678)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Daigo 3 Dango 696c2c6f2f Add Mastodon::Source.url (#4643)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
unarist d63de55ef8 Fix bugs which OStatus accounts may detected as ActivityPub ready (#4662)
7 years ago
Eugen Rochko 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
Yamagishi Kazutoshi 10e9a9a3f9 Use URI.join even when S3 enabled (#4652)
7 years ago
Eugen Rochko 74e5078795 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Eugen Rochko 412ea87306 Improve ActivityPub/OStatus compatibility (#4632)
7 years ago
Yamagishi Kazutoshi 2edfdab6e6 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko 40c45f5dd9 Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623)
7 years ago
nightpool efec02f153 use existing inflections instead of custom helper (#4624)
7 years ago
nullkal 075d6a1e13 Show what protocol is used for accounts in admin/accounts#index (#4622)
7 years ago
unarist a855956185 Fix ActivityPub follow interaction and add more specs (#4601)
7 years ago
Yamagishi Kazutoshi 5f22c0189d Add support for searching AP users (#4599)
7 years ago
Eugen Rochko 6df8bd277b Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko 4e75f0d889 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko a2aeacbfee Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko fdea173237 Add Digest header to requests with body, handle acct and URI keyId (#4565)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Sorin Davidoi 8eb6d171e6 feat: Cache status height to avoid expensive renders (#4439)
7 years ago
Ondřej Hruška 5942347407 Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)
7 years ago
Ondřej Hruška 811d895f7b Merged upstream PR #4526
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
nullkal dfcd2834f9 Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
David Yip 9aaf3218d2 Add commit_hash to instance presenter double (#107)
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
Akihiko Odaki 0f92119ceb Cover Api::V1:FavouritesController more (#4409)
7 years ago
Sorin Davidoi 50d38d7605 fix(dropdown_menu): Open as modal on mobile (#4295)
7 years ago
Akihiko Odaki 4f0b638cda Introduce access token fabricators (#4401)
7 years ago
Yamagishi Kazutoshi bb96ba13cf Fallback to site_hostname when site_title is empty (#4394)
7 years ago
Akihiko Odaki bdf573d140 Remove redundant fabrication in the spec for Api::V1::FavouritesController (#4391)
7 years ago
Ondřej Hruška f49339ca9c Fix multipoint shortcode bug (#4387)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Eugen Rochko 029f2c4545 Redesign /terms page (#4338)
7 years ago
Eugen Rochko a549d1ae6b Bump to 1.5.0rc1 (#4318)
7 years ago
Sorin Davidoi 9075c90c46 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago