7579 commits

Author	SHA1	Message	Date
Hypolite Petovan	d1c93e7a60	Merge pull request #4614 from annando/dir-own-contact ... Fix: In the contact search you had been able to delete your own contact	2018-03-17 08:42:51 -04:00
Michael	cd2c9722b0	Added missing doxygen header	2018-03-17 09:42:29 +00:00
Michael	782d692b5a	Possible fix issue 4611: Don't write to database before it is created	2018-03-17 09:04:38 +00:00
Michael	8053172398	Issue 4610: The query is simplified and shouldn't fail again	2018-03-17 07:50:49 +00:00
Michael Vogel	b54b0f0728	Merge pull request #4613 from MrPetovan/task/4518-add-cache-delete ... Add missing Cache::delete method	2018-03-17 07:30:31 +01:00
Michael	d616bb7564	Fix: In the contact search you had been able to delete your own contact	2018-03-17 06:17:32 +00:00
Hypolite Petovan	30d8c73660	Add missing Cache::delete method	2018-03-16 21:57:58 -04:00
Michael	e1a72b8f5a	Visible URL are shortened when transmitting to OStatus	2018-03-16 20:50:53 +00:00
Michael	ec9b7af25b	Fix: Private transmission via Diaspora to Friendica servers	2018-03-16 20:34:28 +00:00
rabuzarus	c209853e1d	add dependencies (require_once) to hashtag module	2018-03-16 14:44:51 +01:00
rabuzarus	86d84e5f31	fix code standards	2018-03-16 14:27:04 +01:00
rabuzarus	96c086ea13	hashtag autocomplete	2018-03-16 13:55:26 +01: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
Michael	972c2c86ef	OStatus: Likes from Pleroma will now work	2018-03-15 21:33:28 +00: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	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
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	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	32ee4ca4b1	OStatus: Fixed communication issues with deleted contacts	2018-03-13 06:21:44 +00:00
Michael	23718aeae3	OStatus: Only posts from followers will be imported (Issue 4369)	2018-03-12 10:45:40 +00:00
Michael	052ad155a2	Issue 4115: Events are now formatted better for Diaspora	2018-03-11 21:10:36 +00:00
Michael	b7a5e076fc	Fix: The ownership of forum items had been wrong	2018-03-11 18:12:38 +00:00
Michael	cc4347d72f	Issue 4497: Forum feeds had been empty	2018-03-11 14:01:40 +00:00
Michael	fbb38837b0	Shortener deactivated, due to Diaspora problems	2018-03-11 12:16:17 +00:00
Michael	229fb0439e	Links to Diaspora had sometimes been cut	2018-03-11 10:54:02 +00:00
Michael Vogel	28615ae24b	Merge pull request #4576 from MrPetovan/bug/fix-attach-display ... Formatting changes to Protocol/Feed	2018-03-11 00:43:16 +01:00
Hypolite Petovan	9b14165cc8	Formatting changes to Protocol/Feed ... - Change attribute name condition - Singularize $attributes variable name	2018-03-10 18:35:24 -05:00
Michael Vogel	2009c06195	Merge pull request #4573 from MrPetovan/bug/fix-attach-display ... Add support for Atom enclosure	2018-03-11 00:34:26 +01:00
Hypolite Petovan	a80d77f328	Add support for Atom enclosure	2018-03-10 12:40:21 -05:00
Michael	fa496d3e5f	Issue 4556: Adding index hints to improve the notifications speed (hopefully)	2018-03-09 22:53:19 +00:00
Michael	7706616640	Bugfix: Reshare with added content to Diaspora looked ugly	2018-03-09 20:04:31 +00:00
Michael	3e51fa73b1	Additional checks	2018-03-09 05:38:15 +00:00
Michael	c9095386c8	Diaspora: Avoid warning "supplied key param cannot be coerced into a public key"	2018-03-09 05:31:13 +00:00
Michael	f23596421d	Avoid SQL errors due to duplicate entries in the "participation" table	2018-03-08 21:04:11 +00:00
Michael	480fde7ca8	Bugfix: missing "use"	2018-03-08 20:48:00 +00:00
Michael	c438e47827	Bugfix: Avoid "Class not found" error	2018-03-08 19:58:35 +00:00
Michael	713bdb4bd9	Improved reshare behaviour for DFRN posts	2018-03-08 19:47:18 +00:00
Michael Vogel	b6b67c9044	Merge pull request #4540 from MrPetovan/task/4520-load-whole-config ... [develop] Performance: Add preloading config adapter	2018-03-08 20:35:14 +01:00
Michael Vogel	26b6cbcb3b	Merge pull request #4560 from MrPetovan/task/3878-move-html2_-to-src ... [develop] Move include/html2* to src/	2018-03-08 20:24:09 +01:00
Hypolite Petovan	49bd2903c7	Fix wrong SQL query syntax in Core\ACL	2018-03-08 04:42:07 -05:00
Hypolite Petovan	789561c7a2	Remove/Update references to include/html2*.php	2018-03-07 16:34:17 -05:00