2329 commits

Author	SHA1	Message	Date
Ekaterina Vaartis	336e37d98f	Make captcha (kocaptcha) stateless ... Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed	2018-12-21 09:55:47 +03:00
kaniini	2e2030ada8	Merge branch '114_email_confirmation' into 'develop' ... [#114] Email confirmation See merge request pleroma/pleroma!546	2018-12-20 13:28:36 +00:00
Ivan Tashkinov	f69cbf4755	[#114] Added :user_id component to email confirmation path to improve the security. ... Added tests for `confirm_email` action.	2018-12-20 13:41:30 +03:00
Ivan Tashkinov	8adcd1e80f	[#114] Removed flash messages rendering on redirects.	2018-12-20 13:05:42 +03:00
kaniini	fda148a9a2	Merge branch 'documentation/copy-pleroma-api' into 'develop' ... Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571	2018-12-20 04:01:54 +00:00
raeno	652f49d176	Remove extra bracket	2018-12-19 23:06:10 +04:00
raeno	7fb3780431	Merge branch 'develop' into oembed_provider	2018-12-19 22:39:44 +04:00
Ivan Tashkinov	b520d44b58	[#114] mix format	2018-12-19 19:03:39 +03:00
Ivan Tashkinov	279096228c	[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users ... unless requested by admin or moderator.	2018-12-19 18:56:52 +03:00
Ivan Tashkinov	968d7490b6	[#114] User.Info: renamed confirmation_update to confirmation_changeset.	2018-12-19 16:31:03 +03:00
Ivan Tashkinov	59fc5d15df	[#114] User.Info: renamed confirmation_update to confirmation_change.	2018-12-19 16:27:16 +03:00
lain	f3eb414e28	Add a way to use the admin api without a user.	2018-12-18 21:08:52 +01:00
Haelwenn (lanodan) Monnier	a6dfe1fc6b	Documentation: Move generated files to priv/static/doc, add it to endpoint.ex	2018-12-18 17:05:36 +01:00
href	f58f20abbb	Twitter ActivityView: fix crash when activity content is nil	2018-12-18 15:34:27 +01:00
Ivan Tashkinov	3371a45884	[#114] Formatting fix.	2018-12-18 17:30:30 +03:00
Ivan Tashkinov	b096e30cff	[#114] Added email confirmation resend action. Added tests ... for registration, authentication, email confirmation, confirmation resending. Made admin methods create confirmed users.	2018-12-18 17:22:46 +03:00
Ivan Tashkinov	aed0f90287	[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.	2018-12-18 17:22:45 +03:00
Ivan Tashkinov	b86057cc7f	[#114] Refactored User.register_changeset to init confirmation data. ... Introduced User.register/1 to encapsulate User record creation and post-registration actions.	2018-12-18 17:22:42 +03:00
Ivan Tashkinov	1de0aa2f10	[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.	2018-12-18 17:21:05 +03:00
Ivan Tashkinov	a05cb10a95	[#114] Email confirmation route, action, node setting, User.Info fields.	2018-12-18 17:18:53 +03:00
raeno	a300336459	Merge branch 'develop' into oembed_provider	2018-12-18 14:59:32 +01:00
href	b1860fe85a	Instance/Static runtime plug ... This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.	2018-12-17 22:50:59 +01:00
lambda	3d980daa49	Merge branch '459_fix_user_profile_crash' into 'develop' ... Fix update_profile failing due to OAuth token record in assigns instead of string Closes #459 See merge request pleroma/pleroma!561	2018-12-17 20:16:15 +00:00
Maksim Pechnikov	92a5133c42	fix text field	2018-12-17 22:53:16 +03:00
lambda	52ac7dce5c	Merge branch 'captcha' into 'develop' ... Captcha See merge request pleroma/pleroma!550	2018-12-17 19:45:14 +00:00
lambda	078b8b6d22	Merge branch 'phoenix14' into 'develop' ... Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560	2018-12-17 19:30:05 +00:00
href	77b5154c82	Cowboy handler for Mastodon WebSocket	2018-12-17 17:06:18 +01:00
raeno	cc87880488	Support both OAuth token record and token string in UserView	2018-12-17 16:02:26 +01:00
lambda	567359790e	Merge branch 'testfix/webfinger-jrd' into 'develop' ... WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554	2018-12-17 09:19:27 +00:00
href	5dcb7aecea	More put_view.	2018-12-16 17:51:22 +01:00
href	f672555ad3	Upgrade to Phoenix 1.4	2018-12-16 17:15:07 +01:00
eal	28478a9c4f	Merge branch 'fix/masto-put-settings' into 'develop' ... Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557	2018-12-16 11:21:26 +00:00
eal	4c783e35c0	Mastodon API: Fix PUT /api/web/settings	2018-12-16 13:15:34 +02:00
Ekaterina Vaartis	23549d3952	Formatting fixes	2018-12-15 22:08:26 +03:00
Haelwenn (lanodan) Monnier	cddab5700b	WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test	2018-12-15 17:56:12 +01:00
lambda	cc6689cc20	Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' ... TwitterAPI.ActivityView: Ignore unhandled activities See merge request pleroma/pleroma!547	2018-12-15 15:23:51 +00:00
Ekaterina Vaartis	28c43a417e	Add an ability to disabled captcha	2018-12-15 03:12:47 +03:00
Ekaterina Vaartis	a2399c1c7c	Add base CAPTCHA support (currently only kocaptcha)	2018-12-15 03:12:44 +03:00
href	e74f384b68	Merge branch 'fix/issue_433' into 'develop' ... [#433] fix markdown formatting See merge request pleroma/pleroma!545	2018-12-14 20:30:35 +00:00
href	bfe27c1b55	Merge branch '114_email_invites' into 'develop' ... [#114] Email invites See merge request pleroma/pleroma!541	2018-12-14 20:22:24 +00:00
href	acec11626d	Merge branch 'fix/issue_272' into 'develop' ... [#272] fix tags See merge request pleroma/pleroma!540	2018-12-14 20:20:30 +00:00
Maksim Pechnikov	ea72ac549b	fix case when tags is invalid	2018-12-14 23:16:12 +03:00
raeno	b0c3211984	Scrub html from activity.content or user.bio for opengraph meta	2018-12-14 21:07:06 +01:00
raeno	90b00701ff	Merge branch 'develop' into oembed_provider	2018-12-14 20:28:35 +01:00
Maksim Pechnikov	d3ec09bb38	fix tags	2018-12-14 22:09:04 +03:00
raeno	46486595ff	Handle "users/:id" links as well. Fix comments in MR.	2018-12-14 19:55:40 +01:00
href	980131b4db	Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' ... Improve web push Closes #393, #422, and #452 See merge request pleroma/pleroma!524	2018-12-14 18:50:44 +00:00
href	84b9a9d497	TwitterAPI.ActivityView: Ignore unhandled activities	2018-12-14 18:09:59 +01:00
href	412df2cd38	Warn if push is disabled..	2018-12-14 16:19:28 +01:00
Maksim Pechnikov	baead4ea4b	fix markdown formatting	2018-12-14 16:03:58 +03:00
href	91236c60c7	Merge branch 'feature/file-size-checking' into 'develop' ... [#36] Add warnings when file upload fails See merge request pleroma/pleroma!523	2018-12-14 13:00:24 +00:00
href	0b4c61e8d5	Fix warning	2018-12-14 13:56:42 +01:00
href	ec0e613eca	Pleroma.Activity.mastodon_notification_type/1	2018-12-14 13:22:10 +01:00
href	331396cbcd	Properly disable Web Push if no VAPID key is set	2018-12-14 13:05:51 +01:00
href	6822916183	Typos	2018-12-14 13:05:51 +01:00
href	b1bcd97a0f	Push: respect alerts settings	2018-12-14 13:05:49 +01:00
href	d8984b7bf8	Push: add missing notification_type field	2018-12-14 13:05:48 +01:00
href	7facbb2b8d	Push.Subscription: convert base64 to base64 urlsafe	2018-12-14 13:05:47 +01:00
Egor Kislitsyn	324933a0ac	improve push message format (compatibility with mastodon)	2018-12-14 13:05:46 +01:00
Egor Kislitsyn	658edb166f	fix and improve web push; add configuration docs	2018-12-14 13:05:29 +01:00
Ivan Tashkinov	69fd63e248	[#114] Added invitesEnabled to metadata of nodeinfo.	2018-12-14 14:13:13 +03:00
Ivan Tashkinov	66380b0641	[#114] Removed confirm_email action stub (to be addressed in a separate MR).	2018-12-14 14:01:00 +03:00
Ivan Tashkinov	9666376f5f	[#114] Readded invites_enabled config setting, updated readme.	2018-12-14 12:37:06 +03:00
Ivan Tashkinov	a89e3b4b60	[#114] Moved email_invite action to AdminAPIController, adjusted tests.	2018-12-14 12:28:23 +03:00
Ivan Tashkinov	3cbf16a5fe	[#114] Added UserInviteToken creation, adjusted invitation email link to include it.	2018-12-14 12:28:22 +03:00
Ivan Tashkinov	cc83d7ffe7	[#114] Naive implementation of email invitations.	2018-12-14 12:28:14 +03:00
href	30dc81667c	Merge branch '114_user_registration_emails' into 'develop' ... [#114] User registration emails Closes #114 See merge request pleroma/pleroma!531	2018-12-14 09:16:03 +00:00
Ivan Tashkinov	f81213910f	[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.	2018-12-14 12:09:55 +03:00
lambda	262cc6d44b	Merge branch 'fix/double-rt-or-fav' into 'develop' ... Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542	2018-12-14 08:26:08 +00:00
eal	61ad2ce422	TwitterAPI: Include favorited post in json	2018-12-14 08:24:18 +02:00
eal	1ca080c862	Prevent accidental double RTs or favorites	2018-12-14 07:56:49 +02:00
raeno	c5c3ad90d0	Fix tests. Remove oembed template	2018-12-14 03:00:50 +01:00
raeno	b5de7c4c4d	Remove oembed for now, will submit it in another MR. Fix warnings	2018-12-13 22:34:15 +01:00
raeno	018516d3f3	Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links	2018-12-13 22:21:14 +01:00
raeno	9b3a6cdb07	Extract opengraph/oembed into separate module	2018-12-13 22:17:53 +01:00
raeno	d903e34cac	Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata	2018-12-13 22:17:53 +01:00
raeno	8902942128	WIP. Implement oembed route and handle both json/xml for "Note" type activity	2018-12-13 22:17:53 +01:00
raeno	21afdf6d99	Insert meta tags into static index.html on the fly for OStatus#notice	2018-12-13 22:17:53 +01:00
Ivan Tashkinov	18b9467d1a	[#114] Removed email_invite implementation (to be addressed separately).	2018-12-13 16:22:42 +03:00
Ivan Tashkinov	00744c6b03	[#114] Initial implementation of user email invitations.	2018-12-13 14:30:48 +03:00
Ivan Tashkinov	908943352f	[#114] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages.	2018-12-13 13:17:49 +03:00
Ivan Tashkinov	bfff2399ff	[#114] Routes and config for confirm_email and email_invite (Twitter API).	2018-12-12 20:15:43 +03:00
Ivan Tashkinov	e3a21bcd45	[#114] Addressed warnings. Fix of with statement clause in password_reset.	2018-12-12 17:14:31 +03:00
Ivan Tashkinov	f5afb11032	[#114] Initial implementation of user password reset emails (user-initiated).	2018-12-12 17:04:39 +03:00
Ivan Tashkinov	12905ce1ad	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
Maksim Pechnikov	89b3729afa	fix warnings	2018-12-12 09:09:19 +03:00
scarlett	213176c3c3	Add new frontend options to server-side config.	2018-12-10 23:15:01 +00:00
lambda	ff10b9927b	Merge branch 'support/bugfix_272' into 'develop' ... [#272] fix hashtags in api See merge request pleroma/pleroma!510	2018-12-10 19:05:16 +00:00
lain	c81c74d847	Treat warnings as errors outside of tests.	2018-12-10 19:13:53 +01:00
Maksim Pechnikov	e94c3442f4	updates	2018-12-10 13:27:37 +03:00
Maksim Pechnikov	074fa790ba	fix compile warnings	2018-12-09 20:50:08 +03:00
Maksim Pechnikov	068353ac0b	formatting	2018-12-09 11:24:46 +03:00
Maksim Pechnikov	9442588ae9	fix hashtags in api response	2018-12-09 11:24:46 +03:00
Rin Toshaka	15616eda5e	Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content	2018-12-08 21:48:49 +01:00
lambda	beadeaffa1	Merge branch 'fix/nodeinfo-nil-features' into 'develop' ... Nodeinfo: remove null features; relay feature. See merge request pleroma/pleroma!520	2018-12-08 09:12:06 +00:00
href	bdc8112e40	Media proxy: fix url encoding	2018-12-07 21:57:59 +01:00
Rin Toshaka	578051809f	Add uploadlimit to Twitter API config	2018-12-07 20:03:30 +01:00
lambda	94ac0075bf	Merge branch 'media-proxy-follow-redirect' into 'develop' ... Media proxy: follow HTTP redirects by default Closes #421 See merge request pleroma/pleroma!519	2018-12-07 18:48:26 +00:00
href	134cc94cbd	Nodeinfo: remove null features; relay feature.	2018-12-07 19:44:45 +01:00
href	d8fcf7c5cf	Media proxy: follow HTTP redirects by default	2018-12-07 19:36:44 +01:00
lambda	94d8f1ab30	Merge branch '394_user_tags' into 'develop' ... [#394] User tags Closes #394 See merge request pleroma/pleroma!508	2018-12-07 18:25:38 +00:00
Ivan Tashkinov	6ed5044c4e	[#394] Refactoring (using Ecto.Multi; "untag" route change).	2018-12-07 11:04:39 +03:00
Ivan Tashkinov	7a2162bbcb	[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.	2018-12-06 22:26:25 +03:00
Ivan Tashkinov	7bcb6a183a	[#394] Refactoring.	2018-12-06 20:23:16 +03:00
Ivan Tashkinov	7b19487389	[#394] Added users.tags and admin routes to tag and untag users. Added tests.	2018-12-06 20:06:50 +03:00
kaniini	1d531fd2f3	Merge branch 'fix/mastodon-api-settings' into 'develop' ... Fix put_settings and remove info_changeset See merge request pleroma/pleroma!507	2018-12-06 16:01:58 +00:00
kaniini	abead01ab6	Merge branch 'correct-and-improve-http-options' into 'develop' ... Correct and improve http options See merge request pleroma/pleroma!505	2018-12-06 15:57:56 +00:00
kaniini	b0adea30b3	Merge branch 're-mrf' into 'develop' ... Add a MRF Policy for appending re: to identical subjects in replies. See merge request pleroma/pleroma!499	2018-12-06 15:36:41 +00:00
rinpatch	2ae1128d9f	MastoAPI: Fix put_settings	2018-12-06 17:42:07 +03:00
scarlett	d27e3f269f	Rename regular expression 'have_re' to 'reply_prefix'.	2018-12-06 14:00:41 +00:00
Egor Kislitsyn	6f36e903b0	use User.avatar_url	2018-12-06 20:55:46 +07:00
Egor Kislitsyn	79668c08fc	cleanup	2018-12-06 20:50:20 +07:00
scarlett	3dff61ebec	Harden re: detection.	2018-12-06 13:48:12 +00:00
Egor Kislitsyn	3d492795b7	clean up	2018-12-06 20:42:00 +07:00
Egor Kislitsyn	4944498133	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex	2018-12-06 20:15:16 +07:00
Egor Kislitsyn	bac58b1524	show warning if VAPID is not set	2018-12-06 19:56:56 +07:00
Egor Kislitsyn	8b4397c704	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock	2018-12-06 19:55:58 +07:00
Egor Kislitsyn	04a48286e6	Add web push support	2018-12-06 19:29:04 +07:00
scarlett	6a6aaa0e1a	Use object.normalize.	2018-12-06 11:37:29 +00:00
Hakaba Hitoyo	a09ed0f5af	avoid mix format bug	2018-12-06 18:41:29 +09:00
kaniini	ccf0b46dd6	Merge branch '210_twitter_api_uploads_alt_text' into 'develop' ... [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix. See merge request pleroma/pleroma!496	2018-12-06 07:36:21 +00:00
Ivan Tashkinov	3e90f688f1	[#210] Mastodon: actor storing for media uploads, ownership check to update_media. ... Refactoring.	2018-12-06 10:26:17 +03:00
Hakaba Hitoyo	96ba95df2e	remove follow_redirect options	2018-12-06 11:38:33 +09:00
Hakaba Hitoyo	27792b2d77	remove pool and timeout options which duplicate with the default	2018-12-06 11:23:15 +09:00
Hakaba Hitoyo	505d820827	Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options	2018-12-06 10:48:05 +09:00
lain	76d6b1c6ab	Merge remote-tracking branch 'origin' into follower-hiding	2018-12-05 21:27:56 +01:00
lain	3ea4476445	MastodonAPI: Show users their own network.	2018-12-05 21:25:06 +01:00
lain	fdac215091	TwitterAPI: Show users their own network.	2018-12-05 21:14:06 +01:00
Ivan Tashkinov	3b5be09f45	[#210] Stylistic change.	2018-12-05 21:48:21 +03:00
lain	839526a913	TwitterAPI: Add network hiding.	2018-12-05 19:22:40 +01:00
Ivan Tashkinov	c4f3c5e939	[#210] Stylistic change.	2018-12-05 20:23:28 +03:00
Ivan Tashkinov	848151f7cb	[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check ... to `update_media` action. Added controller tests for `upload` and `update_media` actions. Refactoring.	2018-12-05 13:37:06 +03:00
Ivan Tashkinov	be187f82f7	[#210] Further refactoring.	2018-12-05 11:48:50 +03:00
hakabahitoyo	a418547bdf	debug /api/v1/suggestions	2018-12-05 16:08:34 +09:00
scarlett	8a1df182cf	Add a MRF Policy for appending re: to identical subjects in replies.	2018-12-04 23:35:07 +00:00
kaniini	ec1ec32f20	Merge branch 'optional-retry-queue' into 'develop' ... Make retry queue optional. See merge request pleroma/pleroma!498	2018-12-04 19:00:18 +00:00
lain	925b05054f	Make retry queue optional. ... At the moment, it can use a lot of memory really fast.	2018-12-04 19:54:42 +01:00
kaniini	114b95cee2	Merge branch 'feature/integration_tesla' into 'develop' ... [#354] Move all http interactions to Tesla See merge request pleroma/pleroma!487	2018-12-04 18:41:00 +00:00
William Pitcock	b57d83e3c9	MRF: simple policy: fix media removal	2018-12-04 18:30:01 +00:00
Ivan Tashkinov	48e6193bf2	[#210] Refactoring.	2018-12-04 19:24:41 +03:00
Ivan Tashkinov	826fc446d5	[#210] TwitterAPI: implemented /api/media/metadata/create ... to allow uploads description (alt text) setting.	2018-12-04 18:35:57 +03:00
Maksim Pechnikov	87109482f3	status_code -> status	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	97252a27d9	fix http request in Salmon	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	3ce16e5a56	init tesla and updated the http requests in Pleroma.Web.Websub	2018-12-04 14:03:32 +03:00
lambda	88b05aeabb	Merge branch 'fix/parse-user-bio' into 'develop' ... Parse user's bio on register See merge request pleroma/pleroma!492	2018-12-03 16:31:00 +00:00
lambda	42ef7cd227	Merge branch 'fix-media-proxy-defaults' into 'develop' ... Fix media proxy config defaults See merge request pleroma/pleroma!495	2018-12-03 16:14:58 +00:00
Maxim Filippov	4b70e5eae9	Parse bio for MastodonAPI	2018-12-03 18:59:50 +03:00
Maxim Filippov	ce98d5eb9b	Parse user's bio on register	2018-12-02 22:03:53 +03:00
lain	8c9a4e8b40	TwitterAPI: Implement hide_network.	2018-12-02 18:14:13 +01:00
lain	2a639de9b3	MastodonApi: Implement hide_network.	2018-12-02 17:48:00 +01:00
lain	6be0ab1e55	Hide network in ap.	2018-12-02 17:35:32 +01:00
href	43d5e4f7fa	Fix media proxy config defaults	2018-12-02 11:24:02 +01:00
lain	f18b86fd5f	More fixes for Info schema.	2018-12-01 12:46:08 +01:00
lain	93f2dc19d9	TwitterAPI: Fix banner and background update.	2018-12-01 12:01:22 +01:00
lain	347df6421d	Fix masto api user updating.	2018-12-01 10:40:01 +01:00
lain	c443c9bd72	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-12-01 09:55:46 +01:00
lain	1c67277c80	Fix admin api.	2018-12-01 09:03:16 +01:00
href	680716b3c9	Config docs	2018-11-30 18:02:51 +01:00
href	02d3dc6869	Uploads fun, part. 2	2018-11-30 18:02:37 +01:00
href	b19597f602	reverse proxy / uploads	2018-11-30 18:00:47 +01:00
lain	d0ec2812bd	Merge remote-tracking branch 'origin' into validate-user-info	2018-11-30 17:34:20 +01:00
lain	8f1fffebc6	Fix transmogrifier test.	2018-11-30 17:31:05 +01:00
lain	d088ac6286	Fix OStatus user updates. ... Breaks banner updating.	2018-11-30 17:21:58 +01:00
lain	48b95a9b95	Assorted fixes.	2018-11-30 17:08:02 +01:00
lain	d407f662af	Fix TwitterApiController.	2018-11-30 17:07:37 +01:00
lain	a6812bc9df	Remove "most recent notification" endpoint.	2018-11-30 16:47:37 +01:00
KokaKiwi	87098d1676	Streamer: Don't send unwanted DMs to list streams	2018-11-27 20:50:19 +01:00
lain	3c61df6b9e	Webfinger fixes.	2018-11-27 18:31:44 +01:00
lain	ec464ef20a	HTTP sig fixes.	2018-11-27 17:42:45 +01:00
Haelwenn	5ae6088d37	Merge branch 'feature/mrf-user-allowlist' into 'develop' ... MRF: user allowlist module See merge request pleroma/pleroma!477	2018-11-27 00:12:03 +00:00
William Pitcock	271f9f1335	nodeinfo: add mrf_user_allowlist data	2018-11-26 23:52:19 +00:00
William Pitcock	8c05d19c7f	MRF: add user allowlist module	2018-11-26 23:51:58 +00:00
Mark Felder	6cc94404d7	Replace this hardcoded <title>	2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier	ca029f0b69	Web.Streamer: Get unauthenticated statuses representation	2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier	d388a99143	Web.MastodonAPI.MastodonSocket: Put access_token at function-level	2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier	5346fabf14	Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints ... reported by soka on CRTNet	2018-11-24 06:13:36 +01:00
kaniini	675653ceb7	Merge branch 'feature/admin-api' into 'develop' ... Add a admin API See merge request pleroma/pleroma!366	2018-11-22 00:28:04 +00:00
kaniini	182e3e8da2	Merge branch 'feature/improve-version' into 'develop' ... Improved version string See merge request pleroma/pleroma!467	2018-11-21 16:53:38 +00:00
kaniini	a591a044a9	Merge branch 'runtime-fixes' into 'develop' ... Various runtime configuration fixes See merge request pleroma/pleroma!468	2018-11-20 22:25:35 +00:00
lain	0bea0308f1	Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-11-20 20:16:16 +01:00
lain	0896cf4c0f	Fix most mastodon api bugs.	2018-11-20 20:12:39 +01:00
Haelwenn	c7d08bc1cf	Merge branch 'feature/retry-queue' into 'develop' ... Federator: add retry queue. See merge request pleroma/pleroma!323	2018-11-20 19:04:52 +00:00
William Pitcock	3456948cd1	mastodon api: fix up quite a few test failures	2018-11-20 19:02:23 +00:00
William Pitcock	ef6c64a5d2	activitypub: fix restrict_blocked()	2018-11-20 18:58:08 +00:00
William Pitcock	c196754b4d	mastodon api: account view: fix tests	2018-11-20 18:54:48 +00:00
William Pitcock	ece8656733	streamer: fix fetching the user's block list	2018-11-20 18:47:12 +00:00
William Pitcock	4ac849cb4a	common api: fix moderator check when deleting posts	2018-11-20 18:42:28 +00:00
lain	6f0b9a5163	Fix Notification tests.	2018-11-20 19:15:28 +01:00
href	bc5cf2c192	Improved version string	2018-11-20 17:55:03 +01:00
href	7f4c3a1e99	mediaproxy: fix empty url & add some tests	2018-11-20 17:50:03 +01:00
eal	689b46efc8	RetryQueue: tiny refractor, add tests	2018-11-19 18:08:41 +02:00
href	bcecdc3ab1	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
lain	fbb70d25fe	Several twitter api fixes.	2018-11-18 22:36:47 +01:00
lain	40d9d2098c	Fix user updating from AP.	2018-11-18 22:15:03 +01:00
lain	cafa15131a	Mix format.	2018-11-18 21:41:35 +01:00
lain	4c918392c6	Fix most User tests.	2018-11-18 21:40:52 +01:00
lain	e7cd6e9739	Fix setting of keys.	2018-11-18 19:33:43 +01:00
eal	62299be094	Federator: add retry queue.	2018-11-18 17:46:29 +02:00
William Pitcock	f6be980f4f	activitypub: object view: avoid leaking private details	2018-11-17 22:30:53 +00:00
William Pitcock	98795172a7	ostatus controller: respond with AS2 objects instead of activities to notice URIs	2018-11-17 22:10:15 +00:00
William Pitcock	dfcfb184b1	activitypub: transmogrifier: make deletes secure	2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier	0ca00b3a07	Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit	2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier	12ccf0c4f8	Change Relay from status to {status, message}	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	4634d99d0d	Web.Router: Change right to permission group (except for function names)	2018-11-17 22:12:13 +01:00
William Pitcock	0d1375f274	federator: return :ok or :error depending on if an AP doc was accepted or not	2018-11-17 21:00:37 +00:00
William Pitcock	3d9266a8cb	federator: do origin containment when processing inbound messages	2018-11-17 20:43:43 +00:00
William Pitcock	c88533209c	activitypub: user fetching: use fetch_and_contain_remote_object_from_id()	2018-11-17 20:16:03 +00:00
William Pitcock	daa8ec3d62	activitypub: factor out AP object fetching to it's own function and add ID-based containment	2018-11-17 20:15:59 +00:00
Haelwenn (lanodan) Monnier	e0b0fde713	Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)	2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier	ccd6b1956d	lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	265c8c5209	Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	f9d05902fe	lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	a87ed2fad6	Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	f48062488e	Add get endpoints for rights [AdminAPI]	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	59ce7fedce	Fix connection returns make generic right endpoint [AdminAPI]	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	c5a2bd6a65	admin_api_controller.ex: fix remaining params at once	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	95b107b6cc	admin_api_controller.ex: Add documentation, fix get_invite_token	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	578a911737	admin_api_controller.ex: get_password_reset: fix params and response	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	5732eef16b	lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController	2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier	77d2fd54dd	admin_api_controller: Have some basic code	2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier	ee2e1328ad	admin_api_controller.ex: Create	2018-11-17 20:25:52 +01:00
William Pitcock	603fccf175	activitypub: fetch_object_from_id(): prefer actor over attributedTo to avoid spoofing	2018-11-17 18:17:17 +00:00
lain	f87b315618	TwitterAPI: Fix dm_timeline displaying only half of the conversation.	2018-11-16 19:47:36 +01:00
lambda	2f639ea129	Merge branch 'feature/pleromafe-usersearch' into 'develop' ... Add Twitter / Pleroma API user search See merge request pleroma/pleroma!452	2018-11-16 18:13:47 +00:00
lain	27aa136aac	Format.	2018-11-14 20:41:12 +01:00
lain	7b170cd616	Add Pleroma user search api for PleromaFE.	2018-11-14 20:33:23 +01:00
lambda	cc45797f4e	Merge branch 'fix-media-proxy-filename' into 'develop' ... media_proxy: use path only to retrieve filename See merge request pleroma/pleroma!450	2018-11-14 18:17:10 +00:00
kaniini	69d557e86d	Merge branch 'twitter-api-direct-messages' into 'develop' ... Twitter api direct messages See merge request pleroma/pleroma!449	2018-11-14 08:52:08 +00:00
href	f52a1d1ec5	media_proxy: use path only to retrieve filename	2018-11-13 23:41:33 +01:00
lain	ea9a776d7b	TwitterApi: Add direct message endpoint	2018-11-13 20:08:50 +01:00
lain	2cf40237ff	MastodonAPI: Add pagination to private messages.	2018-11-13 19:46:34 +01:00
href	9b553a1087	media_proxy: CSP, content-disposition ... * Adds CSP headers to the media proxy endpoint * Sends `content-disposition: attachment; …` for non-image/video/audio content types The default list can be overwritten with `:media_proxy, :safe_content_types` in the configuration. * Also now appends the filename to the proxy URL (fixes some mobile apps, it was requested a while ago)	2018-11-13 15:58:02 +01:00
shibayashi	87c76a9a2f	Add __Host- prefix when secure flag is enabled	2018-11-13 00:32:38 +01:00
scarlett	0ce5623134	Merge branch 'twitter-api-null-display-name' into 'develop' ... Twitter API: Fall back to user.nickname if user has no name Closes #375 See merge request pleroma/pleroma!444	2018-11-12 17:08:54 +00:00
scarlett	cb6fd73861	Twitter API: Fall back to user.nickname if user has no name	2018-11-12 15:52:13 +00:00
kaniini	54923c2e55	Merge branch 'feature/csp-plug' into 'develop' ... migrate CSP management to CSPPlug See merge request pleroma/pleroma!441	2018-11-12 15:30:42 +00:00
William Pitcock	fe67665e19	rename CSPPlug to HTTPSecurityPlug.	2018-11-12 15:08:02 +00:00
KokaKiwi	1592fa2bea	Mastodon API: Fix list streaming	2018-11-11 14:18:15 +01:00
William Pitcock	f516e317ea	plugs: add CSPPlug	2018-11-11 06:10:21 +00:00
William Pitcock	419ed3a0ca	oauth: fix token decode regression	2018-11-11 05:26:39 +00:00
William Pitcock	97e50f3191	activitypub: transmogrifier: sanitize internal representation details from outgoing objects ... this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside projects which tried to parse our internal data. accordingly, it seems better to just remove it.	2018-11-10 12:24:20 +00:00
William Pitcock	f8310114a6	activitypub: object view: sanitize both the activity and the object when an activity is given for rendering	2018-11-10 12:04:09 +00:00
kaniini	c9c1f9dee2	Merge branch 'bugfix/ostatus-as2-reflection' into 'develop' ... ostatus: only federate activities concerning note objects See merge request pleroma/pleroma!437	2018-11-10 11:50:02 +00:00
kaniini	7daa102fa4	Merge branch 'bugfix/local-jsonld-context' into 'develop' ... Host LitePub JSON-LD context locally See merge request pleroma/pleroma!435	2018-11-10 11:37:44 +00:00
William Pitcock	4f87b8362b	endpoint: move CORSPlug in front of Plug.Static	2018-11-10 11:23:50 +00:00
William Pitcock	03a9990baf	endpoint: fix formatting	2018-11-10 11:18:25 +00:00
William Pitcock	e6d246882d	federator: don't federate anything other than Note objects to OStatus	2018-11-10 10:06:10 +00:00
William Pitcock	e4971553c7	activitypub: utils: use same object type list for mention extraction as insertion	2018-11-09 13:40:39 +00:00
William Pitcock	b9871e7e5a	activitypub: utils: wrap Note objects in a Create when extracting mentions	2018-11-09 09:01:40 +00:00
William Pitcock	6cadfcb21e	activitypub: utils: switch to using new Notification.get_notified_from_activity().	2018-11-09 09:01:40 +00:00
William Pitcock	6b4064fa5d	activitypub: transmogrifier: unify mention extraction	2018-11-08 19:41:36 +00:00
Haelwenn (lanodan) Monnier	2fab32ab61	Pleroma.Web.Endpoint: Whitelist schemas directory	2018-11-08 20:22:12 +01:00
Haelwenn (lanodan) Monnier	934125695d	Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld	2018-11-08 20:21:45 +01:00
William Pitcock	4e93d6ae14	common api: utils: flip to/cc for mentions	2018-11-08 19:17:01 +00:00
William Pitcock	3e33479c05	activitypub: transmogrifier: only consider to users as mention targets	2018-11-08 18:58:27 +00:00
Haelwenn (lanodan) Monnier	abcacec97d	Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one	2018-11-08 19:38:38 +01:00
William Pitcock	da16ada424	utils: use litepub @context instead of that huge mess	2018-11-08 16:52:14 +00:00
William Pitcock	f733470037	user view: unify a @context entry that was missed	2018-11-08 16:51:48 +00:00
lambda	59cf7cf235	Merge branch 'small-jsonld-refactor' into 'develop' ... Small jsonld refactor See merge request pleroma/pleroma!433	2018-11-08 16:23:58 +00:00
lain	34bd411781	Unify json ld header handling.	2018-11-08 16:39:38 +01:00
lain	3b02fd9fb7	Small refactor.	2018-11-08 16:05:28 +01:00
kaniini	4d627a5117	Merge branch 'feature/qvitter-notifications-dismiss' into 'develop' ... qvitter notifications: add new "read notifications" API See merge request pleroma/pleroma!431	2018-11-07 22:33:06 +00:00
kaniini	b451a92d78	Merge branch 'runtime-config' into 'develop' ... Runtime configuration See merge request pleroma/pleroma!430	2018-11-07 22:32:34 +00:00
href	e42f2efae4	/api/v1/accounts/relationships Return an empty array if no id in params ... This copies Mastodon API behaviour & fixes Mastalab app.	2018-11-07 16:32:57 +01:00
href	9070588493	Runtime config: MRF changes	2018-11-07 10:40:24 +01:00
William Pitcock	b2105a3131	twitterapi: add notification read endpoint	2018-11-06 23:25:07 +00:00
href	5bb88fd174	Runtime configuration ... Related to #85 Everything should now be configured at runtime, with the exception of the `Pleroma.HTML` scrubbers (the scrubbers used can be changed at runtime, but their configuration is compile-time) because it's building a module with a macro.	2018-11-06 19:41:15 +01:00
kaniini	a68c18f0ad	Merge branch 'unify-mastodon-oauth' into 'develop' ... Unify Mastodon Login with OAuth login. See merge request pleroma/pleroma!429	2018-11-06 16:18:12 +00:00
kaniini	0f3e78addb	Merge branch 'runtime-router' into 'develop' ... Runtime configured router See merge request pleroma/pleroma!426	2018-11-06 15:35:19 +00:00
lain	a8f1e30cb8	Formatting.	2018-11-06 16:05:58 +01:00
lain	4f640c43ed	Unify Mastodon Login with OAuth login. ... This removes duplication in the login code.	2018-11-06 15:19:11 +01:00
href	2bc924ba45	Get rid of Pleroma.Config in favor of Application ... Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232	2018-11-06 15:12:53 +01:00
href	013f7ba8c1	Add federating plug & public tests	2018-11-06 14:45:04 +01:00
href	6fe23c5458	Runtime configured router	2018-11-05 15:19:03 +01:00
href	763fc7b44f	Runtime configured emojis ... The changes are a bit heavy since the emojis were loaded into module attributes from filesystem. This introduces a GenServer using an ETS table to cache in memory the emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.	2018-11-05 13:24:00 +01:00
kaniini	007f1c73b1	Merge branch 'feature/cors-again' into 'develop' ... Add CORSPlug to make web-based OAuth easier. See merge request pleroma/pleroma!420	2018-11-03 15:36:23 +00:00
Haelwenn (lanodan) Monnier	3e50bb667f	Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable	2018-11-03 14:42:47 +01:00
lain	e954cfcc2c	Add CORSPlug to make web-based OAuth easier.	2018-11-03 13:38:01 +01:00
lambda	4bcdbb12a4	Merge branch 'fix_hashtag_search' into 'develop' ... Fix hashtag search See merge request pleroma/pleroma!418	2018-11-02 20:05:56 +00:00
Mark Felder	0cca7edbe0	Fix hashtag search ... When we lowercase the search it will succesfully do a case insenstive match. Now #Linux will match #linux and #LINUX whereas previously it would only match the exact case.	2018-11-02 19:38:57 +00:00
lain	45ebc8dd9a	Check for empty string in_reply_to ids.	2018-11-02 17:33:51 +01:00
Haelwenn (lanodan) Monnier	3c7d4ff271	Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo	2018-11-01 15:07:27 +01:00
William Pitcock	24ba08de13	twitter api: add support for rendering Page objects	2018-11-01 10:01:35 +00:00
William Pitcock	4d8f076125	mastodon api: add support for rendering Page objects	2018-11-01 10:00:16 +00:00
William Pitcock	9f03b5c4f7	activitypub: transmogrifier: add support for Page objects	2018-11-01 09:59:43 +00:00
kaniini	eba9a62024	Merge branch 'feature/relay-tests' into 'develop' ... relay tests See merge request pleroma/pleroma!411	2018-11-01 09:10:51 +00:00
Haelwenn	40676d7683	Merge branch 'bugfix/prismo.news_article_url' into 'develop' ... Bugfix/prismo.news article url Closes #352 See merge request pleroma/pleroma!410	2018-11-01 09:05:16 +00:00
lain	1e9ced5af4	Test Relay, switch to runtime configuration.	2018-11-01 09:01:43 +00:00
Haelwenn (lanodan) Monnier	b2da5262ea	Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty ... Thanks prismo.news, I hate it	2018-11-01 09:56:37 +01:00
Haelwenn (lanodan) Monnier	755f166406	Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string	2018-11-01 09:55:38 +01:00
William Pitcock	10f3958468	object: return the deleted object as well	2018-11-01 07:47:50 +00:00
William Pitcock	2bf358d7b4	activitypub: use Object.delete() instead of mutating the database and cache directly	2018-11-01 07:29:12 +00:00
Haelwenn (lanodan) Monnier	558e6a84d6	[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/346	2018-11-01 06:52:01 +01:00
William Pitcock	47f76bf4b1	common api: allow self-liking objects ... mastodon allows this, for whatever reason. closes #347.	2018-10-31 22:29:49 +00:00
scarlett	b92e38d2d4	Add user reactivation task.	2018-10-29 23:13:15 +00:00
kaniini	a880e0a527	Merge branch 'feature/upload-limits' into 'develop' ... configurable media upload limits Closes #118 See merge request pleroma/pleroma!401	2018-10-29 20:14:10 +00:00
William Pitcock	676c97b8c7	nodeinfo: expose configured upload limits	2018-10-29 20:07:52 +00:00
William Pitcock	f407831120	common api: prefer formatting attachments using the attachment's name instead of URI	2018-10-29 17:59:24 +00:00
William Pitcock	784b3a615d	utils: fix another possible leak with private S3 backends using mediaproxy ... same rationale as the other mediaproxy changes	2018-10-29 17:26:15 +00:00
William Pitcock	181f3bb56a	mastodon api: enforce upload limits for avatars and banners	2018-10-29 16:43:05 +00:00
William Pitcock	e12489e2fe	twitter api: enforce upload limits for avatars, banners and backgrounds	2018-10-29 16:43:05 +00:00
William Pitcock	167d3789a5	activitypub: upload: pass through an upload limit if one is provided	2018-10-29 16:43:05 +00:00
William Pitcock	5c6ec2d9fc	twitter/mastodon api: always use mediaproxy URLs in attachments ... if using local media, the mediaproxy will not replace the URL anyway.	2018-10-29 15:19:32 +00:00
William Pitcock	72ea54de6e	activitypub: fix possible false positives with broken thread filtering	2018-10-28 05:45:33 +00:00
William Pitcock	26eb11c172	activitypub: add support for filtering broken threads out of timelines	2018-10-26 06:16:51 +00:00
William Pitcock	f6cb963df2	activitypub utils: fix recipient check when the message is unaddressed (mastodon)	2018-10-26 01:24:22 +00:00
Haelwenn (lanodan) Monnier	7906dfe5a0	[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings	2018-10-26 01:06:34 +02:00
Haelwenn (lanodan) Monnier	57330dd91b	[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features	2018-10-26 01:06:19 +02:00
William Pitcock	ce70eb8c00	activitypub utils: fix user splicing	2018-10-25 05:24:01 +00:00
William Pitcock	2f1f1a4f30	activitypub: splice users into recipient lists when they receive messages at their personal inbox ... closes #343	2018-10-25 05:02:21 +00:00
kaniini	9e9b1bd5ea	Merge branch 'bugfix/ap-uri-user-search' into 'develop' ... transmogrifier: do not try to contain origin of something which doesn't have one Closes #340 See merge request pleroma/pleroma!389	2018-10-25 04:38:46 +00:00
Haelwenn	79b1e4465f	Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop' ... [Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json Closes #233 See merge request pleroma/pleroma!257	2018-10-25 04:35:29 +00:00
William Pitcock	5383887bd4	transmogrifier: do not try to contain origin of something which doesn't have one	2018-10-25 04:27:33 +00:00
Haelwenn (lanodan) Monnier	b386888a0e	[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4 ... Better be sure than sorry	2018-10-25 06:21:11 +02:00
William Pitcock	1ed25c963a	twitterapi: activity view: add the other in_reply_to fields	2018-10-25 04:04:04 +00:00
Haelwenn (lanodan) Monnier	b112112c11	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4	2018-10-25 05:52:45 +02:00
Haelwenn (lanodan) Monnier	b0a940d5a2	[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	2da0ffeb28	lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	0c10be8731	[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	3b0e9287a5	[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views	2018-10-25 05:24:01 +02:00
William Pitcock	fee43ae5e7	twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper	2018-10-25 02:59:04 +00:00
scarlett	a253c1466e	New frontend options	2018-10-21 12:52:52 +01:00
AkiraFukushima	e8c698af41	Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs	2018-10-19 01:46:26 +09:00
scarlett	7562912f6a	Use maybe_direct_follow for follow imports	2018-10-17 04:16:11 +01:00
William Pitcock	30efa86c05	common api: enable tag linking in markdown mode	2018-10-14 20:36:11 +00:00
Haelwenn (lanodan) Monnier	eacab0fb05	Delete Tokens and Authorizations on password change ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/320	2018-10-14 02:14:54 +02:00
William Pitcock	111841ad34	common api: take the combination of the subject and content for length limit enforcement ... closes #315	2018-10-10 07:53:44 +00:00
William Pitcock	08d5ad71b6	nodeinfo: allow opting out of MRF transparency	2018-10-07 01:23:38 +00:00
William Pitcock	7b3fff9af8	{mastodon api, twitter api}: make the follow handshake timeout configurable	2018-10-07 01:05:59 +00:00
William Pitcock	7f530f6f80	mastodon api: relationship view: better handle no pre-existing follow activity	2018-10-05 23:50:13 +00:00
William Pitcock	e69faf550c	user: add wait_and_refresh() for async three-way handshake case	2018-10-05 23:40:49 +00:00
William Pitcock	3e751496e3	mastodon api: account view: fetch follow state and use it to populate requested field	2018-10-05 23:31:49 +00:00
William Pitcock	a71b822013	activitypub: always track following state for async reasons	2018-10-05 23:31:00 +00:00
William Pitcock	8ce217776d	activitypub transmogrifier: better manage follow state	2018-10-05 23:30:34 +00:00
William Pitcock	bd76d9cee6	nodeinfo: add accepted post formats to metadata	2018-10-05 21:05:37 +00:00
William Pitcock	285ac80c36	config: allow for accepted post formats to be configured	2018-10-05 21:02:17 +00:00
William Pitcock	16307da311	twitterapi: frontend config: add formattingOptionsEnabled	2018-10-05 20:49:34 +00:00
William Pitcock	b1be9415ef	Revert "Merge branch 'revert-a26d5e6b' into 'develop'" ... This reverts commit d31bbb1cfe, reversing changes made to 340ab3cb90.	2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier	f2efc8dcfb	nodeinfo_controller: Fix JSON rendering ... This is the last noedinfo difference from my own branch	2018-10-05 22:32:53 +02:00
Haelwenn (lanodan) Monnier	28651df478	MRF Transparency	2018-10-05 20:09:08 +02:00
Haelwenn (lanodan) Monnier	56d31db130	Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one	2018-10-05 20:08:55 +02:00
Haelwenn (lanodan) Monnier	8226953f1d	[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple	2018-10-05 20:02:13 +02:00
kaniini	4f03bb2299	Merge branch 'bugfix/fix-mrf-reject-match' into 'develop' ... activitypub: fix error condition match See merge request pleroma/pleroma!365	2018-09-30 05:32:56 +00:00
William Pitcock	4db1bc2c0e	activitypub: fix error condition match	2018-09-30 05:26:13 +00:00
Haelwenn	34b6d444d6	Merge branch 'feature/twitter_api/fields' into 'develop' ... [Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" See merge request pleroma/pleroma!360	2018-09-28 09:25:27 +00:00
Haelwenn (lanodan) Monnier	82b57ebad1	[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"	2018-09-28 10:44:45 +02:00
William Pitcock	707077edde	activitypub: don't fall back to OStatus fetching when MRF rejects an object	2018-09-28 00:45:10 +00:00
William Pitcock	5c312ad677	activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else ... although the previous handling assumed any unsigned/invalid signature message was a Create, lets make it more explicit	2018-09-28 00:03:59 +00:00
Haelwenn (lanodan) Monnier	c739737998	transmogrifier: get_actor called without casting attributedTo in actor and actor is nil	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	9446b02bdf	transmogrifier: Just make attachement maps into a list and reroll	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	e53da692fb	transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on	2018-09-27 20:00:48 +02:00
William Pitcock	d830a243a3	transmogrifier: more robustly handle dereferencing pointer URIs	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	4c3a80de96	transmogrifier: Use oneliners when applicable	2018-09-27 20:00:47 +02:00
William Pitcock	ed8dfa3029	transmogrifier: reformat cond block by hand	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	eebe33e86a	transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	f3291acc91	transmogrifier: pro-actively add support for Hashtag without array in tag	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	22927f3a34	transmogrifier: Use a cond, add proactive support for arrays	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	0aac72f1d3	[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	28e8a8ab36	[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg] ... Also simplified the code for name trimming. And not copying the Map.merge part as it looks buggy. See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	f8a0cb9c0b	[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	a4abb124ea	[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	523757be52	[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]	2018-09-27 20:00:45 +02:00
Martin Kühl	d94ee5cd50	Mastodon API: Support push subscription CRUD	2018-09-22 07:04:01 +02:00
William Pitcock	56577d8b48	twitter api: add no_rich_text option to userview for account prefs	2018-09-22 03:24:40 +00:00
William Pitcock	df00a364fb	mastodon api: formatting	2018-09-22 02:53:04 +00:00
William Pitcock	c2b69798dd	twitter api: add support for disabling rich text	2018-09-22 02:53:02 +00:00
William Pitcock	958e085acb	mastodon api: add support for user-supplied html policy	2018-09-22 02:53:02 +00:00
William Pitcock	2f5b026548	twitter api: add support for user-specified html policy	2018-09-22 02:53:01 +00:00
kaniini	0fe165165f	Merge branch 'task-204-on-options-request' into 'develop' ... Return 204 response on options request See merge request pleroma/pleroma!347	2018-09-20 23:54:51 +00:00
Haelwenn (lanodan) Monnier	40c51f118f	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0	2018-09-20 16:48:12 +02:00
Haelwenn (lanodan) Monnier	f74725df41	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables	2018-09-20 16:37:18 +02:00
Haelwenn (lanodan) Monnier	33a1e92584	[Pleroma.Web.Router]: Fake /api/v1/endorsements	2018-09-20 16:25:07 +02:00
Haelwenn (lanodan) Monnier	a8eaecadee	[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)	2018-09-20 16:24:29 +02:00
Haelwenn (lanodan) Monnier	43d0b7bf7a	[Pleroma.Web.MastodonAPI.StatusView] add replies_count	2018-09-20 16:10:46 +02:00
William Pitcock	c9585ec007	twitter api: fix mimetype fallback when attachments use a URI instead of a URL object	2018-09-19 04:59:26 +00:00
William Pitcock	0cac493fdc	mastodon api: default attachment type to image if one is not present	2018-09-19 04:59:25 +00:00
Martin Kühl	f4fcea5258	Revert "Mastodon API: Fake support for loading filters" ... This reverts commit c1d07da4e1. The fake support was superseded by 6e030129fb which actually implements the faked filters API. This change removes the fake support and ensures that the actual implementation is used.	2018-09-18 11:59:10 +02:00
Dominique Feyer	9b0f2d572b	Return 204 response on options request	2018-09-17 12:21:01 +02:00
William Pitcock	342ed84446	MRF: add policy for normalizing HTML markup (local and remote) to a specific policy	2018-09-16 01:25:36 +00:00
kaniini	c2650f0ffb	Merge branch 'feature/html-scrub-policy' into 'develop' ... html scrub policy See merge request pleroma/pleroma!339	2018-09-16 01:05:09 +00:00
shadowfacts	39aed5348a	Add visible_in_picker to status emojis	2018-09-10 23:32:19 +00:00
William Pitcock	d3248e13e3	activitypub: transmogrifier: allow profile updates from bots	2018-09-10 01:57:03 +00:00
William Pitcock	e0b8c0ccba	MRF: reject non-public: use pattern match to remove unnecessary if block	2018-09-10 01:16:03 +00:00
William Pitcock	88094c266d	MRF: simple policy: refactor module to use guards and pattern matching	2018-09-10 01:16:02 +00:00
William Pitcock	97253df3ee	MRF: simple policy: contain media removal/nsfw ops to create activities only	2018-09-10 01:16:01 +00:00
William Pitcock	e82ce2a4b3	formatting	2018-09-10 00:28:40 +00:00
William Pitcock	ac486fc59b	everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly	2018-09-10 00:14:47 +00:00
Dominique Feyer	801d645c6b	TASK: Fix formatting	2018-09-09 23:42:28 +02:00
Dominique Feyer	b79c126ee0	Add missing URL encoding in create authorization redirect	2018-09-09 23:31:47 +02:00
Hakaba Hitoyo	4e1bb7bccb	make limit for /api/v1/suggestions	2018-09-09 13:57:23 +09:00
lambda	045953225e	Merge branch 'moonman/pleroma-sha512-crypt' into 'develop' ... auth overhaul and legacy GS auth See merge request pleroma/pleroma!331	2018-09-08 09:20:34 +00:00
kaniini	530561a091	Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop' ... Add Secure and SameSite cookie flags See merge request pleroma/pleroma!302	2018-09-07 23:55:42 +00:00
Martin Kühl	c1d07da4e1	Mastodon API: Fake support for loading filters	2018-09-07 16:12:44 +02:00
Martin Kühl	619f67768a	Mastodon API: Add unsupported attributes to relationship responses ... These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values.	2018-09-07 16:12:44 +02:00
lain	70163aec9b	Add LegacyAuthenticationPlug to router.	2018-09-05 22:31:57 +02:00
lain	3aba585e7a	Add Plugs to router.	2018-09-05 21:57:56 +02:00
Haelwenn	4a3dbd9d4e	Merge branch 'fix/sign-in-with-toot' into 'develop' ... Fix sign-in and sign-out with Toot! See merge request pleroma/pleroma!306	2018-09-05 18:20:26 +00:00
lain	636ad3e155	Add new plugs to router.	2018-09-05 19:13:53 +02:00
kaniini	76c67a41c1	Merge branch 'develop' into 'feature/staff-discovery-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	2018-09-03 14:55:42 +00:00
William Pitcock	9a21ff5f61	nodeinfo: add staffAccounts field to metadata	2018-09-03 14:48:31 +00:00
kaniini	1c9e539b47	Merge branch 'feature/mastodon_api_2.4.x' into 'develop' ... Add/Fix Mastodon endpoints for 2.4.3 compatibility See merge request pleroma/pleroma!266	2018-09-03 12:33:36 +00:00
Hakaba Hitoyo	b1124f1605	report chat and gopher support at /nodeinfo/2.0.json	2018-09-03 21:13:30 +09:00
shadowfacts	35515cfa66	Update mastodon_api_controller.ex	2018-09-03 01:58:55 +00:00
shadowfacts	26f8697400	Update mastodon_api_controller.ex	2018-09-03 01:52:02 +00:00
shadowfacts	2b2bd0e047	Render notification IDs as strings, not numbers	2018-09-03 01:40:05 +00:00
kaniini	b7923aa304	Merge branch 'hotfix_broken_likes' into 'develop' ... hotfix for broken like completely breaking the notifications API See merge request pleroma/pleroma!284	2018-09-02 12:37:00 +00:00
kaniini	3c7280934e	Merge branch 'security/activitypub-spoofing' into 'develop' ... security: activitypub spoofing See merge request pleroma/pleroma!321	2018-09-01 23:48:55 +00:00
William Pitcock	03e92977cb	transmogrifier: fix peertube/plume actor handling	2018-09-01 23:44:19 +00:00
William Pitcock	0b2c051a04	activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor	2018-09-01 23:20:02 +00:00
William Pitcock	e2ce0e9e05	run mix format.	2018-09-01 21:12:42 +00:00
Martin Kühl	84d84e4ca4	OAuth: Support /revoke endpoint for revoking tokens ... (for compatibility with Mastodon)	2018-09-01 23:10:48 +02:00
Martin Kühl	ad2a7972e7	OAuth: Set created_at in token exchange response ... (for compatibility with Mastodon)	2018-09-01 23:10:48 +02:00
Martin Kühl	b60d232719	AccountView: sensitive is supposed to be a boolean, not a string	2018-09-01 23:10:48 +02:00
William Pitcock	c921d99898	config: add ability to disable Pleroma FE config management (closes #276)	2018-09-01 21:05:32 +00:00
kaniini	2e2f458705	Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop' ... Clean code duplication in MastoAPI search(v1/v2) See merge request pleroma/pleroma!316	2018-09-01 09:12:59 +00:00
Will Pearson	0c2a0e3551	Specify default scope in verify_credentials ... Certain Mastodon/Pleroma front ends call verify_credentials to get the default scope of a new toot. Currently, Pleroma hardcodes this value to "public". This patch changes it to the user's default_scope value.	2018-08-31 21:04:46 -07:00
Haelwenn (lanodan) Monnier	8885d16e1b	[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication	2018-09-01 03:11:58 +02:00
lambda	58539e1357	Revert "Merge branch 'feature/rich-text' into 'develop'" ... This reverts merge request !309	2018-08-31 09:51:20 +00:00
William Pitcock	856b5e1ca4	config: chase pleroma-fe updates from MR pleroma-fe!324.	2018-08-31 04:01:21 +00:00
kaniini	a26d5e6b2a	Merge branch 'feature/rich-text' into 'develop' ... rich text support See merge request pleroma/pleroma!309	2018-08-31 03:41:00 +00:00
William Pitcock	6aa65b68b8	common api: add support for formatting messages outside of twitter-style plain text	2018-08-31 03:13:59 +00:00
kaniini	e838969495	Merge branch 'use-media-proxy-in-suggestions-api' into 'develop' ... use media proxy for the suggestions api See merge request pleroma/pleroma!305	2018-08-30 23:06:30 +00:00
kaniini	65e8d47cfb	Merge branch 'backendhack' into 'develop' ... Flexible Storage Backends See merge request pleroma/pleroma!304	2018-08-30 23:05:01 +00:00
William Pitcock	29b5e30c46	activity: drop recipients_to/recipients_cc fields	2018-08-29 18:41:02 +00:00
William Pitcock	de9acebbf3	activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.	2018-08-29 18:41:02 +00:00
href	ddc6f32b75	Fix Mastodon API when actor's nickname is null	2018-08-29 16:32:50 +02:00
William Pitcock	cce9d008f9	streamer: contain list updates in the same way as we do with the database query	2018-08-29 09:23:05 +00:00
William Pitcock	ded9091206	mastodon api: use bounded AP object graph query to enforce containment of private statuses	2018-08-29 08:51:51 +00:00
William Pitcock	643fae6e36	activitypub: allow querying the activity/object graph bounded to a specific to/cc set	2018-08-29 08:51:23 +00:00
William Pitcock	81673b8136	activity: add recipients_to and recipients_cc fields	2018-08-29 08:42:33 +00:00
shibayashi	18ad8aaecf	Explicitly set 'http_only' to true	2018-08-28 22:34:31 +02:00
shibayashi	4656a07e9e	Set SameSite flag to 'Strict'	2018-08-28 14:03:29 +02:00
Hakaba Hitoyo	6cbfb5ab5d	use media proxy for suggestions api	2018-08-28 17:01:17 +09:00
Thurloat	0df558a6a5	cleaning up a bit.	2018-08-27 22:45:53 -03:00
shibayashi	0c4493f144	Fix formatting	2018-08-28 00:47:34 +02:00
shibayashi	b9a642da1e	Add Secure and SameSite cookie flags	2018-08-28 00:40:58 +02:00
Henry Jameson	0f1c629d65	better solution, added test.	2018-08-27 17:07:26 +03:00
Haelwenn (lanodan) Monnier	6973b77e94	[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable	2018-08-27 15:09:06 +02:00
Haelwenn (lanodan) Monnier	9bddb39ff0	[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A	2018-08-27 15:09:06 +02:00
Haelwenn (lanodan) Monnier	d571a571fe	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3	2018-08-27 15:09:06 +02:00
Haelwenn (lanodan) Monnier	6e030129fb	[MastodonAPI] Add filters	2018-08-27 15:09:05 +02:00
Haelwenn (lanodan) Monnier	a5adb251ab	[Pleroma.Web.MastodonAPI.AccountView]: Add fields support	2018-08-27 15:09:05 +02:00
Haelwenn (lanodan) Monnier	d008f2d69c	[Pleroma.Web.MastodonAPI.AccountView]: Add bot field	2018-08-27 15:09:04 +02:00
Haelwenn (lanodan) Monnier	97e20d2932	[MastodonAPI] the tag field isn’t fixed to a static type in pleroma	2018-08-27 15:08:25 +02:00
Haelwenn (lanodan) Monnier	83efaa3af6	[MastodonAPI] Add streaming of hashtags	2018-08-27 15:08:25 +02:00
lambda	46c7c2380c	Merge branch 'feature/relay' into 'develop' ... message relay Closes #144 See merge request pleroma/pleroma!264	2018-08-27 08:29:25 +00:00
lambda	440b459cd1	Merge branch 'bugfix/announce-timeline-flooding' into 'develop' ... activitypub: filter destination list for announce activities differently than normal (closes #164) Closes #164 See merge request pleroma/pleroma!227	2018-08-27 08:25:27 +00:00
kaniini	63094cfd3e	Merge branch 'feature/emoji-in-local-users' into 'develop' ... Add emoji to local user profiles. Closes #202 See merge request pleroma/pleroma!271	2018-08-26 23:24:41 +00:00
William Pitcock	bc3c30430e	fix formatting	2018-08-26 22:46:25 +00:00
kaniini	1ad5cbed51	Merge branch 'bugfix/common-api-visibility-orphan' into 'develop' ... common api: properly handle replying to orphaned threads See merge request pleroma/pleroma!299	2018-08-26 22:39:15 +00:00
William Pitcock	741c6ad671	common api: handle replying to orphaned threads	2018-08-26 22:37:36 +00:00
kaniini	c9e4c45e0e	Merge branch 'login-with-email' into 'develop' ... When logging in, try treating the login as an email Closes #245 See merge request pleroma/pleroma!295	2018-08-26 21:35:12 +00:00
kaniini	0f5bff8c66	Merge branch 'develop' into 'feature/relay' ... # Conflicts: # lib/pleroma/web/activity_pub/utils.ex	2018-08-26 21:06:15 +00:00
hakabahitoyo	946a0769c4	remove unused settings from /api/statusnet/config	2018-08-26 17:40:15 +09:00
Ekaterina Vaartis	540cce5d10	When logging in, try treating the login as an email ... Closes #245	2018-08-25 23:29:03 +03:00
William Pitcock	aab2bdddf4	twitter api: provide object descriptions as attachment description field	2018-08-25 00:12:58 +00:00
kaniini	9ded0ee1a5	Merge branch 'config/fe-collapse-subject' into 'develop' ... fe config: add collapse_message_with_subject fe option See merge request pleroma/pleroma!289	2018-08-24 18:27:43 +00:00
William Pitcock	09cb402203	fe config: add collapse_message_with_subject fe option	2018-08-24 18:21:42 +00:00
hakabahitoyo	bf9f68b681	debug	2018-08-23 11:52:18 +09:00
William Pitcock	a909fe45a6	formatting	2018-08-23 01:34:36 +00:00
William Pitcock	52b44184b4	transmogrifier: reject activities lacking a valid ID	2018-08-23 01:25:26 +00:00
Henry Jameson	9b046d2a84	fixed notifications API completely breaking if there's a like for ... missing (deleted) post.	2018-08-22 16:10:59 +03:00
Haelwenn (lanodan) Monnier	d5bdd55b5d	[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil	2018-08-22 01:47:25 +02:00
Haelwenn (lanodan) Monnier	5dde6e4a00	[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos	2018-08-22 01:46:26 +02:00
kaniini	f6b06d2ac8	Merge branch 'feature/peertube_2' into 'develop' ... rebase/update of feature/peertube See merge request pleroma/pleroma!217	2018-08-21 16:58:44 +00:00
kaniini	a6d4cc8917	Merge branch 'sanitize-bio' into 'develop' ... mastodon api: sanitize the bio HTML See merge request pleroma/pleroma!282	2018-08-21 16:56:24 +00:00
Haelwenn (lanodan) Monnier	046741c60d	[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles	2018-08-21 18:34:56 +02:00
Haelwenn (lanodan) Monnier	f5b056e3ce	[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes	2018-08-21 18:26:12 +02:00
Haelwenn (lanodan) Monnier	3b8ef24532	Fix attachement rendering	2018-08-21 18:24:10 +02:00
lain	a6b021a52b	Render peertube videos in mastodon.	2018-08-21 18:24:10 +02:00
lain	c381d0b577	Use activitypub to fetch posts. ... This falls back to ostatus.	2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier	74c74decf5	Basic peertube support.	2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier	ef4f982e2c	Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)	2018-08-21 18:24:06 +02:00
ensra	1495d04789	fix test for converting bio \r\n to <br>.	2018-08-21 14:51:27 +01:00
ensra	cdb3dd48ab	Format	2018-08-21 14:12:55 +01:00
ensra	5debd7b5cc	Twitter API: Support Mastodon-style bios ... (multi-line, with links, and user mentions)	2018-08-21 14:03:36 +01:00
ensra	175f0bebbc	mastodon api: sanitize the bio HTML	2018-08-21 10:53:53 +01:00
kaniini	c1b8a6a73b	Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop' ... formatter: consistent presentation of hashtags and mentions See merge request pleroma/pleroma!280	2018-08-20 18:44:52 +00:00
William Pitcock	c033d2004b	formatting	2018-08-20 18:40:05 +00:00
William Pitcock	145546e52a	common api: format hashtags in the same way as we format mentions	2018-08-20 18:39:47 +00:00
eal	f1c407e777	Merge branch 'fix/redirect-on-user-fetch' into 'develop' ... ActivityPub: follow redirects when fetching user See merge request pleroma/pleroma!278	2018-08-20 12:13:07 +00:00
eal	51a21284c6	ActivityPub: follow redirects when fetching user	2018-08-20 15:03:25 +03:00
shadowfacts	6698749073	Fix typo in app creation response ... Mastodon sends redirect_uri (singular), so should Pleroma.	2018-08-17 12:48:24 +00:00
William Pitcock	a3ef2ebb35	mastodon api controller: client_name, not name	2018-08-16 23:50:49 +00:00
William Pitcock	b5a92b1199	mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does	2018-08-16 23:40:42 +00:00
kaniini	c004b6ea0a	Merge branch 'mastofe/system-font' into 'develop' ... Mastodon frontend: Use system font See merge request pleroma/pleroma!247	2018-08-16 15:38:59 +00:00
kaniini	5fbb14f5ec	Merge branch 'bugfix/federation-kroeg' into 'develop' ... fix federation with kroeg See merge request pleroma/pleroma!272	2018-08-16 15:20:15 +00:00
kaniini	38361e7b5e	Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' ... Fix: Output repeats at ActivityPub outbox Closes #191 See merge request pleroma/pleroma!175	2018-08-16 15:19:46 +00:00
lambda	9908cf8fda	Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop' ... Feature / Suggestions API with third party recommendation engine See merge request pleroma/pleroma!254	2018-08-15 07:47:33 +00:00
William Pitcock	f446e75577	activitypub: transmogrifier: add necessary translations for kroeg	2018-08-14 17:09:11 +00:00
eal	92caa2632b	Use Image type for emoji icons.	2018-08-13 16:21:18 +03:00
eal	1ed1ff17a4	ActivityPub user view: include tag if present.	2018-08-13 16:11:48 +03:00
eal	f9d13558c8	CommonAPI: add emoji to user source data on update	2018-08-13 15:27:20 +03:00
lain	8c0c930041	formatting	2018-08-12 19:42:21 +02:00
lain	ffd9ad1f0c	Fix for elixir 1.7.	2018-08-12 18:41:33 +02:00
lambda	13440a80e1	Merge branch 'feature/invites' into 'develop' ... Invites Closes #108 See merge request pleroma/pleroma!208	2018-08-12 12:04:15 +00:00
lambda	9de6145737	Merge branch 'fix/remote-follow-errormessage' into 'develop' ... Remote follow: don't show confusing error if already following See merge request pleroma/pleroma!267	2018-08-12 10:55:53 +00:00
eal	db5cdfa333	Remote follow: don't show confusing error if already following	2018-08-09 20:47:29 +03:00
eal	37b802682c	HTML-sanitize usernames before emojifying.	2018-08-09 13:07:03 +03:00
eal	ed9738e031	Add tests for emoji in user profiles ... Also use the correct field in TwitterAPI...	2018-08-08 09:24:50 +03:00
eal	cee63ad3f7	TwitterAPI user view: add screen_name_html and description_html.	2018-08-08 08:38:25 +03:00
eal	c2d1a5e9c4	MastoAPI AccountView: render profile emoji.	2018-08-07 21:56:50 +03:00
William Pitcock	de6be63b1b	activitypub: do not show observable effects of non-public boosts	2018-08-06 11:28:57 +00:00
William Pitcock	5202d4ce10	relay: do not relay in test mode	2018-08-06 08:35:56 +00:00
William Pitcock	0ca9b9ff96	run mix format	2018-08-06 08:26:36 +00:00
William Pitcock	5abf9ad602	relay: reintroduce @allow_relay	2018-08-06 08:22:18 +00:00
William Pitcock	1e1a29f084	activitypub: relay: fix up AS2 actor object	2018-08-06 08:22:17 +00:00
William Pitcock	e49131bb72	relay: move to /relay endpoint from / due to webapp issues	2018-08-06 08:22:16 +00:00
William Pitcock	2b628f2341	relay: only relay create activities	2018-08-06 08:22:16 +00:00
William Pitcock	56dc8db582	activitypub: relay: add relay following/followers collection URLs	2018-08-06 08:22:14 +00:00
William Pitcock	1c40a631e8	federator: actually relay the public activities	2018-08-06 08:22:14 +00:00
William Pitcock	f9b0fc4ddb	relay: remove @allow_relay for the moment	2018-08-06 08:22:13 +00:00
William Pitcock	266b314051	relay: fix invoking federator, use a timer to sleep the mix task to force a context switch	2018-08-06 08:22:12 +00:00
William Pitcock	99be3d3dcc	relay: add relay follow/unfollow tasks	2018-08-06 08:22:12 +00:00
William Pitcock	1c90f88393	user: remote actors can have no nickname if they are virtual services	2018-08-06 08:22:11 +00:00
William Pitcock	7bed350a23	config: allow relaying to be disabled	2018-08-06 08:22:10 +00:00
William Pitcock	b7ca7f282a	activitypub: refactor relay concerns into new relay module	2018-08-06 08:22:10 +00:00
William Pitcock	00e890264c	activitypub: represent relay actor at instance root	2018-08-06 08:22:09 +00:00
Hakaba Hitoyo	f72cfada1a	add suggestions/web config	2018-08-02 18:03:35 +09:00
William Pitcock	3be58ad34e	activitypub: actually send digest header when federating ... this is needed for backwards compatibility with non-digest pleroma instances	2018-08-01 10:32:02 +00:00
William Pitcock	8da406afa2	activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header	2018-07-31 23:24:30 +00:00
William Pitcock	2890aef9e8	activitypub: add digest header to outbound messages and sign it	2018-07-31 23:24:30 +00:00
Hakaba Hitoyo	cc9c062b55	merge	2018-07-19 17:42:00 +09:00
lambda	41b0ecef95	Merge branch 'tests/plume' into 'develop' ... Articles/Notes with a actor list outside object See merge request pleroma/pleroma!252	2018-07-19 07:35:34 +00:00
lambda	54963a6379	Merge branch 'bugfix/activitystreams-notice-urls' into 'develop' ... ostatus: return AS2 objects on /notice and /activities URLs like with /objects. Closes #206 See merge request pleroma/pleroma!251	2018-07-19 07:31:33 +00:00
lambda	6f23fb53d3	Merge branch 'feature/fe-configuration' into 'develop' ... serverside frontend configuration See merge request pleroma/pleroma!256	2018-07-19 07:31:10 +00:00
Hakaba Hitoyo	b12d17d2ce	configurable timeout	2018-07-18 13:36:20 +09:00
Hakaba Hitoyo	e4dd58307a	better configuration	2018-07-18 09:58:59 +09:00
William Pitcock	b23630076f	TwitterAPI: present pleroma frontend config in API	2018-07-17 15:46:24 +00:00
William Pitcock	cf219b6add	config: make instance description configurable	2018-07-17 15:46:23 +00:00
Hakaba Hitoyo	5b4a21317d	correct error message	2018-07-17 17:29:18 +09:00
Hakaba Hitoyo	8ff336e02a	debug	2018-07-17 17:00:14 +09:00
Hakaba Hitoyo	2b7b1b3e6b	add suggestionsThirdPartyEngine into /nodeinfo/2.0.json	2018-07-17 16:56:30 +09:00
Hakaba Hitoyo	d76f0d87be	do nothing if configuration is skipped	2018-07-17 16:45:18 +09:00
Hakaba Hitoyo	df3233e7e7	improve getting host name	2018-07-17 13:20:58 +09:00
William Pitcock	99c0252314	mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload	2018-07-17 03:40:47 +00:00
William Pitcock	cd19d37a90	mastodon api: use object name as alt text	2018-07-17 03:40:46 +00:00
hakabahitoyo	e7c580828c	format	2018-07-15 20:36:26 +09:00
hakabahitoyo	2eeaf01627	id field	2018-07-14 14:03:30 +09:00
hakabahitoyo	127882a5d5	configurable	2018-07-14 11:41:09 +09:00
hakabahitoyo	eb0afda3a7	http access to third party user recommendation	2018-07-14 10:04:37 +09:00
hakabahitoyo	3812b627ca	better mock /api/v1/suggestions	2018-07-14 00:52:23 +09:00
hakabahitoyo	4a21c1b343	mock /api/v1/suggestions	2018-07-14 00:44:18 +09:00
hakabahitoyo	f944f8157a	/api/v1/suggestions endpoint	2018-07-14 00:21:38 +09:00
Haelwenn (lanodan) Monnier	7501481db4	[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding	2018-07-12 23:37:07 +02:00
Haelwenn (lanodan) Monnier	8472fba2a7	[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object ... The code here is copied from feature/peertube by lain. Co-authored-by: lain <lain@soykaf.club>	2018-07-12 23:37:00 +02:00
William Pitcock	0899588e4d	ostatus: return AS2 objects on /notice and /activities URLs like with /objects.	2018-07-12 17:15:47 +00:00
lambda	d93789dfde	Merge branch 'feature/object-normalization' into 'develop' ... object normalization See merge request pleroma/pleroma!238	2018-07-12 16:48:15 +00:00
lambda	ceffb91065	Merge branch 'feature/mediaproxy-nodeinfo' into 'develop' ... [Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata Closes #229 See merge request pleroma/pleroma!235	2018-07-12 16:47:19 +00:00
lambda	b1fcfcfae1	Merge branch 'bugfix/activitypub-object-actor' into 'develop' ... activitypub: more robustly handle object-to-actor associations See merge request pleroma/pleroma!250	2018-07-12 16:46:50 +00:00
William Pitcock	590d4df77c	activitypub: more robustly handle object-to-actor associations	2018-07-12 16:39:03 +00:00
William Pitcock	b832df1e15	formatting	2018-07-12 16:12:54 +00:00
William Pitcock	f03e57f764	twitter api: activity representer: add summary field for testsuite	2018-07-12 16:12:16 +00:00
William Pitcock	152a526237	twitter api: refactor activity html generation, add support for Articles	2018-07-12 16:11:42 +00:00
William Pitcock	3b799f22b7	twitterapi: activity view: expose message summary text	2018-07-12 16:11:36 +00:00
lambda	b806aa36c8	Update nodeinfo_controller.ex	2018-07-12 06:00:55 +00:00
lambda	fe4387077a	Merge branch 'feature/default-scope' into 'develop' ... default scope setting See merge request pleroma/pleroma!239	2018-07-12 05:59:12 +00:00
lambda	4a922305af	Merge branch 'feature/article-support' into 'develop' ... article support (plume, etc) See merge request pleroma/pleroma!240	2018-07-12 05:58:39 +00:00
lambda	33b0334216	Merge branch 'bugfix/status-url-field' into 'develop' ... [Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses Closes #231 See merge request pleroma/pleroma!246	2018-07-12 05:55:20 +00:00
William Pitcock	8546551257	activitypub: switch to using x509 representation for public keys instead of pkcs#1	2018-07-12 03:30:22 +00:00
Haelwenn (lanodan) Monnier	4326cb9920	[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/229	2018-07-12 02:06:46 +02:00
Haelwenn (lanodan) Monnier	7a351cb36f	[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/231	2018-07-12 01:57:25 +02:00
Haelwenn (lanodan) Monnier	835345754d	/web/* template: Add class system-font	2018-07-03 17:26:47 +02:00
William Pitcock	971bb4f2bd	activity interpretation: formatting	2018-06-27 13:38:19 +00:00
William Pitcock	66819ea784	twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic	2018-06-27 13:38:07 +00:00
William Pitcock	ea982e7503	mastodon api: add interpreter for Article activity types	2018-06-27 13:38:00 +00:00
William Pitcock	121c1f6230	twitter api: refactor activity html generation, add support for Articles	2018-06-27 13:37:53 +00:00
William Pitcock	bd479606ba	utils: make_create_data: add support for Article objects	2018-06-27 13:37:35 +00:00
William Pitcock	c42f28b82c	transmogrifier: accept Article activities	2018-06-27 13:37:26 +00:00
William Pitcock	2f14996d9a	twitter api: allow setting default_scope	2018-06-27 13:15:55 +00:00
William Pitcock	dcdf7b6686	twitter api: user view: show default message scope if known	2018-06-27 13:15:50 +00:00
William Pitcock	4f6de34f4f	mastodon api: use info["default_scope"] if available for post scope	2018-06-27 13:15:42 +00:00
William Pitcock	7c63e70de1	activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.	2018-06-27 13:08:12 +00:00
William Pitcock	6f4ca7ddf7	ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().	2018-06-27 13:08:05 +00:00
William Pitcock	5b240c3b18	federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().	2018-06-27 13:07:55 +00:00
William Pitcock	bc05548370	ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.	2018-06-27 13:07:45 +00:00
William Pitcock	49da04c509	common api: use Object.normalize() instead of Object.get_by_ap_id() directly.	2018-06-27 13:07:35 +00:00
William Pitcock	15d624e077	activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.	2018-06-27 13:07:29 +00:00
William Pitcock	fb04fecfb4	streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.	2018-06-27 13:07:23 +00:00
Haelwenn (lanodan) Monnier	beb940a57e	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state ... Related to https://git.pleroma.social/pleroma/mastofe/issues/20	2018-06-26 20:48:35 +02:00
lambda	fc012491a5	Merge branch 'fix/mutes.json-emptyarray' into 'develop' ... Return empty array from /api/qvitter/mutes.json See merge request pleroma/pleroma!234	2018-06-25 08:45:42 +00:00
lambda	dfc96f222c	Merge branch 'feature/configurable-blocks' into 'develop' ... Add more configurability to how blocks work See merge request pleroma/pleroma!203	2018-06-25 06:12:29 +00:00
squidboi	ea214b8ba6	combined outgoing_blocks with statement	2018-06-24 23:05:44 -07:00
Vivian Lim	6160a1b3c0	mix format	2018-06-24 15:24:41 -07:00
Vivian Lim	1299bccc7d	return unquoted empty array from /api/qvitter/mutes.json	2018-06-23 23:20:30 -07:00
Vivian Lim	6316003946	fixes- found that TwitterAPI.Controller adds .json suffix already	2018-06-23 23:05:54 -07:00
Vivian Lim	f2badd4424	return empty array for api/qvitter/mutes.json queries instead of html	2018-06-23 22:21:39 -07:00
squidboi	c4038ede07	fix mind-crushingly dumb syntax error	2018-06-23 14:32:00 -07:00
squidboi	f4990283de	change moved attributes into normal variables	2018-06-23 14:27:07 -07:00
squidboi	4e099fcfa9	move configurable module attributes into relevant functions	2018-06-23 14:16:08 -07:00
Haelwenn (lanodan) Monnier	5a4a45b875	[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars	2018-06-23 16:22:49 +02:00
Haelwenn (lanodan) Monnier	a05c0ff61d	[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search	2018-06-23 16:22:47 +02:00
Haelwenn (lanodan) Monnier	359093d73b	Fake 2.4.0 API	2018-06-23 16:12:57 +02:00
Haelwenn (lanodan) Monnier	c45133377a	lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format ... Hnng!	2018-06-23 16:12:57 +02:00
William Pitcock	60d6038be5	mrf simple: add accept lists ... accept lists supplement reject lists by requiring that any message accepted by contained by the accept list. in other words, this functionality can be used to implement instances similar to awoo.space.	2018-06-19 21:28:24 +00:00
lambda	90cf75f4a7	Merge branch 'features/column_media_streaming' into 'develop' ... Add streaming to media tabs of federated and local TLs See merge request pleroma/pleroma!225	2018-06-19 09:50:05 +00:00
lambda	db0731b6ac	Merge branch 'feature/exclude-replies-filter' into 'develop' ... activitypub: support filtering activities by whether or not they are a reply (closes #109) Closes #109 See merge request pleroma/pleroma!226	2018-06-19 05:15:11 +00:00
William Pitcock	c95941e64d	activitypub transmogrifier: fix handling of contentMap.	2018-06-18 22:14:50 +00:00
William Pitcock	6f384d35dd	ostatus: we need to include the original author of a message as a mention ... this is due to the use of activity.recipients which may not necessarily contain the original author if the actors are not following each other.	2018-06-18 05:27:09 +00:00
William Pitcock	591c82620e	activitypub: filter destination list for announce activities differently than normal (closes #164)	2018-06-18 04:36:25 +00:00
William Pitcock	4f589998ee	activitypub: support filtering activities by whether or not they are a reply (closes #109)	2018-06-18 03:21:32 +00:00
Haelwenn (lanodan) Monnier	b670d4d683	MastodonAPI: Add streaming to media tabs of federated and local TLs	2018-06-17 16:17:15 +02:00
Henry Jameson	0b1ca6a584	Token-generating task	2018-06-17 14:30:07 +03:00
squidboi	2e294ee44a	Merge branch 'develop' into feature/configurable-blocks	2018-06-16 15:37:16 -07:00
lambda	1ea4a18ad8	Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop' ... Configs for mrf_rejectnonpublic See merge request pleroma/pleroma!205	2018-06-16 10:39:36 +00:00
eal	a938d07df1	Merge branch 'bugfix/mastofe_thread_render' into 'develop' ... lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads See merge request pleroma/pleroma!223	2018-06-15 20:43:30 +00:00
Haelwenn (lanodan) Monnier	72c2915ecd	Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads	2018-06-15 22:14:17 +02:00
lain	00d7d109ef	Fix typo	2018-06-15 22:01:17 +02:00
lambda	2723fb5150	Merge branch 'bugfix/mrf-orphaning' into 'develop' ... activitypub transmogrifier: handle activity lookup failure Closes #156 See merge request pleroma/pleroma!216	2018-06-14 07:20:54 +00:00
lambda	8c7fdcb31b	Merge branch 'feature/twitterapi-unrepeat' into 'develop' ... Add TwitterAPI unretweet endpoint and cleanup AP.unannounce See merge request pleroma/pleroma!218	2018-06-14 07:19:36 +00:00
lambda	2c303b3302	Merge branch 'bugfix/oauth2-param-name' into 'develop' ... oauth: support either name or username parameter with grant_type=password Closes #180 See merge request pleroma/pleroma!219	2018-06-14 07:14:18 +00:00
lambda	280ac243aa	Merge branch 'bugfix/oauth-password-with-email' into 'develop' ... oauth: fix password-based login when username is email address Closes #199 See merge request pleroma/pleroma!220	2018-06-14 07:13:05 +00:00
William Pitcock	5442466569	oauth: fix password-based login when username is email address ... closes #199	2018-06-14 02:32:30 +00:00
William Pitcock	4894b88b1b	oauth: support either name or username parameter with grant_type=password ... closes #180	2018-06-14 02:07:43 +00:00
Francis Dinh	1555c66650	Add unretweet TwAPI endpoint and cleanup AP.unannounce	2018-06-13 21:33:36 -04:00
William Pitcock	401e8af943	activitypub transmogrifier: handle activity lookup failure ... with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the same way as any other orphaned activity. closes #156	2018-06-13 22:19:38 +00:00
William Pitcock	b5bc08fac3	streamer: don't relay boosts of messages which would otherwise be blocked	2018-06-13 21:59:56 +00:00
lambda	ea42ba603f	Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop' ... webfinger: send JRD by default instead of XRD See merge request pleroma/pleroma!211	2018-06-13 07:18:03 +00:00
William Pitcock	3d402a9e20	webfinger: send JRD by default instead of XRD ... JRD being the default representation for WebFinger responses was standardized 5 years ago in RFC 7033.	2018-06-13 07:03:14 +00:00
William Pitcock	59f95a7095	webfinger: refactor webfinger() functions ... - remove code duplication - move user lookup to parent with statement - tighten both user lookup by nickname and activitypub URI with a type constraint	2018-06-13 06:42:27 +00:00
Henry Jameson	9c1cf1befb	formatting	2018-06-12 15:01:40 +03:00
Henry Jameson	f42ffbe9a8	Initial invites support + tests.	2018-06-12 14:55:16 +03:00
lambda	3f42806b1b	Merge branch 'develop' into 'develop' ... Dedupe uploads See merge request pleroma/pleroma!115	2018-06-12 08:26:26 +00:00
lambda	564c73ab24	Merge branch 'feature/list-streaming' into 'develop' ... MastoAPI: Add streaming for lists. See merge request pleroma/pleroma!183	2018-06-12 07:19:45 +00:00
William Pitcock	9810471237	router: remove stub /domain_blocks entry	2018-06-11 23:40:19 +00:00
William Pitcock	f8e0942745	twitter api: add approve/deny endpoints	2018-06-11 22:15:53 +00:00
William Pitcock	e08cf21e5b	twitter api: add friend requests list api	2018-06-11 22:15:53 +00:00
William Pitcock	ba8dab7542	twitterapi: user view: return if an account is locked or not	2018-06-11 22:15:53 +00:00
William Pitcock	d96377f359	activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it	2018-06-11 22:15:53 +00:00
William Pitcock	5eed1ea181	run mix format	2018-06-11 22:15:53 +00:00
William Pitcock	993312cdb3	twitterapi: add profile setting for locked/unlocked accounts	2018-06-11 22:15:53 +00:00
William Pitcock	4084889a2d	activitypub transmogrifier: remove debug code	2018-06-11 22:15:53 +00:00
William Pitcock	1452b2823f	user: add a workaround for situations where Pleroma may believe a followee is followed ... this was caused by lack of Undo follows in the early days, and can likely be eventually removed	2018-06-11 22:15:53 +00:00
William Pitcock	76f80ba8c2	activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused	2018-06-11 22:15:53 +00:00
William Pitcock	a2c4a5a75b	mastodon api: allow setting an account locked or not	2018-06-11 22:15:53 +00:00
William Pitcock	f328de8eb7	activitypub transmogrifier: send Rejects in the format Mastodon wants	2018-06-11 22:15:53 +00:00
William Pitcock	876ad6aa38	activitypub transmogrifier: send @context on accept activities	2018-06-11 22:15:53 +00:00
William Pitcock	760eb72a38	add a bunch of stuff	2018-06-11 22:15:53 +00:00
William Pitcock	6f89d2d583	stash api controller	2018-06-11 22:15:53 +00:00
William Pitcock	9c88933422	implement tracking of follow requests	2018-06-11 22:15:53 +00:00
William Pitcock	6041380774	activitypub transmogrifier: learn locked state in Update messages	2018-06-11 22:15:27 +00:00
William Pitcock	e5206752e1	activitypub: only send accept back automatically if the account is not locked	2018-06-11 22:15:27 +00:00
lambda	7f79b467b1	Merge branch 'feature/domain-blocks' into 'develop' ... Domain blocks See merge request pleroma/pleroma!190	2018-06-11 11:19:45 +00:00
squidboi	07f0cfa53f	add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic	2018-06-10 16:40:51 -07:00
squidboi	4f9ecfc77a	formatting	2018-06-09 04:28:11 +00:00
squidboi	8903f1ad4d	more fixes	2018-06-08 19:07:14 -07:00
squidboi	16d896f526	fixes	2018-06-08 19:01:14 -07:00
squidboi	2847fc8f90	add option to not unfollow on block, and option to not federate outgoing blocks	2018-06-08 17:12:16 -07:00
lambda	45a935f0bd	Merge branch 'users' into 'develop' ... Fix users lookup/return type See merge request pleroma/pleroma!201	2018-06-08 11:10:10 +00:00
lambda	bb639a362e	Merge branch 'feature/rejectnonpublic' into 'develop' ... Add MRF to drop all posts with "followers-only" or "direct" privacy settings See merge request pleroma/pleroma!202	2018-06-08 11:08:50 +00:00