mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	7dbed4dab9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	a23ac107e4	Fix activity:interactions counter to count all interactions (#8037 )	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Eugen Rochko	b0968623fa	Fix check for PotentialFriendshipTracker when replying (#7933 )	7 years ago
Eugen Rochko	da8fe8079e	Re-add follow recommendations API (#7918 ) * Re-add follow recommendations API GET /api/v1/suggestions Removed in `8efa081f21` due to Neo4J dependency. The algorithm uses triadic closures, takes into account suspensions, blocks, mutes, domain blocks, excludes locked and moved accounts, and prefers more recently updated accounts. * Track interactions with people you don't follow Replying to, favouriting and reblogging someone you're not following will make them show up in follow recommendations. The interactions have different weights: - Replying is 1 - Favouriting is 10 (decidedly positive interaction, but private) - Reblogging is 20 Following them, muting or blocking will remove them from the list, obviously. * Remove triadic closures, ensure potential friendships are trimmed	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828 ) * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	7 years ago
Eugen Rochko	c3b3594305	Remove placeholder text for media-only toots (#7806 ) Ref: `cfa9b6e13a` This breaks compatibility with pre-2.3.0 Mastodon and older software, but at the time of writing the network is >80% above that version. Compatibility broken only for toots with no text.	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/models/status.rb The conflict in the Status model was due to `5bf5003384`. It was resolved by accepting tootsuite's changes.	7 years ago
Akihiko Odaki	5bf5003384	Do not mark remote status sensitive even if spoiler text is present (#7395 ) Old statuses and statuses from Pawoo, which runs a modified version of Mastodon, may not have been marked sensitive even if spoiler text is present. Such statuses are still not marked sensitve if they are local or arrived before version upgrade. Marking recently fetched remote status sensitive contradicts the behavior. Considering what people expected when they authored such statuses, this change removes the sensitivity enforcement.	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
abcang	3793e598d0	Call media.present? because media may be nil (#7474 )	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
ThibG	993e68a7dd	Fix hashtags not being federated on mentions (fixes #6900 ) (#7406 )	7 years ago
Eugen Rochko	0f0cc3f2eb	Support explicitly supplying language code for status via REST API (#7389 )	7 years ago
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	0c52654b52	When creating status, if no sensitive status is given, use default (#7057 ) Clients using the API that do not provide the sensitive flag are always posting with false sensitive option.	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	510c9049c7	For now, put a "." into no-text statuses with media for backcompat (#6691 )	7 years ago
Eugen Rochko	cfa9b6e13a	Remove text requirement when media attached from statuses (#6672 )	7 years ago
Erin	3ec47e732b	post_status_service: stylistic change (local_only -> local_only?)	7 years ago
Erin	288f1293ef	set local_only in a before_create callback instead of status service	7 years ago
Erin	c1410af368	post_status_service.rb: save the status after setting local_only	7 years ago
Erin	cfbb95605b	set local_only flag on statuses in post_status_service	7 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859 )	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 years ago
ThibG	89c77fe225	Instantiate service classes for each call (fixes #5540 ) (#5543 )	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Akihiko Odaki	48d77ea1eb	Fix filterable_languages method of SettingsHelper (#4966 )	8 years ago
David Yip	67ad453373	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	8 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	8 years ago
Eugen Rochko	7ca173be47	Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861 )	8 years ago
Eugen Rochko	7b8f262840	Forward ActivityPub creates that reply to local statuses (#4709 ) * Forward ActivityPub creates that reply to local statuses * Fix test * Fix wrong signers	8 years ago
Eugen Rochko	b7370ac8ba	ActivityPub delivery (#4566 ) * Deliver ActivityPub Like * Deliver ActivityPub Undo-Like * Deliver ActivityPub Create/Announce activities * Deliver ActivityPub creates from mentions * Deliver ActivityPub Block/Undo-Block * Deliver ActivityPub Accept/Reject-Follow * Deliver ActivityPub Undo-Follow * Deliver ActivityPub Follow * Deliver ActivityPub Delete activities Incidentally fix #889 * Adjust BatchedRemoveStatusService for ActivityPub * Add tests for ActivityPub workers * Add tests for FollowService * Add tests for FavouriteService, UnfollowService and PostStatusService * Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService * Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService * Add tests for BatchedRemoveStatusService * Deliver updates to a local account to ActivityPub followers * Minor adjustments	8 years ago
kibigo!	09cfc079b0	Merge upstream (#81 )	8 years ago
Eugen Rochko	e2685ccc81	Fix #4149 , fix #1199 - Store emojis as unicode (#4189 ) - Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore	8 years ago
Surinna Curtis	3464bb30f8	replies to local-only toots default to local-only, and fix some regex bugs	8 years ago
Surinna Curtis	a6f5111c79	Eyes with variation-selector-16 now also do local-only	8 years ago
beatrix-bitrot	93fc8aa14c	keyword muting and local only tooting WIP	8 years ago
Matt Jankowski	b25e42a77f	Misc tidying and clean ups (#3445 ) * Remove trailing whitespace in i18n mailers * Use query methods instead of #present? on AR attributes * Delegate Status#account_domain method * Delegate Mention #account_username and #account_acct methods	8 years ago
Eugen Rochko	88725d6ce8	OEmbed support for PreviewCard (#2337 ) * OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller	8 years ago
Keiji, Yoshimi	8fe36654ef	attach_media should be in transaction of creation status (#2426 )	8 years ago
Eugen Rochko	8b5179d006	Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents (#2419 ) duplicates. Web UI regenerates UUID for that header every time the compose form is changed or successfully submitted Also, fix Farsi i18n overwriting the English one	8 years ago
Matt Jankowski	297c11dba2	Language detection refactor (#2099 ) * Extract detect_language to separate class * Use default locale, not just en * Add spec to confirm that whatlanguage cant identify empty string * Allow account locale to override default in language detector * PostStatusService supplies an account to detect language	8 years ago
Keiji, Yoshimi	7a5086729a	reduce unneed query when post without attachements. (#1907 ) * reduce unneed query when post without attachements. This commit reduce following query: ``` MediaAttachment Load (0.9ms) SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status _id" IS NULL AND 1=0 ORDER BY id asc ``` * fixed for more simple changes.	8 years ago
Eugen	8ebed7fc68	Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959 )	8 years ago
Eugen	e4af4898de	Add language detection (#1772 ) * Add language detection via WhatLanguage and (de)serialization of it through Atom * Fix default language in ProcessFeedService * Re-add newline before 'react-rails' Gem to fix groupings Fixes Code Climate issue	8 years ago
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	8 years ago

1 2

80 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)