| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-31 | 2 | -3/+2 |
|\ \ |
|
| * | | typo in unused function | zotlabs | 2018-05-30 | 1 | -1/+1 |
| * | | autocomplete private mail addresses based on substring in either the name or ... | zotlabs | 2018-05-30 | 1 | -2/+1 |
* | | | merge groups and filed posts into activity filters | Mario Vavti | 2018-05-31 | 6 | -26/+72 |
* | | | strpos does not work with arrays :( | Mario Vavti | 2018-05-30 | 2 | -2/+2 |
* | | | restrict the network/channel navbar search to content and hashtags | Mario Vavti | 2018-05-30 | 2 | -0/+6 |
* | | | make navbar search use the module search function in /network and /channel | Mario Vavti | 2018-05-30 | 5 | -15/+41 |
* | | | remove redundant css from default.css | Mario Vavti | 2018-05-30 | 1 | -8/+0 |
* | | | remove redundant reference for order | Mario Vavti | 2018-05-30 | 1 | -5/+0 |
* | | | just query for data we actually need | Mario Vavti | 2018-05-30 | 1 | -2/+6 |
* | | | add widget files and templates | Mario Vavti | 2018-05-30 | 3 | -0/+185 |
* | | | first cut on restructuring the previously called network tabs | Mario Vavti | 2018-05-30 | 5 | -16/+51 |
|/ / |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-29 | 5 | -5/+27 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-29 | 1 | -0/+2 |
| |\ \ |
|
| * \ \ | Merge pull request #1202 from aninf-wo/dev | git-marijus | 2018-05-29 | 1 | -0/+1 |
| |\ \ \ |
|
| | * | | | include photos.php | Herbert Thielen | 2018-05-27 | 1 | -0/+1 |
| * | | | | Merge pull request #1198 from mjfriaza/dev | git-marijus | 2018-05-29 | 2 | -0/+21 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Some stuff of the Spanish Hubzilla | Manuel Jiménez Friaza | 2018-05-26 | 2 | -0/+21 |
| * | | | | Merge pull request #1197 from galettesaucisse/patch-52 | git-marijus | 2018-05-29 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * | | | | Update hstrings.php | Galette Saucisse | 2018-05-26 | 1 | -2/+2 |
| * | | | | | Merge pull request #1196 from galettesaucisse/patch-51 | git-marijus | 2018-05-29 | 1 | -3/+3 |
| |\ \ \ \ \ |
|
| | * | | | | | Update hmessages.po | Galette Saucisse | 2018-05-26 | 1 | -3/+3 |
| | |/ / / / |
|
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-28 | 1 | -2/+2 |
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | provide possibility of using different orderings (post, commented) on channel... | zotlabs | 2018-05-29 | 1 | -4/+11 |
| |_|_|_|/
|/| | | | |
|
* | | | | | we probably don't need to delivery local items more than once | zotlabs | 2018-05-28 | 1 | -0/+2 |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-27 | 1 | -2/+2 |
|\| | | |
| |/ / /
|/| | | |
|
| * | | | fix js error with catalan language (unescaped strings) | Mario Vavti | 2018-05-27 | 1 | -2/+2 |
* | | | | hubzilla issue #1200 | zotlabs | 2018-05-27 | 1 | -2/+2 |
|/ / / |
|
* / / | DB update to fix wrong hubloc_url for activitypub hublocs | Mario Vavti | 2018-05-26 | 2 | -1/+27 |
|/ / |
|
* | | differentiate between direct messages and followers-only messages | Mario Vavti | 2018-05-25 | 1 | -2/+6 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-25 | 1 | -6/+14 |
|\ \ |
|
| * | | alternate fix for z_check_dns | zotlabs | 2018-05-24 | 1 | -6/+14 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-05-25 | 6 | -14880/+16835 |
|\ \ \ |
|
| * | | | Finaly an update of Dutch language strings | Jeroen | 2018-05-24 | 2 | -11655/+12317 |
| * | | | Merge pull request #1190 from fadelkon/dev | git-marijus | 2018-05-24 | 2 | -3225/+4431 |
| |\ \ \ |
|
| | * | | | Update catalan translation (both po and php) for sources changes up to Apr 23... | fadelkon | 2018-05-24 | 2 | -3225/+4431 |
| * | | | | Merge pull request #1183 from galettesaucisse/patch-50 | git-marijus | 2018-05-24 | 1 | -0/+10 |
| |\ \ \ \ |
|
| | * | | | | Create TermsOfService.md | Galette Saucisse | 2018-05-21 | 1 | -0/+10 |
| * | | | | | Merge pull request #1182 from galettesaucisse/patch-49 | git-marijus | 2018-05-24 | 1 | -0/+77 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -13/+6 |
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -8/+3 |
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -17/+5 |
| | * | | | | Create gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -0/+101 |
| | |/ / / |
|
* | / / / | Update remote_friends_common.tpl | antil0pa | 2018-05-24 | 1 | -1/+1 |
|/ / / / |
|
* | / / | paint the locks on private activitypub items red. their privacy model is "sli... | Mario Vavti | 2018-05-23 | 2 | -1/+5 |
| |/ /
|/| | |
|
* | | | deal with db failure gracefully | zotlabs | 2018-05-23 | 1 | -2/+2 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-21 | 10 | -16/+29 |
|\ \ \ |
|
| * | | | address globbing issue in #1170 | Mario Vavti | 2018-05-21 | 6 | -6/+18 |
| |/ / |
|
| * | | missing permission description | Mario Vavti | 2018-05-21 | 3 | -6/+3 |
| * | | bring jot reset to some more places | Mario Vavti | 2018-05-21 | 4 | -4/+8 |