aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* This should sort out hubzilla issue #826 but requires a bit more testing. It ...zotlabs2017-11-152-5/+15
* sort out a few more large image upload issueszotlabs2017-11-143-2/+22
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-141-0/+1
|\
| * Merge pull request #907 from dawnbreak/QA_testinggit-marijus2017-11-141-0/+1
| |\
| | * :ok_hand: Fix a PHP warning in Permissions::FilledPerms().Klaus Weidenbach2017-11-101-0/+1
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-141-0/+4
|\ \ \ | |/ / |/| |
| * | move mailhost settings from plugin to corezotlabs2017-11-131-0/+4
* | | sort combined private mail conversations by latest updated conversation inste...Mario Vavti2017-11-131-5/+7
* | | also filter atokens on acl searchMario Vavti2017-11-131-2/+9
|/ /
* | allow a site to block (public) the directory separately from other resources.zotlabs2017-11-121-0/+5
* | improve removed_channel final cleanup. Hubzilla issue #386zotlabs2017-11-122-1/+16
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-122-2/+3
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-111-3/+6
| |\ \
| * | | fix wiki pages not updating after creating new pageMario Vavti2017-11-111-1/+1
| | |/ | |/|
| * | revert back to get the mid from enotify - otherwise we can not distinct betwe...Mario Vavti2017-11-101-1/+2
* | | cleanup of upload_to_comments test; we actually don't care about the profile ...zotlabs2017-11-121-9/+0
| |/ |/|
* | set os_syspath in DAV file put operation so that photos will scale correctly.zotlabs2017-11-101-3/+6
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-092-1/+5
|\
| * unable to change permissions on wiki with space in namezotlabs2017-11-081-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-081-0/+2
| |\
| * | make most recent cloud_tiles setting for local channels persistent across loginszotlabs2017-11-071-0/+4
* | | get the path infos from pathname instead of seperate data attributeMario Vavti2017-11-091-1/+0
* | | load notifications links to /display via ajax if we are already in /displayMario Vavti2017-11-092-0/+2
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-072-1/+268
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-061-1/+1
| |\
| * | .htignore updatezotlabs2017-11-061-1/+1
| * | second half of issue #893 - move channel default permissions to its own modul...zotlabs2017-11-062-1/+268
* | | rename channel app events to calendar and add nav_set_selected() to /calMario Vavti2017-11-071-0/+2
| |/ |/|
* | fix unable to mark all messages readMario Vavti2017-11-061-1/+1
|/
* allow cloud filenames to include ampersands without messing up auth tokens (z...zotlabs2017-11-052-16/+9
* common connections on suggestion page showing wildly different results than r...zotlabs2017-11-051-2/+2
* Merge branch 'dev' into docugit-marijus2017-11-043-8/+20
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-042-3/+6
| |\
| | * provide short localised summary for likes that will end up in displayed notif...zotlabs2017-11-031-1/+5
| | * more search workzotlabs2017-11-031-2/+1
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-031-5/+14
| |\|
| | * fix cloud redirects with owt tokenszotlabs2017-11-031-5/+14
* | | :bulb: Improving Doxygen documentation.Klaus Weidenbach2017-11-0312-239/+451
|/ /
* | update item_normal() to not include ACTIVITY_OBJ_FILE obj_typeMario Vavti2017-11-032-12/+5
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-032-0/+43
|\|
| * hubzilla issue #896zotlabs2017-11-021-0/+42
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-021-2/+2
| |\
| * | more queue workzotlabs2017-11-021-0/+1
* | | set $module_format to html to not break updates. it will be set to something ...Mario Vavti2017-11-031-0/+2
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-0/+8
|\|
| * put deferred queue logic every place we create a delivery process (except for...zotlabs2017-11-021-0/+8
* | fix issues with diaspora xchansMario Vavti2017-11-021-2/+2
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-0111-14/+90
|\
| * support for netselect queryzotlabs2017-11-015-8/+31
| * Maria's profile photo issue, please push to master.zotlabs2017-11-011-2/+8