Commit graph

22227 commits

Author SHA1 Message Date
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
d8d72083c0 Google+ will be history soon, so we remove the first traces 2019-01-18 06:58:23 +00:00
c8bfa0c661 Bugfix: Private posts of contacts hadn't been displayed on the contact's page 2019-01-18 06:22:15 +00:00
9efe140b54
Merge pull request #6460 from annando/relaying
Simplyfies AP relaying, fixes relaying of public contacts
2019-01-17 19:09:33 -05:00
d813d72b1a Simplyfies AP relaying, fixes relaying of public contacts 2019-01-17 23:06:27 +00:00
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
5aacb335ae
Merge pull request #6457 from annando/onepoll-bug
The "]" had been at the wrong place
2019-01-17 07:42:45 +01:00
98d44ce7c7 The "]" had been at the wrong place 2019-01-17 05:32:06 +00:00
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
ce37e981cb This fixes a problem when the URL is too long 2019-01-16 22:34:57 +00:00
fe0339dabe Fixing a bug, adding some logging 2019-01-16 22:19:41 +00:00
c359c162a7 Issue 6282: Update the contact data regularly (including the network) 2019-01-16 21:39:56 +00:00
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
ae2a8b796c Avoid a notice in HTTP signature check, preparation for authentication 2019-01-15 06:31:12 +00:00
b00481ce2b
Merge pull request #6452 from annando/composer
Updated composer file
2019-01-14 11:37:34 -05:00
42b695cdfe
Merge pull request #6451 from annando/date-range
Date check added for HTTP signatures
2019-01-14 11:35:47 -05:00
12e2fb152f Updated composer file 2019-01-14 16:34:14 +00:00
9bec202232 Adding the date to signed get requests as well 2019-01-14 16:33:23 +00:00
2f2184cf12 Date check added for HTTP signatures 2019-01-14 16:03:13 +00:00
90e25faf44
Merge pull request #6447 from annando/peertube
Enable communication with Peertube
2019-01-14 08:40:42 -05:00
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
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
5554448162 Now storing the "manually approve" data / fix update routine 2019-01-14 06:36:08 +00:00
ed3a6e3054 remouved double entry 2019-01-14 07:05:49 +01:00
0c3f123d9a remove empty lines 2019-01-14 07:02:05 +01:00
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
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
795268eb7a Fix undefined offset notices in Protocol\Email 2019-01-14 00:05:51 -05:00
2f427e9daa
Merge pull request #6441 from annando/fatal-redirect
Solves redirect error message
2019-01-13 19:32:34 +01:00
9aadb52762
Merge pull request #6440 from annando/notices
Avoiding some notices
2019-01-13 19:30:56 +01:00
3c1635c45f Solves redirect error message 2019-01-13 18:16:26 +00:00
c1dec50248 Avoiding some notices 2019-01-13 18:03:13 +00:00
0760b41fac
Merge pull request #6439 from annando/issue-6438
Issue 6438: Avoid fatal error
2019-01-13 17:06:52 +01:00
8b5b66838d Issue 6438: Avoid fatal error 2019-01-13 16:00:27 +00:00
72516191ef
Merge pull request #6435 from annando/nextcloud
Making Friendica compatible to Nextcloud Social
2019-01-13 07:57:37 -05:00
9308247291
Merge pull request #6436 from annando/notice
Fixing some notice again
2019-01-13 07:55:48 -05:00
236c7718d3 Fixing some notice again 2019-01-13 09:44:04 +00:00
d113ccd93c Making Friendica compatible to Nextcloud Social 2019-01-13 09:38:01 +00:00
0cdf0ba422
Merge pull request #6434 from AndyHee/2019.01-rc
Update translation en-gb
2019-01-12 14:46:51 -05:00
32ebfbd3e2
Merge pull request #6433 from annando/issue-6282
Issue 6282: Update the forum status of contacts
2019-01-12 14:46:04 -05:00
98b362f581 Update translation en-gb 2019-01-13 00:38:54 +07:00
297a549590 Issue 6282: Update the forum status of contacts 2019-01-12 16:09:27 +00:00
c4038e7af1
Merge pull request #6432 from annando/deleted-pending
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 09:08:31 -05:00
28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
33e096434a
Merge pull request #6430 from tobiasd/20190112-lng
Translation Updates
2019-01-12 04:59:28 -05:00
80fcc25897 NB-NO translation update THX friendOFica 2019-01-12 10:53:13 +01:00
e95b2b6494 PL translation update THX waldis 2019-01-12 10:52:10 +01:00
dfc2e4f505 NL translation update THX Jeroen 2019-01-12 10:52:02 +01:00
e21ed2284c CS translation update THX Aditoo 2019-01-12 10:51:46 +01:00