| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|\ |
|
| * | support for netselect query | zotlabs | 2017-11-01 | 5 | -8/+31 |
| * | Maria's profile photo issue, please push to master. | zotlabs | 2017-11-01 | 1 | -2/+8 |
| * | provide personal config for channel_menu; the site can set an initial site-wi... | zotlabs | 2017-10-31 | 1 | -0/+3 |
| * | pdledit - show original/system layout text for comparison | zotlabs | 2017-10-31 | 1 | -2/+6 |
| * | add another delivery control parameter (force queue threshold) | zotlabs | 2017-10-31 | 1 | -2/+5 |
| * | provide a 'tile' view (view only) mode to mod_cloud | zotlabs | 2017-10-30 | 2 | -0/+37 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-30 | 5 | -13/+33 |
|\| |
|
| * | allow plugin class widgets, fix sql error in page module | zotlabs | 2017-10-29 | 2 | -1/+4 |
| * | fix "unstar" | zotlabs | 2017-10-28 | 1 | -1/+1 |
| * | encrypt the owa token | zotlabs | 2017-10-26 | 2 | -4/+13 |
| * | hubzilla issue #890, separate the pdl preview feature from the mod_page webpa... | zotlabs | 2017-10-25 | 1 | -7/+15 |
* | | Added mode to Portfolio widget | Haakon Meland Eriksen | 2017-10-29 | 1 | -0/+12 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-10-24 | 1 | -17/+27 |
|\ |
|
| * | Merge pull request #884 from dawnbreak/dev | git-marijus | 2017-10-24 | 1 | -17/+27 |
| |\ |
|
| | * | We call Theme:url() statically, make it also static. | Klaus Weidenbach | 2017-10-23 | 1 | -17/+27 |
* | | | comment out statistics link in mod pubsites until we have something functiona... | Mario Vavti | 2017-10-24 | 1 | -2/+2 |
|/ / |
|
* | | not sure when but the hcard went missing in webfinger | zotlabs | 2017-10-23 | 1 | -0/+7 |
* | | acl encoding issues | zotlabs | 2017-10-23 | 1 | -2/+2 |
* | | mod_display: provide alternate serialisations (starting with atom) | zotlabs | 2017-10-22 | 1 | -54/+113 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-22 | 3 | -35/+44 |
|\| |
|
| * | do not show seen notifys in notifications - show them in mod notifications in... | Mario Vavti | 2017-10-22 | 2 | -35/+37 |
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-20 | 3 | -51/+96 |
| |\ |
|
| * | | Display different info message if using invite code | Andrew Manning | 2017-10-19 | 1 | -1/+5 |
* | | | bring back the markdown post feature (after investing some effort to make it ... | zotlabs | 2017-10-22 | 1 | -37/+9 |
| |/
|/| |
|
* | | register workflow was getting over-ridden in include/security | zotlabs | 2017-10-19 | 2 | -5/+6 |