aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)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
|/ | | | 0 in DB
* 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 ↵zotlabs2017-08-011-0/+2
|/ | | | unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two.
* 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 ↵zotlabs2017-07-301-14/+13
|/ | | | over from when the only non-webfinger connections we could make were RSS/Atom feeds.
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-312-3/+16
|\
| * provide a better "is_commentable" default for OStatus conversations that ↵zotlabs2017-07-301-1/+12
| | | | | | | | were fetched on the fly
| * add options flag to bb_to_markdown so we can distinguish between diaspora ↵zotlabs2017-07-301-2/+4
| | | | | | | | | | | | use and other use and therefore filter and adjust content selectively
* | disable file notifications on initial upload for now - it can behave funky ↵git-marijus2017-07-311-3/+3
| | | | | | | | when uploading multiple small files at once
* | fix a bug where if multiple channels uploaded the same file to the same ↵git-marijus2017-07-301-2/+4
| | | | | | | | folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder
* | ltrim $display_path in attach_store() to be consistent with attach_mkdir() ↵git-marijus2017-07-301-2/+2
|/ | | | and go to created folder after successfully creating one
* implement file notification on initial upload and rename ↵git-marijus2017-07-291-7/+14
| | | | get_parent_cloudpath() to get_cloud_url() which now includes the filename
* initial notifications support for new shared files and new (since initial ↵git-marijus2017-07-281-1/+7
| | | | site load) pubstream activity
* 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 ↵git-marijus2017-07-251-8/+9
|/ | | | used from remote channels
* 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 ↵git-marijus2017-07-181-0/+9
| | | | | | | | | | | | earlier times before the ambiguity of photo album names was solved. This may provide incorrect results if two or more photo albums with the same basename exist in different directories of the file tree; but there is no easy way to solve that ambiguity - which is why the link format changed.
* | | some corrections to AS encoding based on the current spec (some of this work ↵zotlabs2017-07-171-7/+22
| | | | | | | | | | | | was completed long before the spec settled).
* | | activitypub, cont.zotlabs2017-07-171-14/+26
| | |
* | | Merge branch 'bug827'zotlabs2017-07-171-3/+4
|\ \ \ | |_|/ |/| |
| * | fix typozotlabs2017-07-171-3/+4
| | |