aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-263-3/+14
|\
| * make mastodon happy argsMario Vavti2017-04-261-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-262-2/+13
| |\
| | * Merge pull request #733 from zotlabs/etwoeemailgit-marijus2017-04-261-2/+4
| | |\
| | | * database support for client side e2ee for private mailzotlabs2017-04-251-2/+4
| | * | When template "none" is used in a webpage layout, then the contents of the pa...Andrew Manning2017-04-231-0/+9
| | |/
| * | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-262-40/+10
| * | support reverse magic-auth in oembed requests.zotlabs2017-04-261-2/+9
| * | provide a broken feed for services which require a broken feedzotlabs2017-04-262-33/+44
| * | make it easier to hook into feed headers in the futurezotlabs2017-04-261-13/+19
| * | smilies - add param to only list default emoticonszotlabs2017-04-261-1/+6
| |/
| * typo - this time the correct repozotlabs2017-04-201-1/+1
| * Revert "typo" - wrong repozotlabs2017-04-201-1/+1
| * typozotlabs2017-04-201-1/+1
| * follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
* | provide a broken feed for services which require a broken feedzotlabs2017-04-252-33/+44
* | smilies - add param to only list default emoticonszotlabs2017-04-251-1/+6
* | database upgradezotlabs2017-04-232-5/+2
* | make it easier to hook into feed headers in the futurezotlabs2017-04-201-14/+20
* | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-202-40/+10
* | support reverse magic-auth in oembed requests.zotlabs2017-04-191-2/+9
* | follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
* | give the item_obscured flag a new lease on life by using it to designate thir...zotlabs2017-04-182-9/+17
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-173-311/+436
|\|
| * We do not parse the body in discover_by_url(), so no need to preserve iframes...Klaus Weidenbach2017-04-151-7/+1
| * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-152-153/+241
| * Merge pull request #716 from dawnbreak/docugit-marijus2017-04-141-260/+293
| |\
| | * Some documentation for include/network.php and some fixes.Klaus Weidenbach2017-04-141-260/+293
| * | missing includesMario Vavti2017-04-131-0/+1
| |/
| * Merge pull request #715 from zotlabs/cppgit-marijus2017-04-133-2/+8
| |\
| | * make sure the new fields don't leak through sync packets and break older vers...zotlabs2017-04-121-0/+2
| | * backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-122-2/+6
| * | correct the mastodon "boost" (aka 'share') author attribution by checking for...zotlabs2017-04-121-54/+85
| * | ugly hack to webfinger to allow connections to be made to mastodon servers.zotlabs2017-04-121-3/+10
| * | some signatures showing as invalid because of recent import_author_zot() chan...zotlabs2017-04-121-7/+25
| |/
| * photo size-0 issuezotlabs2017-04-071-0/+1
| * remove redundant stringMario Vavti2017-04-071-2/+1
| * css fixes and missing stringMario Vavti2017-04-071-1/+2
| * only log zot_refresh content if json decode was successful.zotlabs2017-04-071-2/+2
| * revisit the import_author_zot algorithm yet again. There was one bug that we ...zotlabs2017-04-071-2/+34
| * import_author_xchan - since we rarely refresh zot-info for non-connections, f...zotlabs2017-04-061-1/+1
* | make sure the new fields don't leak through sync packets and break older vers...zotlabs2017-04-121-0/+2
* | backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-122-2/+7
* | correct the mastodon "boost" (aka 'share') author attribution by checking for...zotlabs2017-04-111-54/+85
* | ugly hack to webfinger to allow connections to be made to mastodon servers.zotlabs2017-04-101-3/+10
* | some signatures showing as invalid because of recent import_author_zot() chan...zotlabs2017-04-091-7/+25
* | photo size-0 issuezotlabs2017-04-071-0/+1
* | only log zot_refresh content if json decode was successful.zotlabs2017-04-061-2/+2
* | revisit the import_author_zot algorithm yet again. There was one bug that we ...zotlabs2017-04-061-2/+34
* | make legal_webbie() pluggable - * this should not be merged with federated pr...zotlabs2017-04-051-17/+21