aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-301-8/+16
|\
| * update feedutils with as:author changes, also update testszotlabs2017-04-271-8/+16
| |
* | ugly postgres fixeszotlabs2017-04-301-22/+34
| |
* | more work on client side e2eezotlabs2017-04-291-5/+0
| |
* | profile_tabs is now channel_apps (except the original was left behind as the ↵zotlabs2017-04-271-2/+171
| | | | | | | | gitwiki addon still uses it). A couple of things were modernised but basic functionality is the same as the latest revisions to the original.
* | more work client mail cryptozotlabs2017-04-271-5/+15
| |
* | make mail_store() safe for postgres or mysql5.7 - although this interface ↵zotlabs2017-04-271-2/+9
| | | | | | | | needs to be refactored in the future
* | more client-side mail privacy workzotlabs2017-04-262-6/+28
| |
* | 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
| | |\ | | | | | | | | Etwoeemail
| | | * 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 ↵Andrew Manning2017-04-231-0/+9
| | |/ | | | | | | | | | page should be the sole output, with no other code before or after the page element content.
| * | The rest of the library and backend changes to support client-side e2ee and ↵zotlabs2017-04-262-40/+10
| | | | | | | | | | | | deprecate previous uses of item_obscured.
| * | 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
| | | | | | | | This reverts commit d9a48092e690f582585d939f5b193aedd4bcebfb.
| * 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 ↵zotlabs2017-04-202-40/+10
| | | | | | | | deprecate previous uses of item_obscured.
* | 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 ↵zotlabs2017-04-182-9/+17
| | | | | | | | third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends.
* | 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 ↵Klaus Weidenbach2017-04-151-7/+1
| | | | | | | | iframes in SimplePie.
| * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-152-153/+241
| | | | | | | | | | | | | | | | | | | | | | As a follow up to issue #699 update SimplePie from 1.2.1-dev (around 6years old) to current git master (1.4.4-dev). We use the master branch until the next release because it contains our patch for enclosure titles already. The other patches in the library from us can be done by configuring the SimplePie object in our code instead. Used composer to manage this library and use class autoloading. Add some unit tests for include/feedutils.php, but the interesting parts are unfortunately not testable with the current code.
| * Merge pull request #716 from dawnbreak/docugit-marijus2017-04-141-260/+293
| |\ | | | | | | Some documentation for include/network.php and some fixes.
| | * Some documentation for include/network.php and some fixes.Klaus Weidenbach2017-04-141-260/+293
| | | | | | | | | | | | Some variables had wrong names and have never been used.
| * | missing includesMario Vavti2017-04-131-0/+1
| |/
| * Merge pull request #715 from zotlabs/cppgit-marijus2017-04-133-2/+8
| |\ | | | | | | backend infrastructure for 'channel protection password'; which will …
| | * make sure the new fields don't leak through sync packets and break older ↵zotlabs2017-04-121-0/+2
| | | | | | | | | | | | versions
| | * backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-122-2/+6
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
| * | correct the mastodon "boost" (aka 'share') author attribution by checking ↵zotlabs2017-04-121-54/+85
| | | | | | | | | | | | for share activities and pulling the original author info from the activity:object
| * | 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() ↵zotlabs2017-04-121-7/+25
| |/ | | | | | | changes.
| * 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
| | | | | | | | weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site.
| * import_author_xchan - since we rarely refresh zot-info for non-connections, ↵zotlabs2017-04-061-1/+1
| | | | | | | | force a cache reload once a week to catch things like profile photo updates and location changes
* | make sure the new fields don't leak through sync packets and break older ↵zotlabs2017-04-121-0/+2
| | | | | | | | versions