aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-132-59/+190
|\
| * typoszotlabs2019-03-121-8/+8
| * Merge branch 'dev' of ../hz into devzotlabs2019-03-111-0/+9
| |\
| | * check zot6 in import_author_xchanzotlabs2019-03-111-0/+9
| * | security updates for multiple xchanszotlabs2019-03-111-59/+189
| |/
* / perform zot6 discovery in import_author_xchanMike Macgirvin2019-03-121-0/+9
|/
* testing init_groups_visitor changes - also add virtual groups for both zot id...zotlabs2019-03-101-13/+11
* init_groups_visitor: include xchans from all zot-like networkszotlabs2019-03-101-3/+21
* authenticated fetch fixeszotlabs2019-03-091-0/+48
* Merge branch 'dev' into 'dev'Mario2019-03-071-0/+1
|\
| * guest access tokens: xchan record not created on URL loginzotlabs2019-03-061-0/+1
* | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
|/
* Use sender hashDM42.Net (Matt Dent)2019-03-011-1/+1
* use $channel_id until the function is adapted to not need itMario Vavti2019-02-261-1/+1
* Merge branch 'fix-sync_an_item' into 'dev'Mario2019-02-261-1/+1
|\
| * xchan_query and fetch_post_tags uses full query results not a single rowDM42.Net (Matt Dent)2019-02-231-3/+3
| * Fixes - sync item based on item's userDM42.Net (Matt Dent)2019-02-231-4/+4
| * Fix misspelled variableDM42.Net (Matt Dent)2019-02-231-1/+1
* | Merge branch 'dev' into 'dev'Mario2019-02-253-19/+88
|\ \ | |/ |/|
| * issues uncovered testing combined item/file importzotlabs2019-02-243-5/+5
| * zot api changes to support combined content (items+files) import addonzotlabs2019-02-242-19/+88
* | fix summary and use item_normal_search() for viewsrc so we can also view the ...Mario Vavti2019-02-211-1/+6
|/
* Fix: post_activity_item returns success => true even on failure.M.Dent2019-02-181-0/+2
* Refactor photo_driver to use namespaces.Klaus Weidenbach2019-02-143-833/+12
* Clean up and documentation in photo_drive.Klaus Weidenbach2019-02-141-242/+271
* affinity tool fixesMario Vavti2019-02-141-8/+0
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-072-6/+15
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-044-60/+108
| |\
| * \ Merge branch 'patch-20190201a' into 'dev'Mario2019-02-021-5/+14
| |\ \
| | * | Add filter hooks and the ability to add buttons to the default status editorDM42.Net (Matt Dent)2019-02-011-5/+14
| * | | Merge branch 'dev' into 'dev'M. Dent2019-02-011-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Prevent Hubzilla usage for SEO backlinksMax Kostikov2019-02-011-1/+1
* | | | add missing zot6 conversation completion (required for message repeats)zotlabs2019-02-071-0/+19
| |_|/ |/| |
* | | fix linkify_tags() so it works with xchans across multiple protocols, also so...zotlabs2019-02-034-60/+108
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-301-0/+12
|\ \
| * | cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-291-0/+12
* | | Extend documentation.Klaus Weidenbach2019-01-281-24/+16
|/ /
* | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-238-130/+205
* | Merge branch 'prepare_text' into 'dev'Mario2019-01-231-27/+34
|\ \
| * | Correct parameter in include/text.php prepare_text()Klaus Weidenbach2019-01-221-27/+34
* | | Merge branch 'dev' into 'dev'Mario2019-01-231-0/+3
|\ \ \ | |/ / |/| / | |/
| * Skip tags detection in URLMax Kostikov2019-01-221-0/+3
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
|\ \
| * \ Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| |\ \
| | * | Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| * | | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| |/ /
* / / this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
|/ /
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-168-154/+93
|\ \
| * | do not return if delivery report could not bedecryptedMario Vavti2019-01-161-17/+32
| * | Merge branch 'patch-20190113a' into 'dev'Mario2019-01-141-2/+17
| |\ \