bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
11352 commits 4 branches 62 tags 178 MiB
Commit graph

11352 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel eba9f15daa Removed some more work 2016-01-28 11:18:57 +01:00
Michael Vogel 04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Tobias Diekershoff d6c1889a20 Merge pull request #2298 from annando/1601-contact-posts 
Show contact posts by searching for "contact-id" - not "gcontact-id"
 2016-01-27 12:39:43 +01:00
Michael Vogel d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
fabrixxm bcc9588732 Merge pull request #2297 from annando/1601-ostatus 
OStatus: Do not notify on "likes" - update only OStatus contacts
 2016-01-27 11:06:51 +01:00
Michael Vogel 828cec27dd Do not notify on "likes" - update only OStatus contacts 2016-01-27 10:44:15 +01:00
fabrixxm f18679053b Merge pull request #2286 from annando/1601-dfrn 
Complete rewrite of DFRN generation
 2016-01-27 09:42:03 +01:00
Michael Vogel 45a5f63d35 The object-type is now transmitted as well 2016-01-27 02:38:52 +01:00
Michael Vogel c0eb7b10a3 Some new fields for the protocol 2016-01-26 12:18:57 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
fabrixxm 7ea3923429 Merge pull request #2296 from annando/1601-api-repeat 
API: Only allow repeating of public items
 2016-01-25 22:46:02 +01:00
Michael Vogel 9b2582e066 API: Only allow repeating of public items 2016-01-25 22:35:18 +01:00
Michael Vogel f5a4037d4b Merge pull request #2285 from tobiasd/20160124-docs 
groups vs forums and mentioning those
 2016-01-25 22:14:05 +01:00
Michael Vogel 778d9250c6 Still some more documentation 2016-01-25 22:10:26 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Michael Vogel a5cd7a9487 Merge pull request #2295 from mexon/mat/pullrequest5 
Note the final URL used to retrieve content after all redirects
 2016-01-25 12:29:40 +01:00
Matthew Exon 4ff8c9e3a1 Document new redirect_url return value 2016-01-25 11:38:36 +01:00
Matthew Exon cfd40896de Remove global state for redirect_url 2016-01-25 11:06:10 +01:00
Matthew Exon 930da0aa44 Return redirect_url as part of the return array from z_fetch_url instead of via global state 2016-01-25 11:05:17 +01:00
Matthew Exon 50d4d37609 Merge remote branch 'upstream/develop' into mat/pullrequest5 2016-01-25 10:58:18 +01:00
fabrixxm 0e6f3e6122 Merge pull request #2293 from mexon/mat/pullrequest4 
Use more cookies to allow processing of the NYT feed
 2016-01-25 10:52:48 +01:00
Michael Vogel 77c6020dc2 Removed useless get_app function call 2016-01-25 10:38:38 +01:00
Matthew Exon 0ae83e41a2 Use get_temppath() instead of hard-coded '/tmp' to store cookiejar 2016-01-25 10:38:30 +01:00
Michael Vogel ab317b8e83 Merge pull request #2289 from mexon/mat/pullrequests 
Only proxy URLs using HTTP or HTTPS
 2016-01-25 10:24:57 +01:00
Tobias Diekershoff c7691ce68d OStatus clarification 2016-01-25 09:58:58 +01:00
fabrixxm d4bb150b49 Merge pull request #2294 from tobiasd/20160125-de 
DE update to the strings
 2016-01-25 09:27:33 +01:00
Matthew Exon 3ada0093f9 Note the final URL used to retrieve content after all redirects 2016-01-25 07:41:56 +01:00
Tobias Diekershoff 662a9f5b16 Merge pull request #2287 from annando/1601-duplicate-contacts 
Remove duplicated contacts with uid=0
 2016-01-25 07:33:55 +01:00
Tobias Diekershoff 27fe3e7160 Merge pull request #2292 from mexon/mat/pullrequest2 
Report errors during cURL fetch
 2016-01-25 07:16:58 +01:00
Tobias Diekershoff d395959e41 DE update to the strings 2016-01-25 07:13:29 +01:00
Matthew Exon 4007876b84 Use more cookies to allow processing of the NYT feed 
Conflicts:

	include/Scrape.php
 2016-01-25 03:34:53 +01:00
Matthew Exon 677903b316 Report errors during cURL fetch 2016-01-25 02:56:47 +01:00
Matthew Exon 2aa0c6d00d Only proxy URLs using HTTP or HTTPS 2016-01-25 02:50:57 +01:00
Michael Vogel ffd8f1234e Some more documentation 2016-01-25 01:15:10 +01:00
Michael Vogel acd7e816eb Added documentation 2016-01-25 01:06:46 +01:00
Michael Vogel a2d025232b Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-24 18:21:09 +01:00
fabrixxm 09622ad593 Merge pull request #2288 from annando/1601-warning-forumlist 
Avoid a warning if a user hadn't subscribed to any forum.
 2016-01-24 18:15:31 +01:00
Michael Vogel b409132f86 Avoid a warning if a user hadn't subscribed to any forum. 2016-01-24 17:56:34 +01:00
Michael Vogel 16b3758deb Removed to do bullet point 2016-01-24 17:42:47 +01:00
Michael Vogel ca64c7f7cd Remove duplicated contacts with uid=0 2016-01-24 17:40:31 +01:00
Michael Vogel 937196d6ee Poco fields now moved to the header, function to create formatted location string 2016-01-24 14:30:57 +01:00
Michael Vogel c1f2b3a55e Improved documentation 2016-01-24 10:34:39 +01:00
Michael Vogel f38f1806c1 We don't need these templates anymore 2016-01-24 08:22:09 +01:00
Michael Vogel 1471385157 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-24 08:18:38 +01:00
Tobias Diekershoff a447839c50 Merge pull request #2281 from annando/1601-repair-database 
Frequently repair of database entries
 2016-01-24 08:08:50 +01:00
Michael Vogel 079b7bb602 Merge pull request #2284 from tobiasd/20160124-messages 
Update to the strings
 2016-01-24 08:00:02 +01:00
Michael Vogel 41dacf4b37 To-Do bullets can now be listed in doxygen 2016-01-24 07:57:36 +01:00
Tobias Diekershoff 47a936eaa3 groups vs forums and mentioning those 2016-01-24 07:42:25 +01:00