aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-121-3/+3
|\
| * minor js and css changesgit-marijus2017-08-121-3/+3
* | add parent item (if applicable) to notifier plugin infozotlabs2017-08-121-0/+2
|/
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-102-2/+9
* create cdav principal also on client access and remove redundant pconfig chec...Mario Vavti2017-08-102-6/+12
* merge red/master into devMario Vavti2017-08-105-8/+9
* App::get_channel() does not return the right channel if we are not looking at...git-marijus2017-08-091-7/+1
* only show upload button to those with write_storage permissionzotlabs2017-08-081-0/+1
* support upload of files and attachments into comments. This has some repercus...zotlabs2017-08-081-0/+1
* make config requirements in apps more universal - provide key and valuegit-marijus2017-08-061-6/+4
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-062-0/+89
|\
| * allow channel address to be changedzotlabs2017-08-042-0/+89
* | consolidate disable_discover_tab config if it was not yet set to either 1 or ...git-marijus2017-08-065-7/+10
|/
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-08-035-14/+28
|\
| * minor activitypub rendering stuffzotlabs2017-08-021-1/+1
| * plugin hook for update_unseenzotlabs2017-08-013-13/+26
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-012-7/+28
| |\
| * | auto preview when inserting a media item or embed into a post. Since this una...zotlabs2017-08-011-0/+1
* | | missing observer hashgit-marijus2017-08-031-1/+1
* | | return preview also if we have no attachmentgit-marijus2017-08-031-1/+1
| |/ |/|
* | do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_typegit-marijus2017-08-011-1/+3
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-011-1/+2
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-312-9/+6
| |\
| * | modify connection edit display for channels with no address/webbiezotlabs2017-07-301-1/+2
* | | correct the logic for configs in app requirementgit-marijus2017-08-011-6/+25
| |/ |/|
* | improve file_activity() a littlegit-marijus2017-07-312-9/+6
|/
* implement system configs as app requirement and add the pubstream appgit-marijus2017-07-311-4/+10
* ltrim $display_path in attach_store() to be consistent with attach_mkdir() an...git-marijus2017-07-301-0/+2
* another syntax errorgit-marijus2017-07-301-1/+1
* do not include ACTIVITY_OBJ_FILE obj_type in the ping/something querygit-marijus2017-07-301-2/+5
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-301-1/+1
|\
| * missing quotes on string in network update_unseenzotlabs2017-07-291-1/+1
* | implement file notification on initial upload and rename get_parent_cloudpath...git-marijus2017-07-293-12/+11
|/
* provide public stream notification also for not authenticated viewersgit-marijus2017-07-292-3/+8
* switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network...git-marijus2017-07-291-2/+2
* fix notifications - item_notshown is set for likes, etc.zotlabs2017-07-291-2/+3
* filter by item_notshown instead of obj_typegit-marijus2017-07-282-5/+4
* do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do no...git-marijus2017-07-282-3/+6
* initial notifications support for new shared files and new (since initial sit...git-marijus2017-07-283-8/+55
* default to static updates if not local channelgit-marijus2017-07-272-2/+2
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-275-3/+34
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2513-12/+34
| |\
| * | provide a keychange operation to rebase an identity on a new keypairzotlabs2017-07-244-2/+33
| * | suppress fopen errors from davzotlabs2017-07-231-1/+1
* | | move the active app code to include/nav.php - it is only relevant theregit-marijus2017-07-261-3/+0
| |/ |/|
* | show the right conversation active and do not show any conversation active if...git-marijus2017-07-221-1/+3
* | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-223-6/+7
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2116-12/+26
| |\
| * | allow wildcard tag searches in search module alsozotlabs2017-07-201-2/+3
| * | allow wildcard tag and category searcheszotlabs2017-07-202-4/+4