836 commits

Author	SHA1	Message	Date
KANEKO Yoshitaka	b3d67750f0	Fix conflict	2018-04-01 16:58:35 +09:00
lambda	5fa8237bc1	Merge branch 'new-mastofe' into 'develop' ... Bring Mastodon frontend up-to-date See merge request pleroma/pleroma!87	2018-03-31 19:33:17 +00:00
lain	2222e5599c	Don't fetch anything except ap_id for follower / following ... collections. Should speed up the queries because ecto doesn't have to parse the json.	2018-03-31 20:02:09 +02:00
Morgan Bazalgette	7f2174d811	Remove pl-dark-masto-fe, add preloading for common scripts	2018-03-31 19:14:47 +02:00
lain	802736679c	Remove unused ActivityRepresenter module.	2018-03-30 16:50:30 +02:00
lain	7ab94ae22d	TwitterApiController: Use ActivityView.	2018-03-30 16:30:16 +02:00
lain	e90f8f6c4b	TwApi ActivityView: Add delete activities.	2018-03-30 15:32:43 +02:00
lain	1f32ba052c	TwApi ActivityView: Add follows.	2018-03-30 15:17:13 +02:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
lain	480932c8e5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-03-30 14:48:08 +02:00
lain	c1d529ee94	TwApi ActivityView: Add announces.	2018-03-30 14:46:36 +02:00
lain	1f1caab138	TwApi ActivityView: Add Like rendering.	2018-03-30 13:49:09 +02:00
lain	675839e13c	Fix TwApi reply visibility.	2018-03-30 12:19:57 +02:00
Morgan Bazalgette	457e040473	Add char_limit to initial-state of mastofe	2018-03-30 00:59:49 +02:00
lain	df8fc72491	Don't go through all available emoji. ... object carry their emoji information.	2018-03-28 09:56:32 +02:00
lain	e30752bc79	Add basic activity view.	2018-03-27 22:24:19 +02:00
lain	37e5014d3e	Reduce OP fetching queries.	2018-03-27 18:18:24 +02:00
lain	ff7afe46b9	Don't try to fetch OP if none is there.	2018-03-27 17:43:08 +02:00
lain	d2099c849d	More Jason changes.	2018-03-27 16:45:38 +02:00
lain	fbc187ac15	Switch to Jason for json handling. ... It's twice as fast and will be the standard in the coming ecto.	2018-03-27 16:09:08 +02:00
lain	46f63ea8af	Fix atom feed pagination.	2018-03-26 09:51:43 +02:00
lain	2c1c221301	Fix follower collection id.	2018-03-25 19:34:33 +02:00
lain	09de76ad5a	Return "audio" info in mastodon api.	2018-03-25 17:08:54 +02:00
lambda	809bffbb21	Merge branch 'feature/oauth-token-password' into 'develop' ... oauth: implement grant_type=password for single-page apps See merge request pleroma/pleroma!81	2018-03-25 13:40:06 +00:00
KANEKO Yoshitaka	aa19fdef00	Fix favicon and add to index.html	2018-03-25 19:58:12 +09:00
William Pitcock	2aea3bc632	activitypub transmogrifier: rewrite incoming hashtags	2018-03-24 16:42:17 -05:00
lain	847cb15626	Fix tests.	2018-03-24 15:09:09 +01:00
lain	c7be7a9454	Unify user fetching.	2018-03-24 15:02:43 +01:00
lain	e3a81fe58f	Fetch the same data from json webfinger as from xml webfinger.	2018-03-24 14:45:54 +01:00
lain	eb7ce61ca5	Fix hashtags.	2018-03-24 11:03:10 +01:00
William Pitcock	dd21137f38	oauth: implement grant_type=password for single-page apps	2018-03-23 15:53:58 -05:00
lain	fbe9aa3506	Strip html from emoji stuff.	2018-03-23 19:52:08 +01:00
lain	5da2355e71	For outgoing objects, fake mastodon style ap id for ostatus.	2018-03-23 16:07:02 +01:00
lain	b72a25f5b1	Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints	2018-03-22 12:48:56 +01:00
lain	f9ab38a443	Fix test.	2018-03-22 12:37:24 +01:00
William Pitcock	4d3af2af71	webfinger: implement json response parsing	2018-03-22 00:36:12 -05:00
William Pitcock	1decd2ecb2	webfinger: attempt to fall back if LRDD template cannot be found	2018-03-22 00:36:01 -05:00
William Pitcock	8aa639a450	webfinger: support JSON output	2018-03-22 00:35:51 -05:00
William Pitcock	3fcdfb75d0	activitypub: add outbox endpoint	2018-03-22 00:26:54 -05:00
William Pitcock	381ba256bf	activitypub: add restrict_limit	2018-03-22 00:26:47 -05:00
William Pitcock	1a94704230	activitypub: implement following/followers endpoints	2018-03-22 00:26:39 -05:00
lain	c50c7745bc	Fetch relayed messages from source while we don't have linked data sigs.	2018-03-21 07:12:14 +01:00
lambda	9b97b023c5	Merge branch 'feld-Logger' into 'develop' ... Logging cleanup See merge request pleroma/pleroma!76	2018-03-20 05:57:47 +00:00
Mark Felder	16d102c153	Clarify that this error is about a problem decoding the expected JSON ... payload	2018-03-19 18:18:52 +00:00
Mark Felder	96cfc67e05	LRDD, you are special and we love you too	2018-03-19 18:05:53 +00:00
Mark Felder	2702df489f	cap again	2018-03-19 18:00:02 +00:00
Mark Felder	2549a73d6d	start with a capital	2018-03-19 17:58:45 +00:00
Mark Felder	9a858621d6	AP and WebFinger need love here	2018-03-19 17:56:49 +00:00
Mark Felder	8d561f952f	Make XML feel special too	2018-03-19 17:51:31 +00:00
Mark Felder	032ed2b945	This log message was do do 💩	2018-03-19 17:47:51 +00:00