aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* merge red/master into devMario Vavti2017-08-103-7/+8
* ostatus feed was missing commentszotlabs2017-08-062-9/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-061-0/+86
|\
| * allow channel address to be changedzotlabs2017-08-041-0/+86
* | 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-021-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-011-54/+79
|\
| * finally fix recursive attachments permissionsgit-marijus2017-08-011-54/+79
* | auto preview when inserting a media item or embed into a post. Since this una...zotlabs2017-08-011-0/+2
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-311-20/+3
|\
| * improve file_activity() a littlegit-marijus2017-07-311-20/+3
* | modify connection edit display for channels with no address/webbiezotlabs2017-07-301-13/+14
* | ensure we can work around the $is_http var in include/follow - this is left o...zotlabs2017-07-301-14/+13
|/
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-312-3/+16
|\
| * provide a better "is_commentable" default for OStatus conversations that were...zotlabs2017-07-301-1/+12
| * add options flag to bb_to_markdown so we can distinguish between diaspora use...zotlabs2017-07-301-2/+4
* | disable file notifications on initial upload for now - it can behave funky wh...git-marijus2017-07-311-3/+3
* | fix a bug where if multiple channels uploaded the same file to the same folde...git-marijus2017-07-301-2/+4
* | ltrim $display_path in attach_store() to be consistent with attach_mkdir() an...git-marijus2017-07-301-2/+2
|/
* implement file notification on initial upload and rename get_parent_cloudpath...git-marijus2017-07-291-7/+14
* initial notifications support for new shared files and new (since initial sit...git-marijus2017-07-281-1/+7
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-276-216/+477
|\
| * issue with OStatus comments being propagated downstreamzotlabs2017-07-261-0/+15
| * remove activitypub components from corezotlabs2017-07-261-182/+0
| * more work on signature algorithm choicezotlabs2017-07-261-12/+16
| * improve the formatting of shares when converting from bbcode to markdownzotlabs2017-07-261-0/+69
| * start to implement the code needed for verifying variable signature algorithmszotlabs2017-07-251-15/+31
| * consolidate duplicated codezotlabs2017-07-251-208/+59
| * sync key changes to cloneszotlabs2017-07-252-6/+111
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-251-8/+9
| |\
| * | make signing methods variable and signablezotlabs2017-07-252-1/+12
| * | new field names did not get savedzotlabs2017-07-241-2/+2
| * | provide a keychange operation to rebase an identity on a new keypairzotlabs2017-07-243-0/+372
* | | 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