aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-248-6/+195
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-248-6/+195
| |\
| | * cards: make page load after comment postzotlabs2017-08-231-0/+6
| | |
| | * partial support (unfinished) for ajax loading cards with liveupdate; page ↵zotlabs2017-08-231-0/+9
| | | | | | | | | | | | still functions even though this isn't finished
| | * use two keys for the updated sortzotlabs2017-08-231-1/+3
| | |
| | * add new conv_sort optionzotlabs2017-08-231-0/+6
| | |
| | * lognoise: don't log sync packet contents if there are no clones to receive themzotlabs2017-08-231-2/+3
| | |
| | * several card enhancementszotlabs2017-08-232-1/+8
| | |
| | * cards featurezotlabs2017-08-235-2/+154
| | |
| | * util/dcp - support recursion and folders full of photos by importing files ↵zotlabs2017-08-221-1/+7
| | | | | | | | | | | | singly in separate processes - not yet tested
* | | Added language selector menu for Help pagesAndrew Manning2017-08-241-1/+24
|/ /
* | Fixed incorrect language path when choosing the language from browser preferenceAndrew Manning2017-08-241-1/+1
| |
* | Repaired and extended support for help page translations including table of ↵Andrew Manning2017-08-231-10/+29
|/ | | | contents files at the top level. Moved help module javascript to mod_help.js.
* stream_perms_xchans wasn't working which has effects in mod_display and ↵zotlabs2017-08-211-1/+2
| | | | there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested
* issue with oembed of a shared item, which wraps in another share.zotlabs2017-08-201-2/+2
|
* php warningszotlabs2017-08-181-1/+1
|
* remove easter eggzotlabs2017-08-151-7/+0
|
* new content typezotlabs2017-08-141-1/+0
|
* add protocol selection to following feedszotlabs2017-08-121-2/+5
|
* deliverable_singleton - also check hubloc_hash in case we don't have an ↵zotlabs2017-08-101-1/+9
| | | | xchan_hash
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-101-1/+14
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-101-4/+8
|\
| * do not show channel manager and nav channel select if we are in a delegate ↵git-marijus2017-08-101-4/+8
| | | | | | | | session
| * merge red/master into devMario Vavti2017-08-103-7/+8
| |
* | include the mastodon summary in the postzotlabs2017-08-101-2/+2
| |
* | when following, allow [network]follow_address syntax to connect with a ↵zotlabs2017-08-102-7/+20
| | | | | | | | specific network for multi-protocol services
* | some doco fixes and other real minor stuff to improve logreading abilityzotlabs2017-08-091-2/+2
| |
* | libxml errorszotlabs2017-08-092-5/+6
|/
* 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
|\