| Commit message (Expand) | Author | Age | Files | Lines |
* | allow svg image previews in cloud browser when using tile mode. | zotlabs | 2017-11-16 | 1 | -1/+10 |
* | Add private forums to forum widget. The link redirects to the remote channel ... | zotlabs | 2017-11-15 | 1 | -3/+29 |
* | This should sort out hubzilla issue #826 but requires a bit more testing. It ... | zotlabs | 2017-11-15 | 2 | -5/+15 |
* | sort out a few more large image upload issues | zotlabs | 2017-11-14 | 3 | -2/+22 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-14 | 1 | -0/+1 |
|\ |
|
| * | Merge pull request #907 from dawnbreak/QA_testing | git-marijus | 2017-11-14 | 1 | -0/+1 |
| |\ |
|
| | * | :ok_hand: Fix a PHP warning in Permissions::FilledPerms(). | Klaus Weidenbach | 2017-11-10 | 1 | -0/+1 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-14 | 1 | -0/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | move mailhost settings from plugin to core | zotlabs | 2017-11-13 | 1 | -0/+4 |
* | | | sort combined private mail conversations by latest updated conversation inste... | Mario Vavti | 2017-11-13 | 1 | -5/+7 |
* | | | 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 | 2 | -1/+16 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-12 | 2 | -2/+3 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-11 | 1 | -3/+6 |
| |\ \ |
|
| * | | | fix wiki pages not updating after creating new page | Mario Vavti | 2017-11-11 | 1 | -1/+1 |
| | |/
| |/| |
|
| * | | revert back to get the mid from enotify - otherwise we can not distinct betwe... | Mario Vavti | 2017-11-10 | 1 | -1/+2 |
* | | | cleanup of upload_to_comments test; we actually don't care about the profile ... | zotlabs | 2017-11-12 | 1 | -9/+0 |
| |/
|/| |
|
* | | set os_syspath in DAV file put operation so that photos will scale correctly. | zotlabs | 2017-11-10 | 1 | -3/+6 |
|/ |
|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-09 | 2 | -1/+5 |
|\ |
|
| * | unable to change permissions on wiki with space in name | zotlabs | 2017-11-08 | 1 | -1/+1 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-08 | 1 | -0/+2 |
| |\ |
|
| * | | make most recent cloud_tiles setting for local channels persistent across logins | zotlabs | 2017-11-07 | 1 | -0/+4 |
* | | | get the path infos from pathname instead of seperate data attribute | Mario Vavti | 2017-11-09 | 1 | -1/+0 |
* | | | load notifications links to /display via ajax if we are already in /display | Mario Vavti | 2017-11-09 | 2 | -0/+2 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-07 | 2 | -1/+268 |
|\| |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-06 | 1 | -1/+1 |
| |\ |
|
| * | | .htignore update | zotlabs | 2017-11-06 | 1 | -1/+1 |
| * | | second half of issue #893 - move channel default permissions to its own modul... | zotlabs | 2017-11-06 | 2 | -1/+268 |
* | | | rename channel app events to calendar and add nav_set_selected() to /cal | Mario Vavti | 2017-11-07 | 1 | -0/+2 |
| |/
|/| |
|
* | | fix unable to mark all messages read | Mario Vavti | 2017-11-06 | 1 | -1/+1 |
|/ |
|
* | allow cloud filenames to include ampersands without messing up auth tokens (z... | zotlabs | 2017-11-05 | 2 | -16/+9 |
* | common connections on suggestion page showing wildly different results than r... | zotlabs | 2017-11-05 | 1 | -2/+2 |
* | Merge branch 'dev' into docu | git-marijus | 2017-11-04 | 3 | -8/+20 |
|\ |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-04 | 2 | -3/+6 |
| |\ |
|
| | * | provide short localised summary for likes that will end up in displayed notif... | zotlabs | 2017-11-03 | 1 | -1/+5 |
| | * | more search work | zotlabs | 2017-11-03 | 1 | -2/+1 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 1 | -5/+14 |
| |\| |
|
| | * | fix cloud redirects with owt tokens | zotlabs | 2017-11-03 | 1 | -5/+14 |
* | | | :bulb: Improving Doxygen documentation. | Klaus Weidenbach | 2017-11-03 | 12 | -239/+451 |
|/ / |
|
* | | update item_normal() to not include ACTIVITY_OBJ_FILE obj_type | Mario Vavti | 2017-11-03 | 2 | -12/+5 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 2 | -0/+43 |
|\| |
|
| * | hubzilla issue #896 | zotlabs | 2017-11-02 | 1 | -0/+42 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-02 | 1 | -2/+2 |
| |\ |
|
| * | | more queue work | zotlabs | 2017-11-02 | 1 | -0/+1 |
* | | | set $module_format to html to not break updates. it will be set to something ... | Mario Vavti | 2017-11-03 | 1 | -0/+2 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 1 | -0/+8 |
|\| |
|
| * | put deferred queue logic every place we create a delivery process (except for... | zotlabs | 2017-11-02 | 1 | -0/+8 |
* | | fix issues with diaspora xchans | Mario Vavti | 2017-11-02 | 1 | -2/+2 |
|/ |
|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-01 | 11 | -14/+90 |
|\ |
|