24170 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	9054e00873	Merge pull request #7265 from annando/issue-7264 ... Issue 7264: Count local delivery as well	2019-06-13 16:51:03 -04:00
Michael	f41513f4ec	Issue 7264: Count local delivery as well	2019-06-13 20:24:49 +00:00
Hypolite Petovan	a74b069728	Merge pull request #7263 from nupplaphil/bug/6917-php_warning ... Add additional check for $links in Probe	2019-06-13 11:50:45 -04:00
Philipp Holzer	a85aa24d56	Add additional check for $links in Probe ... see https://github.com/friendica/friendica/issues/6917#issuecomment-501661530	2019-06-13 15:01:24 +02:00
Philipp	41edbfd24a	Merge pull request #7262 from MrPetovan/bug/6410-normalize-message-button ... Restore show_connect flag in Model\Profile::sidebar	2019-06-13 12:34:16 +02:00
Hypolite Petovan	5b291abc7f	Restore show_connect flag in Model\Profile::sidebar	2019-06-13 03:26:42 -04:00
Philipp	6c6e3058f2	Merge pull request #7260 from annando/sanitize-input ... Sanitize the date for mails	2019-06-13 09:11:41 +02:00
Michael	20eb7ae73f	Empty dates are now set to today as well	2019-06-13 05:43:00 +00:00
Hypolite Petovan	b44f75d80f	Merge pull request #7261 from annando/issue-7142 ... Issue 7142: Prevent respawn of "remote self" items	2019-06-13 01:32:20 -04:00
Michael	6970fb2862	Issue 7142: Prevent respawn of "remote self" items	2019-06-13 05:06:52 +00:00
Michael	2ae4371606	Sanitize the date for mails	2019-06-13 03:22:15 +00:00
Michael Vogel	33f5a98fd6	Merge pull request #7259 from MrPetovan/bug/7240-private-message-ap ... Normalize the datetime format of received activity before DB insertion	2019-06-13 05:21:53 +02:00
Hypolite Petovan	94a70f54d1	Normalize the datetime format of received activity before DB insertion in ActivityPub\Processor ... - Restore private message storage	2019-06-12 21:02:37 -04:00
Hypolite Petovan	9e24b8c55f	Fix formatting and PHPDoc in ActivityPub\Processor ... Add expected return value to postMail method	2019-06-12 21:01:44 -04:00
Hypolite Petovan	bb0cf09057	Merge pull request #7258 from annando/fix-notice ... Fix notice in Model\Profile	2019-06-12 16:19:45 -04:00
Michael	422ebb5d58	Fix notice in Model\Profile	2019-06-12 19:41:15 +00:00
Philipp	fb63274aaf	Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button ... Normalize message button in profile sidebar	2019-06-12 17:56:05 +02:00
Hypolite Petovan	304c144bc2	Use App::getBaseURL instead of System::getBaseURL in Model\Profile::load ... Co-Authored-By: Philipp <admin+Github@philipp.info>	2019-06-12 10:56:41 -04:00
Philipp	17490fca33	Merge pull request #7256 from MrPetovan/bug/7249-remote-logout ... Fix remote logout	2019-06-12 07:37:42 +02:00
Hypolite Petovan	0af10a42b0	Normalize logout link behavior across themes	2019-06-11 19:42:08 -04:00
Hypolite Petovan	fd8844db83	Redirect remote visitors to their own profile after logout	2019-06-11 19:41:11 -04:00
Hypolite Petovan	fa1f48e171	Merge pull request #7255 from annando/issue-7223 ... Issue 7223: Don't strip links	2019-06-11 18:36:30 -04:00
Michael	bfc6bad916	Added comment	2019-06-11 21:40:44 +00:00
Michael	a11b258fd6	Issue 7223: Don't strip links	2019-06-11 20:34:21 +00:00
Hypolite Petovan	2e8a04ea1a	Merge pull request #7254 from annando/fix-plaintext ... Fix pixture posts to connectors / fix delivery counter for connector posts	2019-06-11 16:27:48 -04:00
Michael	16b9d9f199	Fix pixture posts to connectors / fix delivery counter for connector posts	2019-06-11 19:35:03 +00:00
Philipp	f4d20c577b	Merge pull request #7251 from annando/fix-fatal ... Avoid fatal error when AP contact has no photo	2019-06-11 08:45:49 +02:00
Michael	9d8f01c49c	Fix another fatal error	2019-06-11 06:02:18 +00:00
Michael	76a420fbe9	Avoid fatal error when AP contact has no photo	2019-06-11 05:26:16 +00:00
Hypolite Petovan	7761017915	Merge pull request #7248 from nupplaphil/bugs/6916-fatal-network ... Fixing Network::post() caused by wrong argument	2019-06-10 21:57:13 -04:00
Hypolite Petovan	b00bcbb1c1	Normalize the contact sidebar with the profile sidebar ... - Remove un/follow text links in contact status window	2019-06-10 21:56:06 -04:00
Hypolite Petovan	3aebb92cf3	Rework Profile::sidebar profile link conditions ... - Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor - Remove pseudo-field contact.remoteconnect	2019-06-10 21:56:03 -04:00
Hypolite Petovan	61c79ce9ee	Add new Model\Contact::canReceivePrivateMessages method	2019-06-10 21:29:11 -04:00
Hypolite Petovan	0fbfb7c970	Prevents an endless loop when only the non-public contact is available in Contact::magicLinkByContact	2019-06-10 19:10:39 -04:00
Philipp Holzer	7c54edd4b4	Fixing Network::post() caused by wrong argument	2019-06-10 19:34:16 +02:00
Hypolite Petovan	9491c63934	Merge pull request #7247 from annando/fix-7242 ... Fixes PR 7242: Now the "post" function works again	2019-06-10 13:30:33 -04:00
Michael	7bbacd3878	Fixes PR 7242: Now the "post" function works again	2019-06-10 16:58:00 +00:00
Philipp	f89a879aba	Merge pull request #7246 from annando/fix-post-detection ... Fix the detection of image posts	2019-06-10 18:56:18 +02:00
Michael	7d0ebe8bbe	Fix the detection of image posts	2019-06-10 16:06:54 +00:00
Hypolite Petovan	d7d44e1af7	Merge pull request #7245 from annando/unify-constants ... Fix delivery counter for poking / unify delivery commands	2019-06-10 11:59:40 -04:00
Hypolite Petovan	151c026a8a	Merge pull request #7244 from nupplaphil/task/hidden_string ... Introduce HiddenString for Config-Values	2019-06-10 10:50:41 -04:00
Michael	41dc243186	Fix delivery counter for poking / unify delivery commands	2019-06-10 14:19:24 +00:00
Philipp Holzer	50d8dbb123	Bugfixing wrong typed password setting	2019-06-10 15:46:51 +02:00
Philipp Holzer	4666b18e5b	Bugfixing empty password setting	2019-06-10 15:40:15 +02:00
Hypolite Petovan	165607ffe7	Merge pull request #7242 from nupplaphil/bugs/6917-php_warning ... Add typed parameter for methods in `Friendica\Util\Network`	2019-06-10 09:22:27 -04:00
Philipp Holzer	357d9b5108	Introduce HiddenString for Config-Values	2019-06-10 14:46:31 +02:00
Philipp Holzer	cc7444d84d	Move internal recursion-counter to the end of all cur/fetchUrl parameters	2019-06-10 14:34:54 +02:00
Hypolite Petovan	1c6bf7d25a	Add App parameter to Module\Profile::sidebar method prototype	2019-06-10 08:21:06 -04:00
Hypolite Petovan	1818aca1b4	Merge pull request #7243 from nupplaphil/bugs/6918-php_notices ... Check Contact ID (fix PHP notice)	2019-06-10 08:01:28 -04:00
Philipp Holzer	236c0dc248	Check $contact['id'] ... - see https://github.com/friendica/friendica/issues/6918#issuecomment-498043313	2019-06-10 12:36:42 +02:00