| Commit message (Expand) | Author | Age | Files | Lines |
* | change button id to not interfere with the upload submit button | Mario Vavti | 2017-11-14 | 1 | -1/+1 |
* | move notifications full-screen handling to notifications widget | Mario Vavti | 2017-11-14 | 2 | -14/+16 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-14 | 4 | -35/+388 |
|\ |
|
| * | Merge pull request #907 from dawnbreak/QA_testing | git-marijus | 2017-11-14 | 4 | -35/+388 |
| |\ |
|
| | * | :ok_hand: Fix a PHP warning in Permissions::FilledPerms(). | Klaus Weidenbach | 2017-11-10 | 1 | -0/+1 |
| | * | :white_check_mark: unit tests for Zotlabs\Access classes. | Klaus Weidenbach | 2017-11-10 | 3 | -35/+387 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-14 | 3 | -6/+9 |
|\ \ \
| |/ /
|/| | |
|
| * | | move mailhost settings from plugin to core | zotlabs | 2017-11-13 | 2 | -0/+7 |
| * | | issue with group_rmv | zotlabs | 2017-11-13 | 1 | -6/+2 |
* | | | sort combined private mail conversations by latest updated conversation inste... | Mario Vavti | 2017-11-13 | 2 | -9/+8 |
* | | | fix php warnings on photo delete | Mario Vavti | 2017-11-13 | 1 | -1/+1 |
* | | | also filter atokens on acl search | Mario Vavti | 2017-11-13 | 1 | -2/+9 |
|/ / |
|
* | | allow a site to block (public) the directory separately from other resources. | zotlabs | 2017-11-12 | 1 | -0/+5 |
* | | improve removed_channel final cleanup. Hubzilla issue #386 | zotlabs | 2017-11-12 | 3 | -16/+61 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-12 | 13 | -16/+304 |
|\ \ |
|
| * | | removed underline only for testing purpose - revert | Mario Vavti | 2017-11-12 | 1 | -1/+1 |
| * | | fix some schema issues | Mario Vavti | 2017-11-12 | 4 | -5/+21 |
| * | | more changelog | Mario Vavti | 2017-11-11 | 1 | -0/+2 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-11 | 6 | -16/+22 |
| |\ \ |
|
| * | | | changelog | Mario Vavti | 2017-11-11 | 1 | -1/+32 |
| * | | | fix wiki pages not updating after creating new page | Mario Vavti | 2017-11-11 | 1 | -1/+1 |
| * | | | animate fast | Mario Vavti | 2017-11-11 | 1 | -1/+1 |
| * | | | dedicate the first click to slideup the cover again but make sure the nav but... | Mario Vavti | 2017-11-11 | 1 | -2/+1 |
| | |/
| |/| |
|
| * | | revert back to get the mid from enotify - otherwise we can not distinct betwe... | Mario Vavti | 2017-11-10 | 3 | -7/+8 |
| * | | bring some ajax to photo upload | Mario Vavti | 2017-11-10 | 3 | -0/+239 |
* | | | fix some conflicts between private tags and forum tags | zotlabs | 2017-11-12 | 1 | -154/+150 |
* | | | cleanup of upload_to_comments test; we actually don't care about the profile ... | zotlabs | 2017-11-12 | 2 | -23/+8 |
| |/
|/| |
|
* | | also disable uploading in comments if the channel permissionlimits for view_s... | zotlabs | 2017-11-11 | 1 | -0/+3 |
* | | set os_syspath in DAV file put operation so that photos will scale correctly. | zotlabs | 2017-11-10 | 1 | -3/+6 |
* | | hubzilla issue #901 - unicode characters in urls tripping up url regexes - th... | zotlabs | 2017-11-09 | 4 | -13/+13 |
|/ |
|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-09 | 4 | -3/+7 |
|\ |
|
| * | unable to change permissions on wiki with space in name | zotlabs | 2017-11-08 | 1 | -1/+1 |
| * | use logger | zotlabs | 2017-11-08 | 1 | -2/+1 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-08 | 5 | -17/+35 |
| |\ |
|
| * | | make most recent cloud_tiles setting for local channels persistent across logins | zotlabs | 2017-11-07 | 2 | -0/+5 |
* | | | get the path infos from pathname instead of seperate data attribute | Mario Vavti | 2017-11-09 | 3 | -9/+7 |
* | | | load notifications links to /display via ajax if we are already in /display | Mario Vavti | 2017-11-09 | 5 | -5/+34 |
| |/
|/| |
|
* | | css fixes | Mario Vavti | 2017-11-08 | 2 | -7/+7 |
* | | only show nav app link if we have a selected app | Mario Vavti | 2017-11-08 | 1 | -0/+2 |
* | | use text-muted on site location | Mario Vavti | 2017-11-08 | 1 | -1/+1 |
* | | truncate nav-app-link if appropriate | Mario | 2017-11-08 | 3 | -3/+8 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-07 | 8 | -4/+391 |
|\| |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-06 | 8 | -13/+45 |
| |\ |
|
| * | | .htignore update | zotlabs | 2017-11-06 | 2 | -2/+3 |
| * | | second half of issue #893 - move channel default permissions to its own modul... | zotlabs | 2017-11-06 | 6 | -1/+377 |
| * | | bring back tabindex to submit comments | zotlabs | 2017-11-06 | 1 | -2/+12 |
* | | | rename channel app events to calendar and add nav_set_selected() to /cal | Mario Vavti | 2017-11-07 | 3 | -7/+6 |
* | | | move style out of template | Mario Vavti | 2017-11-07 | 2 | -3/+7 |
* | | | add location info to the navbar | Mario Vavti | 2017-11-07 | 2 | -8/+16 |
| |/
|/| |
|
* | | update es-es help.html | Mario Vavti | 2017-11-06 | 1 | -1/+1 |