| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-02 | 3 | -6/+6 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 4 | -8/+36 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 1 | -1/+11 |
| | |\ \ | |||||
| | * | | | fix issues with diaspora xchans | Mario Vavti | 2017-11-02 | 3 | -6/+6 |
| | | | | | |||||
| * | | | | more queue work | zotlabs | 2017-11-02 | 3 | -5/+12 |
| | |_|/ |/| | | |||||
| * | | | put deferred queue logic every place we create a delivery process (except ↵ | zotlabs | 2017-11-02 | 4 | -8/+36 |
| | |/ |/| | | | | | for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything. | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-01 | 1 | -0/+12 |
| |\| | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-01 | 22 | -17/+173 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-30 | 9 | -27/+72 |
| | |\ \ | |||||
| | * \ \ | Merge pull request #897 from HaakonME/dev | git-marijus | 2017-10-30 | 1 | -0/+12 |
| | |\ \ \ | | | | | | | | | | | Added mode to Portfolio widget | ||||
| | | * | | | 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 | Haakon Meland Eriksen | 2017-10-29 | 2 | -9/+9 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Haakon Meland Eriksen | 2017-10-27 | 1 | -0/+20 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Haakon Meland Eriksen | 2017-10-24 | 4 | -23/+55 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Haakon Meland Eriksen | 2017-10-24 | 3 | -3/+10 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Haakon Meland Eriksen | 2017-10-24 | 16 | -3058/+3859 |
| | | |\ \ \ \ \ \ | |||||
| * | | | | | | | | | don't perform zot_refresh on dead sites unless $force is set | zotlabs | 2017-11-01 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | do not send message_list responses to dead sites (this delivery method ↵ | zotlabs | 2017-11-01 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | bypassed the notifier) | ||||
| * | | | | | | | | support for netselect query | zotlabs | 2017-11-01 | 6 | -8/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Maria's profile photo issue, please push to master. | zotlabs | 2017-11-01 | 2 | -2/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | provide personal config for channel_menu; the site can set an initial ↵ | zotlabs | 2017-10-31 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | site-wide value but this but there isn't a corresponding admin setting currently and can only be set by manual config | ||||
| * | | | | | | | | pdledit - show original/system layout text for comparison | zotlabs | 2017-10-31 | 2 | -2/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | add another delivery control parameter (force queue threshold) | zotlabs | 2017-10-31 | 3 | -3/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | bring back sitesearch widget in mod_search because some screen modes don't ↵ | zotlabs | 2017-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have search in the navbar and there is no other way to enter text - hubzilla issue #898 | ||||
| * | | | | | | | | move tile styles to theme instead of template file | zotlabs | 2017-10-30 | 2 | -7/+30 |
| | | | | | | | | | |||||
| * | | | | | | | | use 1) personal setting, 2) site setting, 3) default false - for ↵ | zotlabs | 2017-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system.channel_menu | ||||
| * | | | | | | | | provide a 'tile' view (view only) mode to mod_cloud | zotlabs | 2017-10-30 | 4 | -0/+73 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | memory overflow trying to delete a connection with a very high noise to ↵ | zotlabs | 2017-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signal ratio | ||||
| * | | | | | | | add some documentation about shareable widgets | zotlabs | 2017-10-29 | 1 | -2/+32 |
| | | | | | | | | |||||
| * | | | | | | | allow plugin class widgets, fix sql error in page module | zotlabs | 2017-10-29 | 3 | -12/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-29 | 2 | -9/+9 |
| |\| | | | | | | |||||
| | * | | | | | | Merge pull request #894 from mjfriaza/dev | git-marijus | 2017-10-29 | 2 | -9/+9 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Spanish translation revised again. | ||||
| | | * | | | | | Spanish translation revised again. | Manuel Jiménez Friaza | 2017-10-28 | 2 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | fix "unstar" | zotlabs | 2017-10-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | 1/2 of hubzilla issue #893 | zotlabs | 2017-10-26 | 1 | -0/+6 |
| | | | | | | | | |||||
| * | | | | | | | encrypt the owa token | zotlabs | 2017-10-26 | 2 | -4/+13 |
| | | | | | | | | |||||
| * | | | | | | | hubzilla issue #890, separate the pdl preview feature from the mod_page ↵ | zotlabs | 2017-10-25 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webpage query so that the webpage will always win if a webpage and pdl have the same name. | ||||
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-25 | 10 | -27/+128 |
| |\| | | | | | | |||||
| | * | | | | | | Merge pull request #888 from anaqreon/card-context | git-marijus | 2017-10-25 | 1 | -0/+20 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Context help for cards | ||||
| | | * | | | | | Context help for cards | Andrew Manning | 2017-10-24 | 1 | -0/+20 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-10-24 | 6 | -22/+103 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge pull request #884 from dawnbreak/dev | git-marijus | 2017-10-24 | 3 | -21/+53 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Update composer autoload cache. | ||||
| | | | * | | | | | We call Theme:url() statically, make it also static. | Klaus Weidenbach | 2017-10-23 | 1 | -17/+27 |
| | | | | | | | | | |||||
| | | | * | | | | | Update composer autoload cache. | Klaus Weidenbach | 2017-10-23 | 2 | -4/+26 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #882 from HaakonME/dev | git-marijus | 2017-10-24 | 3 | -1/+50 |
| | | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | / | | | |_|_|_|/ | | |/| | | | | Portfolio widget - CSS update | ||||
| | | | * | | | | Portfolio widget - CSS update | Haakon Meland Eriksen | 2017-10-22 | 3 | -1/+50 |
| | | | | | | | | |||||
| | * | | | | | | comment out statistics link in mod pubsites until we have something ↵ | Mario Vavti | 2017-10-24 | 1 | -2/+2 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | functional again | ||||
| | * | | | | | not sure when but the hcard went missing in webfinger | zotlabs | 2017-10-23 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | acl encoding issues | zotlabs | 2017-10-23 | 2 | -3/+3 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-23 | 7 | -95/+152 |
| |\| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |