18304 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	e1a72b8f5a	Visible URL are shortened when transmitting to OStatus	2018-03-16 20:50:53 +00:00
Hypolite Petovan	3ca2dc70b3	Merge pull request #4607 from annando/dfrn-relationship ... DFRN: The relationship between contacts can now be changed afterwards	2018-03-16 03:55:34 -04:00
Michael	a62ccf0ec1	Added to-do	2018-03-16 07:27:18 +00:00
Michael	67fa6aa809	We now change relationships not only for OStatus contacts	2018-03-16 06:58:54 +00:00
Michael	59dd353464	DFRN: The relationship between contacts can now be changed afterwards	2018-03-16 06:43:10 +00:00
Hypolite Petovan	ba03991294	Merge pull request #4603 from annando/pleroma-like ... OStatus: Likes from Pleroma will now work	2018-03-15 17:42:53 -04:00
Michael	972c2c86ef	OStatus: Likes from Pleroma will now work	2018-03-15 21:33:28 +00:00
Hypolite Petovan	535ae04613	Merge pull request #4602 from tobiasd/20180316-installdoc ... php-zip module is needed for composer	2018-03-15 16:27:04 -04:00
Tobias Diekershoff	658812ff46	php-zip module is needed for composer	2018-03-15 20:40:22 +01:00
Michael Vogel	fc6576fd83	Merge pull request #4598 from MrPetovan/spoiler-cache ... Fix for CW: Items weren't cached (alt)	2018-03-15 10:29:35 +01:00
Hypolite Petovan	c53c00ba4e	Add rendred-hash to put_item_in_cache todo	2018-03-15 03:23:11 -04:00
Hypolite Petovan	644767519e	Ensure the item body stays the same in put_item_in_cache() ... - Add documentation	2018-03-15 02:13:00 -04:00
Hypolite Petovan	e28020c68a	Fix for CW: Items weren't cached	2018-03-15 01:32:04 -04:00
Hypolite Petovan	d376ed6f61	Merge pull request #4596 from annando/attachment-encode ... Attachment encode	2018-03-14 18:59:25 -04:00
Michael	4ba3ba391a	The attachment text had already been in HTML and mustn't be converted again	2018-03-14 22:51:14 +00:00
Hypolite Petovan	65b0159282	Merge pull request #4593 from annando/fix-ostatus ... OStatus: Fixed communication issues with deleted contacts	2018-03-14 18:46:21 -04:00
Michael	2bedead6f4	Remove commented code	2018-03-14 22:31:52 +00:00
Michael	c4a023dfd4	Remove unused description	2018-03-14 22:30:05 +00:00
Michael	5bd519efff	There is now a "content-warning" field	2018-03-14 22:28:35 +00:00
Michael	8c42e2e62e	Avoid double encoding of the attachment content	2018-03-14 21:47:24 +00:00
Hypolite Petovan	f351391f17	Merge pull request #4595 from annando/empty-contact ... Avoid an error in OnePoll when the contact was "null".	2018-03-14 17:00:43 -04:00
Michael	d98c6819e7	$contact isn't called by reference anymore	2018-03-14 20:53:03 +00:00
Michael	7db0b850cb	Avoid an error in OnePoll when the contact was "null".	2018-03-14 19:47:14 +00:00
Michael	6352aa112b	Add the nsfw removal behind a config switch	2018-03-14 07:13:17 +00:00
Michael	858fd127a1	Fix: subscribing to the old followers hadn't worked	2018-03-14 00:27:15 +00:00
Michael	f17f61df38	Fix indentation	2018-03-13 23:32:38 +00:00
Michael	f49391a21c	"nsfw" at "content warning" content doesn't fit together	2018-03-13 22:39:08 +00:00
Michael	3f6fefaa9a	Pleroma with the Mastodon UI handles content warning different	2018-03-13 21:58:05 +00:00
Michael	aff99b32fd	Improved logging	2018-03-13 21:33:45 +00:00
Michael	bc84852682	Added logging	2018-03-13 21:10:19 +00:00
Michael	c20a42c889	Completely reformatted and restructured code, using dba functions now.	2018-03-13 21:03:56 +00:00
Michael	4d3b1ae918	We don't need the contact-id anymore	2018-03-13 07:16:31 +00:00
Michael	32ee4ca4b1	OStatus: Fixed communication issues with deleted contacts	2018-03-13 06:21:44 +00:00
Hypolite Petovan	335b18769e	Merge pull request #4589 from annando/issue-4369 ... OStatus: Only posts from followers will be imported (Issue 4369)	2018-03-12 08:09:08 -04:00
Michael	23718aeae3	OStatus: Only posts from followers will be imported (Issue 4369)	2018-03-12 10:45:40 +00:00
Tobias Diekershoff	306dd382f3	Merge pull request #4587 from annando/acl-thread ... Fix: The acl lookup now works in multi threaded posts as well	2018-03-12 07:55:23 +01:00
Tobias Diekershoff	03079acf79	Merge pull request #4588 from annando/delegate-zero ... Fix: We have to be able to remove delegations as well	2018-03-12 07:53:46 +01:00
Michael	4bb9263e43	Fix: The acl lookup now works in multi threaded posts as well	2018-03-12 04:51:27 +00:00
Michael	ab3f28f4c8	Fix: We have to be able to remove delegations as well	2018-03-12 04:50:07 +00:00
Hypolite Petovan	324705aa90	Merge pull request #4586 from annando/issue-4115 ... Issue 4115: Events are now formatted better for Diaspora	2018-03-11 18:31:28 -04:00
Michael	052ad155a2	Issue 4115: Events are now formatted better for Diaspora	2018-03-11 21:10:36 +00:00
Hypolite Petovan	ca840f7ed1	Merge pull request #4585 from annando/forum-stuff ... Fix: The ownership of forum items had been wrong	2018-03-11 15:49:04 -04:00
Michael	b7a5e076fc	Fix: The ownership of forum items had been wrong	2018-03-11 18:12:38 +00:00
Hypolite Petovan	cacc1e1f79	Merge pull request #4583 from tobiasd/20180311-doc2 ... Documentation about the Community Pages	2018-03-11 13:09:39 -04:00
Tobias Diekershoff	cc000a9021	community pages	2018-03-11 17:41:56 +01:00
Hypolite Petovan	e793160795	Merge pull request #4582 from tobiasd/20180311-doc ... installation docs	2018-03-11 12:35:12 -04:00
Tobias Diekershoff	61954be480	no poormancron in the installs	2018-03-11 16:54:03 +01:00
Hypolite Petovan	9941c73a31	Merge pull request #4581 from annando/issue-4497 ... Issue 4497: Forum feeds had been empty	2018-03-11 10:10:06 -04:00
Michael	cc4347d72f	Issue 4497: Forum feeds had been empty	2018-03-11 14:01:40 +00:00
Hypolite Petovan	903d1e1172	Merge pull request #4580 from annando/parent-password ... Security: You have to enter the password of the parent for delegations	2018-03-11 09:42:56 -04:00