aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.6RC'2.6Mario Vavti2017-08-1634-2553/+2037
|\
| * do not show channel manager and nav channel select if we are in a delegate se...git-marijus2017-08-101-4/+8
| * libxml errorszotlabs2017-08-102-5/+6
| * ostatus feed was missing commentszotlabs2017-08-072-9/+5
| * consolidate disable_discover_tab config if it was not yet set to either 1 or ...git-marijus2017-08-062-5/+5
| * some bb-to-markdown issueszotlabs2017-08-031-5/+2
| * minor activitypub rendering stuffzotlabs2017-08-031-1/+1
| * finally fix recursive attachments permissionsgit-marijus2017-08-011-54/+79
| * ensure we can work around the $is_http var in include/follow - this is left o...zotlabs2017-07-311-14/+13
| * improve file_activity() a littlegit-marijus2017-07-311-20/+3
| * provide a better "is_commentable" default for OStatus conversations that were...zotlabs2017-07-311-1/+12
| * add options flag to bb_to_markdown so we can distinguish between diaspora use...zotlabs2017-07-311-2/+4
| * fix a bug where if multiple channels uploaded the same file to the same folde...git-marijus2017-07-311-2/+4
| * improve the formatting of shares when converting from bbcode to markdownzotlabs2017-07-271-0/+69
| * remove activitypub components from corezotlabs2017-07-271-182/+0
| * issue with OStatus comments being propagated downstreamzotlabs2017-07-271-0/+15
| * move the active app code to include/nav.php - it is only relevant theregit-marijus2017-07-261-0/+3
| * make local channel (not our own) nav menus appear similar to what we are used...git-marijus2017-07-251-8/+9
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-211-18/+4
| |\
| | * provide a mechanism to mark apps active in the bingit-marijus2017-07-211-18/+4
| * | begin the tedious process of mapping activities between AS1, zot, and AS2zotlabs2017-07-201-0/+49
| * | allow wildcard tag and category searcheszotlabs2017-07-201-2/+11
| |/
| * implement update_feed_itemzotlabs2017-07-191-3/+12
| * hubzilla issue #832zotlabs2017-07-192-2/+3
| * provide optional salmon signatures for AP entitieszotlabs2017-07-181-0/+8
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-181-2/+1
| |\
| | * Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-182-12/+63
| | |\
| | * | issue #827 provide backward compatibility for album links generated in earlie...git-marijus2017-07-181-0/+9
| * | | some corrections to AS encoding based on the current spec (some of this work ...zotlabs2017-07-171-7/+22
| * | | activitypub, cont.zotlabs2017-07-171-14/+26
| * | | Merge branch 'bug827'zotlabs2017-07-171-3/+4
| |\ \ \ | | |_|/ | |/| |
| | * | fix typozotlabs2017-07-171-3/+4
| * | | provide content-type matching ability for activitypubzotlabs2017-07-171-0/+38
| |/ /
| * | fix for bug 827 to provide partial backward compatibility with album names in...zotlabs2017-07-171-0/+9
| * | activitystreams converters updated to recent speczotlabs2017-07-171-12/+14
| * | mis-attributed profile photo when Mastodon comment author has no profile photozotlabs2017-07-161-0/+11
| |/
| * Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-161-1/+20
| |\
| | * deal with mastodon privacy scopes - mark private and block commenting since w...zotlabs2017-07-151-1/+20
| * | fix album linkgit-marijus2017-07-161-1/+1
| |/
| * update some addon docs and ensure we only generate statistics once a dayzotlabs2017-07-132-7/+15
| * turn platform name and std_version into config variableszotlabs2017-07-131-2/+3
| * implement chunked uploads on the wall; making it work painlessly on /cloud wa...zotlabs2017-07-131-0/+101
| * fix typoszotlabs2017-07-121-6/+8
| * make websub/PuSH and salmon both use consume_feed() for item storage as there...zotlabs2017-07-121-13/+43
| * even more logging of conversation parent discoveryzotlabs2017-07-111-0/+1
| * prevent expiration of conversations you are involved with - allows you to fin...zotlabs2017-07-103-2/+20
| * find_parent for feeds needs more debug logging. Something is still falling th...zotlabs2017-07-091-0/+4
| * regression: allow position attributes in oembedable zcards by separating allo...zotlabs2017-07-091-2/+4
| * affinitiy slider settings were being updated on any submit of of settings/fea...zotlabs2017-07-051-1/+1
| * typoMario Vavti2017-07-051-1/+1