Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 | |
| * | | | | Merge pull request #897 from HaakonME/dev | git-marijus | 2017-10-30 | 1 | -0/+12 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | 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 | |
| | |\ \ \ \ \ \ | ||||||
* | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_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. | Manuel Jiménez Friaza | 2017-10-28 | 2 | -9/+9 | |
* | | | | | | | | 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 | 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 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | 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 | Haakon Meland Eriksen | 2017-10-22 | 3 | -1/+50 | |
| * | | | | | | 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 | 2 | -3/+3 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-23 | 7 | -95/+152 | |
|\| | | | | ||||||
| * | | | | hubzilla issue #885 | zotlabs | 2017-10-23 | 1 | -0/+8 | |
| * | | | | mod_display: provide alternate serialisations (starting with atom) | zotlabs | 2017-10-22 | 2 | -54/+115 | |
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-22 | 9 | -2959/+3712 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | bring back the markdown post feature (after investing some effort to make it ... | zotlabs | 2017-10-22 | 4 | -41/+29 | |
* | | | | | not sure when but the hcard went missing in webfinger | zotlabs | 2017-10-23 | 1 | -0/+7 | |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-22 | 17 | -3017/+3883 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-10-22 | 4 | -2922/+3658 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #880 from mjfriaza/dev | git-marijus | 2017-10-22 | 2 | -1460/+1828 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | * | | | Fixed the Spanish translation | Manuel Jiménez Friaza | 2017-10-21 | 2 | -1460/+1828 | |
| | * | | | | Merge pull request #881 from phellmes/dev | git-marijus | 2017-10-22 | 2 | -1462/+1830 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Update DE translation strings | phellmes | 2017-10-21 | 2 | -1462/+1830 | |
| | | | |_|/ | | | |/| | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-22 | 1 | -4/+2 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | ||||||
| | * | | | wrong key | zotlabs | 2017-10-22 | 1 | -4/+2 | |
| * | | | | do not show seen notifys in notifications - show them in mod notifications in... | Mario Vavti | 2017-10-22 | 4 | -37/+47 | |
| | |/ / | |/| | | ||||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-20 | 8 | -53/+171 | |
| |\| | | ||||||
| | * | | register workflow was getting over-ridden in include/security | zotlabs | 2017-10-19 | 2 | -5/+6 | |
| | * | | typo | zotlabs | 2017-10-19 | 1 | -1/+1 | |
| | * | | table structure for pseudo or proxy channels (pchan) | zotlabs | 2017-10-19 | 6 | -51/+165 | |
| * | | | Merge pull request #879 from redmatrix/anaqreon-patch-1 | git-marijus | 2017-10-20 | 1 | -1/+5 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Display different info message if using invite code | Andrew Manning | 2017-10-19 | 1 | -1/+5 | |
| |/ / | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-19 | 10 | -1465/+1867 | |
|\| | | ||||||
| * | | changelog | Mario Vavti | 2017-10-20 | 1 | -0/+111 | |
| * | | strings | Mario Vavti | 2017-10-19 | 1 | -1380/+1689 | |
| * | | version | Mario Vavti | 2017-10-19 | 1 | -1/+1 | |
| * | | redirect to be moderated items to /moderate and change the conv link to parte... | Mario Vavti | 2017-10-19 | 3 | -6/+27 |