752 commits

Author	SHA1	Message	Date
lain	ab27c90c9f	ActivityPub: Handle attachments.	2018-02-17 18:38:58 +01:00
lain	fb7b926be3	Handle black name fields on incoming users.	2018-02-17 18:15:48 +01:00
lain	c2d0cb1a29	ActivtyPub Delivery: Use shared inbox if possible.	2018-02-17 16:18:10 +01:00
lain	7b26443a76	ActivityPub: Send out Accept after Follow.	2018-02-17 16:08:55 +01:00
lain	e7b73359e3	ActivityPub: Partly handle incoming follows.	2018-02-17 14:55:44 +01:00
lain	5682e48a25	ActivityPub: tags -> tag.	2018-02-17 14:20:53 +01:00
lain	05ba6ca1b8	Do some transmogrifying for the output.	2018-02-17 14:11:20 +01:00
lain	5a371892a0	Fix specs.	2018-02-17 10:26:44 +01:00
lain	7851b9ba81	ActivityPub: Use recipients fields.	2018-02-15 20:32:07 +01:00
lain	5454ec6a6c	ActivityPubController: Handle inbox data.	2018-02-15 20:00:43 +01:00
lain	ef0300889d	Transmogrifier: Handle basic notice creation.	2018-02-15 20:00:06 +01:00
lain	ae26604378	ActivityPub: Refactor create function.	2018-02-15 19:59:35 +01:00
lain	38b61fddfe	HttpSignature Plug: Skip if already valid.	2018-02-15 19:58:26 +01:00
lain	b331cb449a	Merge branch 'develop' into feature/activitypub	2018-02-12 10:24:15 +01:00
lain	26ccb768d3	Make test output easier to read.	2018-02-12 10:14:11 +01:00
lain	91928b06ab	Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop	2018-02-12 08:15:37 +01:00
lain	8cf97ee8e1	ActivityPub: Basic note federation with Mastodon.	2018-02-11 20:43:33 +01:00
lain	ce31f3a922	Twitter Representers: Handle Mastodon attachments.	2018-02-11 17:21:06 +01:00
Roger Braun	ae1ec858f4	Basic AP user building.	2018-02-11 17:20:43 +01:00
Roger Braun	52200998c9	Merge branch 'develop' into feature/activitypub	2018-02-11 09:50:55 +01:00
hakabahitoyo	a61f21ff4f	print <link rel="next"> element in atom.feed	2018-02-09 23:10:32 +09:00
Hakaba Hitoyo	7124f12a94	introduce max_id parameter in feed.atom (debug)	2018-02-09 21:46:05 +09:00
Roger Braun	08f458e6df	UtilController: Fix statusnet config api compatibility.	2018-02-09 13:43:12 +01:00
Hakaba Hitoyo	9c61f60558	introduce max_id parameter in feed.atom	2018-02-09 21:41:30 +09:00
lambda	af854f7e01	Merge branch 'develop' into 'develop' ... action_fallback for OAuth Controller See merge request pleroma/pleroma!63	2018-02-09 08:57:54 +00:00
lambda	f0cde24f71	Merge branch 'fix/config-disable-chat' into 'develop' ... Add config option for enabling/disabling chat. See merge request pleroma/pleroma!58	2018-02-08 18:18:28 +00:00
Calv Collins	73249fa5ff	Changed fallback controller to handle all cases from OAuthController	2018-02-08 18:15:59 +00:00
Calv Collins	314f4775c5	Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop	2018-02-08 16:58:31 +00:00
Calv Collins	bdb5dd2194	Create action_fallback for username/password incorrect input	2018-02-08 16:57:30 +00:00
Roger Braun	2f291576e4	Fix compile errors on 1.4.5	2018-02-08 16:03:30 +01:00
eal	286f6698ee	Detect file type if none given.	2018-02-04 15:22:30 +02:00
lambda	61c16193de	Merge branch 'move-backend-images' into 'develop' ... Move avi.png & banner.png from /priv/static/static to /priv/static/images See merge request pleroma/pleroma!60	2018-02-03 13:05:20 +00:00
Hakaba Hitoyo	c8a2931549	add backend endpoint /images	2018-02-03 20:52:01 +09:00
Hakaba Hitoyo	ea6d1b2b17	move avi.png & banner.png from /priv/static/static to /priv/static/images	2018-02-03 20:43:14 +09:00
eal	f0745148a3	Add config option for enabling/disabling chat.	2018-02-03 13:42:37 +02:00
eal	29be70c008	Add remote following of local profiles.	2018-02-02 00:14:05 +02:00
eal	ab83e0de6d	TwitterAPI: Add is_local to user view.	2018-02-01 21:41:19 +02:00
eal	0f194dc56b	Merge branch 'feature/instance-thumbnail-api' into 'develop' ... Provide instance thumbnail in /api/v1/instance See merge request pleroma/pleroma!55	2018-01-31 18:34:52 +00:00
eal	ab8b9ababa	Split emoji to default and custom.	2018-01-31 16:29:22 +02:00
Hakaba Hitoyo	03c15a54f5	provide instance thumbnail at /api/v1/instance (debug)	2018-01-31 23:09:47 +09:00
Hakaba Hitoyo	e47f60c053	provide instance thumbnail at /api/v1/instance (debug)	2018-01-31 23:04:34 +09:00
Hakaba Hitoyo	a4335e391f	provide instance thumbnail at /api/v1/instance	2018-01-31 22:51:25 +09:00
Roger Braun	5e37adedfb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-01-30 12:21:05 +01:00
Roger Braun	ad0ab3a57b	Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop	2018-01-30 12:20:39 +01:00
Hakaba Hitoyo	cefb6cfea1	provide logo at feed.atom (debug)	2018-01-30 19:37:04 +09:00
Hakaba Hitoyo	b713b28dfd	provide logo at feed.atom	2018-01-30 19:26:07 +09:00
lambda	2f23ae5b68	Merge branch 'pr-upstream-http-proxy' into 'develop' ... Pr upstream http proxy See merge request pleroma/pleroma!43	2018-01-30 08:16:31 +00:00
Roger Braun	64e51c2cfa	Fix incoming Pleroma CWs. Closes #96.	2018-01-29 17:44:35 +01:00
Jeff Becker	066fe1a697	use nil instead of empty string	2018-01-29 10:06:16 -05:00
Jeff Becker	dffde6631d	Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy	2018-01-24 13:15:54 -05:00