1198 Commits (4444d8f9b3fac33caf3d4732e5f6112c5321d6ea)

Author SHA1 Message Date
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Mike Burns ea75ae2d1f Use be_within instead of eq for a to_f test match (#6275)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 3ce1385b25
Add examples based on errors seen in #317
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e4a241abef
Fix bad URL schemes being accepted (#6219)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 8d51ce4290 Fix enforce HTTPS in production. (#6180)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 5ec25ff3e1 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG a8b51124ba Don't normalize URLs in toots (#6134)
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 545095b3ce [!] Sanitize incoming classlist properly (#6162)
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki e0ef7f9d79 Fix XML oEmbed support discovery (#6104)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip 6abb0950c6
Examples for Status.as_public_timeline.
7 years ago
David Yip e35a350119
Examples for Status#set_locality and .as_tag_timeline.
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Akihiko Odaki e56323a4dd Remove preview_card fabricator (#5975)
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz 4de211b80a Break out nested relationship API keys (#5887)
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 4c6b5dbe96
Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 85e97ecab6
Fix too many forwards (#5854)
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
ThibG b8efb5daed Fix handling of temporary failures in ProcessMentionsService (#5842)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 1104ac35d3 Add tests for Streamable (#5771)
7 years ago
ysksn 8c0e77d688 Add tests for AccountRelationshipsPresenter (#5805)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
Jenkins 8f3e5f6128 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn 6f609dc4b4 Add tests for Remotable (#5768)
7 years ago
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 53e95c4efc Fix N+1 at notification (#5752)
7 years ago
David Yip e45cb0837b Update .following_map examples with show-reblogs information.
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
ysksn 2590aac863 Add tests for AccountInteractions (#5751)
7 years ago
ysksn 8f638a2bf2 Add a test for Settings::Extend#settings (#5720)
7 years ago
ysksn 9d9b1aff1e Add tests for Status#title (#5718)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
David Yip f6355f6ffb Update StatusPolicy to check current_account for local_only? toots.
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
ysksn 556c07df1f Add tests for Status#verb (#5717)
7 years ago
David Yip c2a92dffc9 Add some examples for Glitch::KeywordMute::TagMatcher. #208.
7 years ago
ysksn 3023725936 Add tests for Status#hidden? (#5719)
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
David Yip 431503bae2 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix 04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
ysksn 7d7df877ef Add a test for Tag#to_param (#5705)
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
ysksn 6d7e05ec1f Add tests for StreamEntry (#5687)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
ysksn 48e27c47a7 Add a test for SiteUpload#cache_key (#5685)
7 years ago
Yamagishi Kazutoshi 1f1838420f Refactor remote_follow_spec.rb (#5690)
7 years ago
Yamagishi Kazutoshi 20150659e6 Add uniqueness to block email domains (#5692)
7 years ago
ysksn 4112a0631f Add tests for Setting (#5683)
7 years ago
David Yip 656d54e945 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
ysksn 60f247c2e7 Add tests for SessionActivation (#5668)
7 years ago
ysksn 2fb722397d Add tests for RemoteProfile (#5665)
7 years ago
aschmitz 9a42f7cbed Actually filter blocked reblogs from feed
7 years ago
aschmitz b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
ysksn 56720ba590 Add tests for RemoteFollow (#5651)
7 years ago
ysksn 07cca6e364 Add tests for Notification (#5640)
7 years ago
ysksn 54b42901df Add and Remove tests for FollowRequest (#5622)
7 years ago
Nanamachi d200e041fe Rewrite account_controller_spec (#5633)
7 years ago
ysksn 64cc129225 Add tests for MediaAttachment (#5620)
7 years ago
ysksn 97fc2da2e0 Add tests for CustomEmoji#local? and #object_type (#5621)
7 years ago
ysksn d307ee79e9 Implement tests for Account#refresh! (#5601)
7 years ago
ysksn cf01326cc1 Add test for Account#save_with_optional_media! (#5603)
7 years ago
ysksn 15c0f6ae56 Implement tests for Account#possibly_stale? (#5591)
7 years ago
David Yip dd28b94cf0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 4f337c020a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip d03b48cea0 Also filter notifications containing muted keywords.
7 years ago
David Yip 641f90e73a Fix example description.
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 4b68e82a19 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip 19826774f0 keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
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
Eugen Rochko dbaa6a0e13 Fix intermittent test failures due to accidentally reused class instance between threads (#4287)
7 years ago
Eugen Rochko a390abdefb Use the same emoji data on the frontend and backend (#4284)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275)
7 years ago
Eugen Rochko 8400bee3b1 Refactor ResolveRemoteAccountService (#4258)
7 years ago
Eugen Rochko a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Sorin Davidoi 72108b20e2 feat(emoji): Add back title attribute (#4253)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
Akihiko Odaki 89b988cab5 Introduce Ostatus name space (#4164)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko de397f3bc1 Fix subsequent replies to unresolved status not being filtered from home (#4190)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Sorin Davidoi c1f201c49a 🎄🔨 Force tree shake emojione (#4202)
7 years ago
unarist 8d224ad23b Follow renaming of microformats2 gem (#4203)
7 years ago
Eugen Rochko e2685ccc81 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
masarakki a49be27145 add validation to tag name (#4194)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
unarist c2753fdfb4 Make tag search case insensitive again (#4184)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 056b5ed72f Improve UI of admin site settings (#4163)
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Sorin Davidoi cc68d1945b refactor: Rewrite immutablejs import statements using destructuring (#4147)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7bacdd718a Fix PrecomputeFeedService for filtered statuses (#4148)
7 years ago
STJrInuyasha 7a889a8e12 Remote following success page (#4129)
7 years ago
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
nullkal 007ab330e6 Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)
7 years ago
Eugen Rochko 864e3f8d9c Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Eugen Rochko 00df69bc89 Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
abcang 5e6acf9601 Fix Nokogiri::HTML at FetchLinkCardService (#4072)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f85dbe83c8 Remove sort in Feed (#4050)
7 years ago
Nolan Lawson e282580101 Faster emojify() by avoiding str.replace() entirely (#4049)
7 years ago
beatrix-bitrot 7dd4d9de96 try fix failing controller spec caused by long bios
7 years ago
Nolan Lawson a978b88997 Faster emojify() algorithm, avoid regex replace (#4019)
7 years ago
Matt Jankowski 6dd5eac7fc Add controller spec for manifests controller (#4003)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7362469d89 Do not raise an error if PrecomputeFeed could not find any status (#4015)
7 years ago
Yamagishi Kazutoshi ead14f5bf0 Upgrade jsdom to version 11.0.0 (#3994)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 0a53ca444a Cover Admin::AccountsController more (#3327)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 60b2b56d38 Reduce number of commands in FeedManager#trim (#3989)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7d8e3721ae Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
7 years ago
beatrix-bitrot ddafde942c Merge remote-tracking branch 'upstream/master'
7 years ago
Eugen Rochko 42b8220632 Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
beatrix-bitrot 49ba78d6f8 fix account spec broken by change to 500char bios
7 years ago
Eugen Rochko 5e8d037e27 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 67243bda31 Cover Auth::RegistrationsController more (#3353)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 8f991831b8 Cover Admin::DomainBlocksController more (#3329)
7 years ago
Eugen Rochko f7301bd5b9 Add overview of active sessions (#3929)
7 years ago
Sorin Davidoi 2211e8d1cd Revocable sessions (#3616)
8 years ago
Eugen Rochko 3f59238207 Add important test for full-width hashtags (#3911)
8 years ago
Yamagishi Kazutoshi eff9416469 Remove unused variables (#3906)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e27f792c24 Some minor change and spec for Account (#3813)
8 years ago
Eugen Rochko 0190aac240 Fix regression from #3842 (#3892)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 356df7ae6b Update fabricator for MediaAttachment to attach a file according to type (#3862)
8 years ago
unarist b16b69350e Fix RTL detection on Ruby side (#3867)
8 years ago
masarakki ff142eb64d setting-for-account-deletable (#3852)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 3d13f6ea0c Cover Block more (#3837)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 6eefccdacc Cover DomainBlock more (#3838)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) d55f207274 Cover Export more (#3840)
8 years ago
Eugen Rochko f3be605286 Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 05e4728de7 Cover Favourite more (#3841)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) b51945f096 Spec AccountDomainBlock (#3816)
8 years ago
nightpool 94d0e012de Whitelist allowed classes for federated statuses (#3810)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 74d10b9b9d Spec UserMailer (#3757)
8 years ago
Eugen Rochko 8518d005fd Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)
8 years ago
Eugen Rochko 91c71471ab Fix account delete form not accepting password, update suspended (#3745)
8 years ago
Eugen Rochko e17c2e5da5 Batched remove status service (#3735)
8 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
8 years ago
Eugen Rochko dc8a6244fc Fix #2619 - When redis feed is empty, fall back to database (#3721)
8 years ago
unarist abbdacedc5 Fix locale related specs (#3707)
8 years ago
Eugen Rochko ce812466c7 Fix removal of status sending the original status to mentioned users instead of delete Salmon (#3672)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f596a413ef Localize date in digest and cover NotificationMailer more (#3694)
8 years ago
René Klačan dcf0530218 Make sure email is case insensitive on all places (#3688)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 4919b89ab8 Improve default language decision and spec (#3351)
8 years ago
Matt Jankowski 2925372ff4 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
Matt Jankowski 5282ba862a Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
Matt Jankowski 022008a2a6 Language detection defaults to nil (#3666)
8 years ago
Eugen Rochko c207b4bb33 Fix db:seed - only run some validations when the field was changed (#3592)
8 years ago
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636)
8 years ago
Matt Jankowski 73540ffe6b Clean up for api/base controller (#3629)
8 years ago
unarist 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626)
8 years ago
Matt Jankowski f0634ba876 Coverage improvement and concern extraction for rate limit headers in API controller (#3625)
8 years ago
unarist e34c5a3503 Fix 500 errors on searching invalid URLs (#3613)
8 years ago
unarist 004672aa6c Fix tag search order and not to use tsvector (#3611)
8 years ago
Yamagishi Kazutoshi 7a7bfa5170 Add quotes ESLint rules (#3602)
8 years ago
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern (#3490)
8 years ago
Daigo 3 Dango 2985d08951 Redirect to streaming_api_base_url (#3579)
8 years ago
Yamagishi Kazutoshi 6a4b224397 Fix randomly fail (regression from #3560) (#3580)
8 years ago
Yamagishi Kazutoshi 6adbd114c1 Skip image length check (regression from #3528) (#3581)
8 years ago
René Klačan 037f96c5ae Don't follow account if it's already followed (#3575)
8 years ago
Eugen Rochko f7a30e2fae Added support for configurable reserved usernames (fix of #1382) (#3566)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) defe4f9bc3 Cover WebfingerResource more (#3560)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 42844df966 Spec ScopedSettings (#3559)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e07b57852e Remove some code in TagManager and spec (#3547)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 02a0fd5b64 Spec InlineRablScope (#3542)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 6505a42be0 Spec HashObject (#3544)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e674608d10 A minor change for ProviderDiscovery and spec (#3543)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) c7af8cbc90 Remove some arguments of Formatter.instance.format and spec (#3541)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 9475fbae78 Spec Extractor (#3540)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 00e61d6807 Spec action verification of StreamEntryFinder (#3549)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) ce7c0def88 Remove redundant code in AtomSerializer and spec (#3528)
8 years ago
Yamagishi Kazutoshi e878ddb7c0 Fix spec for #2388 (#3526)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 10768aa204 Spec response for forgery (#3248)
8 years ago
Yamagishi Kazutoshi 39ea5c0e2e Improve tests for JavaScript (#3496)
8 years ago
Yamagishi Kazutoshi 509b0cfafc Add scenarios for log in (#3497)
8 years ago
Matt Jankowski d010e270e6 Remove usernames and hashtags from language detection (#3503)
8 years ago
Matt Jankowski d1e08bd38c Handle nil and blank cases in Account finders (#3500)
8 years ago
Matt Jankowski 5c63523972 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski de4681b2be Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
8 years ago
Matt Jankowski 5236a62861 Improve spec coverage and clean up api/v1/blocks controller (#3464)
8 years ago
Matt Jankowski 0f155829b7 Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
8 years ago
Matt Jankowski 84dda45df9 Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
8 years ago
Matt Jankowski 75cad1d9d6 Improve spec coverage and clean up api/v1/favourites controller (#3472)
8 years ago
Matt Jankowski 2cc3111a77 Expand spec coverage and refactor the `Account.find_` methods (#3485)
8 years ago
Matt Jankowski bf811e4d4a Improve spec coverage and clean up api/v1/mutes controller (#3481)
8 years ago
Matt Jankowski d6774d2ca3 Refactor and spec coverage for api/v1/timelines actions (#3482)
8 years ago
Yamagishi Kazutoshi 1a4860a57a Hold value of I18n.locale with ApplicationHelperSpec (#3474)
8 years ago
Yamagishi Kazutoshi 41fa53253c Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)
8 years ago
Matt Jankowski 8235623362 Improve spec coverage and clean up api/v1/media controller (#3467)
8 years ago
Matt Jankowski 83435c49ea Clean up api/subscriptions controller (#3448)
8 years ago
Jack Jennings 33f669a5f8 Add status destroy authorization to policy (#3453)
8 years ago
Matt Jankowski 3576fa0d59 Improve api oembed controller (#3450)
8 years ago
Matt Jankowski 1dcfb90202 Clean up api/salmon controller (#3449)
8 years ago
Jack Jennings 22cf18e16f Fix incorrect visibility setter in StatusPolicySpec (#3456)
8 years ago
Matt Jankowski 0ebe7d6d23 Remove exports/base controller in favor of shared concern (#3444)
8 years ago
Akihiko Odaki 7db98aa70e Refactor User and spec (#3431)
8 years ago
Jack Jennings e031fd60ad Move status reblog authorization into policy (#3425)
8 years ago
Akihiko Odaki 76fa9d2488 Use around hook to restore context in InstancePresenter spec (#3430)
8 years ago
Akihiko Odaki dfc43a6d3d Use around hook to restore context in InstanceHelper spec (#3429)
8 years ago
Akihiko Odaki 67bc58dd60 Use around hook to restore context in Admin::SettingsController spec (#3428)
8 years ago
Akihiko Odaki 2d39560dc1 Use around hook to restore context in ApplicationHelper spec (#3432)
8 years ago
Yamagishi Kazutoshi e0ada97770 Update dependencies of Node.js (#3067)
8 years ago
Jack Jennings 3a2003ba86 Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 922fb74197 Remove methods from ObfuscateFilename and spec (#3347)
8 years ago
Akihiko Odaki 7bf2d6cb06 Spec Auth::ConfirmationsController (#3348)
8 years ago
Akihiko Odaki 11e5c965c3 Spec AccountControllerConcern (#3349)
8 years ago
Akihiko Odaki 34157d118c Cover Admin::ReportsController more (#3346)
8 years ago
Akihiko Odaki 7b92950f1c Cover InstancesController more (#3342)
8 years ago
Akihiko Odaki 97d7028c31 Cover Admin::SuspensionsController more (#3350)
8 years ago
Akihiko Odaki a7f2961621 Spec Auth::PasswordsController (#3352)
8 years ago
Akihiko Odaki 00dda99789 Spec Admin::ResetsController calls send_reset_password_instructions (#3354)
8 years ago
Akihiko Odaki 2e27ce3b61 Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)
8 years ago
Akihiko Odaki 2c10c5a069 Coever Admin::SilencesController more (#3356)
8 years ago
Akihiko Odaki bd4dd4c4a0 Cover Settings::ExportsController more (#3358)
8 years ago
Akihiko Odaki 7d33b60f3f Cover Oauth::AuthorizedApplicationsController (#3359)
8 years ago
Akihiko Odaki aecce5694b Cover Oauth::AuthorizationsController more (#3361)
8 years ago
Akihiko Odaki 0e4ca51951 Cover Settings::TwoFactorAuthenticationsController more (#3376)
8 years ago
Akihiko Odaki dde043f6cd Cover WellKnown::HostMetaController more (#3382)
8 years ago
Akihiko Odaki c778a60e4f Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)
8 years ago
Akihiko Odaki c347327d54 Spec Settings::Exports (#3384)
8 years ago
Akihiko Odaki fd328cf6e8 Cover WellKnown::WebfingerController more (#3385)
8 years ago
Akihiko Odaki 7b473d7514 Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)
8 years ago
Akihiko Odaki dff576b75d Cover ApplicationHelper more (#3412)
8 years ago
Akihiko Odaki 52ae83d008 Spec Activitystreams2BuilderHelper (#3413)
8 years ago
Akihiko Odaki 5aacd9d4c7 Spec FlashesHelper (#3414)
8 years ago
Akihiko Odaki d24d3fa283 Spec HomeHelper (#3415)
8 years ago
Akihiko Odaki c8a226f61c Spec HttpHelper (#3416)
8 years ago
Akihiko Odaki 7a281c477a Cover Admin::PubSubHubHubController more (#3343)
8 years ago
Atsushi Yamamoto 402c19a924 Add preference setting for delete toot modal (#3368)
8 years ago
happycoloredbanana 9642601126 Avoid comparing domains when looking for an exact match of a local account (#3336)
8 years ago
Akinori MUSHA f6a93fc150 Go to root after login in single user mode (#3289)
8 years ago
Akihiko Odaki 019f3377bb Spec Admin::BaseController (#3328)
8 years ago
Akihiko Odaki a8736aab7a Cover TagsController more (#3306)
8 years ago
abcang bbc3db8b20 Add test when hashtag and URL are concatenated (#3279)
8 years ago
Yamagishi Kazutoshi f937cad68f Skip formatting for cashtag in status text (#3275)
8 years ago
Akihiko Odaki 5d9f479538 Cover HomeController more (#3258)
8 years ago
Eugen Rochko 2ca1f0737a Fix Devise destroy method being available to delete user record (#3266)
8 years ago
alpaca-tc 7ee5fc5d68 Toggle sensitive from admin page (#3261)
8 years ago
Matt Jankowski 4289ed1d13 Refactor of API timeline actions (#3263)
8 years ago
Akihiko Odaki 152b4d54e8 Cover StatusesController more (#3259)
8 years ago
Akihiko Odaki ea2ef16ea4 Cover StreamEntriesController more and remove redundant instructions (#3257)
8 years ago
Akihiko Odaki 1d3e0a5060 Spec AuthorizeFollowsController assigns @account (#3246)
8 years ago
Akihiko Odaki bf575a1f5e Introduce recent to Follow (#3247)
8 years ago
Akihiko Odaki 8fd174298d Cover AccountsController more in spec (#3229)
8 years ago
Matt Jankowski a28ce13b3e Coverage for api/web/settings controller (#3238)
8 years ago