24937 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	6aebece494	Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links ... use magic links for common/all friends and the directory	2019-01-19 10:06:35 -05:00
rabuzarus	7b78ba3929	Bugfix - use magicLinks also for common/all friends and the directory	2019-01-19 15:12:46 +01:00
Hypolite Petovan	906f7b5698	Merge pull request #6469 from annando/diaspora-priority ... Avoid that forum posts are received via the Diaspora protocol first	2019-01-19 08:08:28 -05:00
Michael	103b92fc48	Avoid that forum posts are received via the Diaspora protocol first	2019-01-19 12:30:16 +00:00
Tobias Diekershoff	8bd04cb515	Merge pull request #6465 from annando/theme-fix ... Bugfix: Theme functions hadn't been executed anymore	2019-01-19 07:24:05 +01:00
Michael	2a0e18c7dd	Bugfix: Theme functions hadn't been executed anymore	2019-01-18 20:08:35 +00:00
Hypolite Petovan	3e9f72cdad	Merge pull request #6464 from annando/check-vendor ... Check if the vendor path is missing and complain about it	2019-01-18 14:25:16 -05:00
Michael	3b5f55d3c6	Check if the vendor path is missing and complain about it	2019-01-18 19:10:05 +00:00
rabuzarus	528d175baa	Bugfix - provide magic links for remote user in magicLink()	2019-01-18 17:50:21 +01:00
Tobias Diekershoff	678004e15a	Merge pull request #6461 from annando/contacts-post ... Private posts of contacts hadn't been displayed on the contact's page	2019-01-18 09:39:10 +01:00
Tobias Diekershoff	97c120d8f2	Merge pull request #6462 from annando/gplus ... Google+ will be history soon, so we remove the first traces	2019-01-18 09:37:54 +01:00
Michael	d8d72083c0	Google+ will be history soon, so we remove the first traces	2019-01-18 06:58:23 +00:00
Michael	c8bfa0c661	Bugfix: Private posts of contacts hadn't been displayed on the contact's page	2019-01-18 06:22:15 +00:00
Hypolite Petovan	9efe140b54	Merge pull request #6460 from annando/relaying ... Simplyfies AP relaying, fixes relaying of public contacts	2019-01-17 19:09:33 -05:00
Michael	d813d72b1a	Simplyfies AP relaying, fixes relaying of public contacts	2019-01-17 23:06:27 +00:00
Tobias Diekershoff	09a44b3039	Merge pull request #6456 from annando/long-url ... This fixes a problem when the URL is too long	2019-01-17 07:44:15 +01:00
Tobias Diekershoff	5aacb335ae	Merge pull request #6457 from annando/onepoll-bug ... The "]" had been at the wrong place	2019-01-17 07:42:45 +01:00
Michael	98d44ce7c7	The "]" had been at the wrong place	2019-01-17 05:32:06 +00:00
Hypolite Petovan	8dbab8f8ce	Merge pull request #6455 from annando/issue-6282 ... Issue 6282: Update the contact data regularly (including the network)	2019-01-16 18:53:27 -05:00
Michael	ce37e981cb	This fixes a problem when the URL is too long	2019-01-16 22:34:57 +00:00
Michael	fe0339dabe	Fixing a bug, adding some logging	2019-01-16 22:19:41 +00:00
Michael	c359c162a7	Issue 6282: Update the contact data regularly (including the network)	2019-01-16 21:39:56 +00:00
Hypolite Petovan	f13b8f8ec4	Merge pull request #6454 from annando/sig-notice ... Avoid a notice in HTTP signature check, preparation for authentication	2019-01-15 08:07:12 -05:00
Michael	ae2a8b796c	Avoid a notice in HTTP signature check, preparation for authentication	2019-01-15 06:31:12 +00:00
Hypolite Petovan	b00481ce2b	Merge pull request #6452 from annando/composer ... Updated composer file	2019-01-14 11:37:34 -05:00
Hypolite Petovan	42b695cdfe	Merge pull request #6451 from annando/date-range ... Date check added for HTTP signatures	2019-01-14 11:35:47 -05:00
Michael	12e2fb152f	Updated composer file	2019-01-14 16:34:14 +00:00
Michael	9bec202232	Adding the date to signed get requests as well	2019-01-14 16:33:23 +00:00
Michael	2f2184cf12	Date check added for HTTP signatures	2019-01-14 16:03:13 +00:00
Hypolite Petovan	90e25faf44	Merge pull request #6447 from annando/peertube ... Enable communication with Peertube	2019-01-14 08:40:42 -05:00
Hypolite Petovan	990bbea19d	Merge pull request #6446 from annando/approve ... Now storing the "manually approve" data / fix update routine	2019-01-14 08:38:08 -05:00
Michael	aa4aaf1971	Enable communication with Peertube	2019-01-14 12:10:11 +00:00
Michael Vogel	b4ffd980d3	Merge pull request #6445 from tobiasd/2019.01credits ... Update CREDITS.txt for 2019.01	2019-01-14 07:44:51 +01:00
Michael	5554448162	Now storing the "manually approve" data / fix update routine	2019-01-14 06:36:08 +00:00
Tobias Diekershoff	ed3a6e3054	remouved double entry	2019-01-14 07:05:49 +01:00
Tobias Diekershoff	0c3f123d9a	remove empty lines	2019-01-14 07:02:05 +01:00
Tobias Diekershoff	8b586e9d6c	Updated the CREDITS.TXT file for 2019.01 ... Additionally Transifex started to add lines to the header that confused the detection of "Translatorname, year" detection so the make_credits script had to be updated.	2019-01-14 06:57:37 +01:00
Tobias Diekershoff	2b198264c1	Merge pull request #6444 from MrPetovan/bug/5932-fix-email-notices ... Fix undefined offset notices in Protocol\Email	2019-01-14 06:31:13 +01:00
Hypolite Petovan	795268eb7a	Fix undefined offset notices in Protocol\Email	2019-01-14 00:05:51 -05:00
Tobias Diekershoff	2f427e9daa	Merge pull request #6441 from annando/fatal-redirect ... Solves redirect error message	2019-01-13 19:32:34 +01:00
Tobias Diekershoff	9aadb52762	Merge pull request #6440 from annando/notices ... Avoiding some notices	2019-01-13 19:30:56 +01:00
Michael	3c1635c45f	Solves redirect error message	2019-01-13 18:16:26 +00:00
Michael	c1dec50248	Avoiding some notices	2019-01-13 18:03:13 +00:00
Tobias Diekershoff	0760b41fac	Merge pull request #6439 from annando/issue-6438 ... Issue 6438: Avoid fatal error	2019-01-13 17:06:52 +01:00
Michael	8b5b66838d	Issue 6438: Avoid fatal error	2019-01-13 16:00:27 +00:00
Hypolite Petovan	72516191ef	Merge pull request #6435 from annando/nextcloud ... Making Friendica compatible to Nextcloud Social	2019-01-13 07:57:37 -05:00
Hypolite Petovan	9308247291	Merge pull request #6436 from annando/notice ... Fixing some notice again	2019-01-13 07:55:48 -05:00
Michael	236c7718d3	Fixing some notice again	2019-01-13 09:44:04 +00:00
Michael	d113ccd93c	Making Friendica compatible to Nextcloud Social	2019-01-13 09:38:01 +00:00
Hypolite Petovan	0cdf0ba422	Merge pull request #6434 from AndyHee/2019.01-rc ... Update translation en-gb	2019-01-12 14:46:51 -05:00