aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1421-261/+656
|\
| * change button id to not interfere with the upload submit buttonMario Vavti2017-11-141-1/+1
| * move notifications full-screen handling to notifications widgetMario Vavti2017-11-142-14/+16
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-144-35/+388
| |\
| | * Merge pull request #907 from dawnbreak/QA_testinggit-marijus2017-11-144-35/+388
| | |\
| | | * :ok_hand: Fix a PHP warning in Permissions::FilledPerms().Klaus Weidenbach2017-11-101-0/+1
| | | * :white_check_mark: unit tests for Zotlabs\Access classes.Klaus Weidenbach2017-11-103-35/+387
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-143-6/+9
| |\ \ \ | | |/ / | |/| |
| | * | move mailhost settings from plugin to corezotlabs2017-11-132-0/+7
| | * | issue with group_rmvzotlabs2017-11-131-6/+2
| * | | sort combined private mail conversations by latest updated conversation inste...Mario Vavti2017-11-132-9/+8
| * | | fix php warnings on photo deleteMario Vavti2017-11-131-1/+1
| * | | 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-123-16/+61
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-1213-16/+304
| |\ \
| * | | fix some conflicts between private tags and forum tagszotlabs2017-11-121-154/+150
| * | | cleanup of upload_to_comments test; we actually don't care about the profile ...zotlabs2017-11-122-23/+8
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1219-32/+326
|\ \ \ \ | | |/ / | |/| |
| * | | removed underline only for testing purpose - revertMario Vavti2017-11-121-1/+1
| * | | fix some schema issuesMario Vavti2017-11-124-5/+21
| * | | more changelogMario Vavti2017-11-111-0/+2
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-116-16/+22
| |\| |
| | * | also disable uploading in comments if the channel permissionlimits for view_s...zotlabs2017-11-111-0/+3
| | * | set os_syspath in DAV file put operation so that photos will scale correctly.zotlabs2017-11-101-3/+6
| | * | hubzilla issue #901 - unicode characters in urls tripping up url regexes - th...zotlabs2017-11-094-13/+13
| * | | changelogMario Vavti2017-11-111-1/+32
| * | | fix wiki pages not updating after creating new pageMario Vavti2017-11-111-1/+1
| * | | animate fastMario Vavti2017-11-111-1/+1
| * | | dedicate the first click to slideup the cover again but make sure the nav but...Mario Vavti2017-11-111-2/+1
| | |/ | |/|
| * | revert back to get the mid from enotify - otherwise we can not distinct betwe...Mario Vavti2017-11-103-7/+8
| * | bring some ajax to photo uploadMario Vavti2017-11-103-0/+239
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-097-3/+35
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-094-3/+7
| |\
| | * unable to change permissions on wiki with space in namezotlabs2017-11-081-1/+1
| | * use loggerzotlabs2017-11-081-2/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-085-17/+35
| | |\
| | * | make most recent cloud_tiles setting for local channels persistent across loginszotlabs2017-11-072-0/+5
| * | | get the path infos from pathname instead of seperate data attributeMario Vavti2017-11-093-9/+7
| * | | load notifications links to /display via ajax if we are already in /displayMario Vavti2017-11-095-5/+34
| | |/ | |/|
* | | use loggerzotlabs2017-11-081-2/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0812-21/+426
|\| |
| * | css fixesMario Vavti2017-11-082-7/+7
| * | only show nav app link if we have a selected appMario Vavti2017-11-081-0/+2
| * | use text-muted on site locationMario Vavti2017-11-081-1/+1
| * | truncate nav-app-link if appropriateMario2017-11-083-3/+8
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-078-4/+391
| |\|
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-068-13/+45
| | |\
| | * | .htignore updatezotlabs2017-11-062-2/+3
| | * | second half of issue #893 - move channel default permissions to its own modul...zotlabs2017-11-066-1/+377
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 06:19:20 +0000