aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-205-3/+80
|\
| * cloud tiles: use folder-o for folders and set the icon colour to something a ...zotlabs2017-11-191-1/+2
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-197-22/+322
| |\
| * | text thumbnails in cloud tile modezotlabs2017-11-194-2/+78
* | | we need a mid also if there is no unseen itemsMario Vavti2017-11-201-1/+0
* | | order by created instead of idMario Vavti2017-11-201-1/+1
* | | speed up initial query if no mid is providedMario Vavti2017-11-201-0/+1
| |/ |/|
* | hq: $item_normal was defined to lateMario Vavti2017-11-191-3/+3
* | fix issues with apporder related to recent pinned apps changesMario Vavti2017-11-192-7/+13
* | only provide notify id if otype == itemMario Vavti2017-11-191-1/+1
* | do not double encode already encoded midMario Vavti2017-11-191-1/+6
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-191-2/+11
|\|
| * svg thumbnails have security concerns. Added thumbnail security setting and h...zotlabs2017-11-171-2/+11
* | some more work on mod hqMario Vavti2017-11-183-79/+42
* | use substr() instead of str_replace()Mario Vavti2017-11-171-2/+1
* | remove obsolete variableMario Vavti2017-11-171-1/+0
* | inroduce the HQ module - a module with the potential to become a nice landing...Mario Vavti2017-11-172-1/+300
* | strip author name from notify messages in notifications - fix issue #911Mario Vavti2017-11-171-1/+8
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-171-1/+10
|\|
| * allow svg image previews in cloud browser when using tile mode.zotlabs2017-11-161-1/+10
* | add > pin and remove > unpinMario Vavti2017-11-161-2/+2
* | provide ability to pin apps to navbar from /apps. this removes the ability to...Mario Vavti2017-11-163-13/+35
|/
* Add private forums to forum widget. The link redirects to the remote channel ...zotlabs2017-11-151-3/+29
* 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