Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-02 | 3 | -4/+9 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-02 | 12 | -25/+109 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-01 | 5 | -35/+94 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-31 | 1 | -0/+20 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | proper pronoun | zotlabs | 2018-05-31 | 1 | -1/+1 | |
| * | | | | | | | | | don't show forums in forum widget if archived flag is set | zotlabs | 2018-05-31 | 1 | -1/+1 | |
| * | | | | | | | | | when removing a connection, use the same rules as expire: don't remove items ... | zotlabs | 2018-05-31 | 1 | -2/+7 | |
* | | | | | | | | | | respect the privacy group feature setting in nav | Mario Vavti | 2018-06-02 | 1 | -2/+2 | |
* | | | | | | | | | | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 12 | -93/+152 | |
* | | | | | | | | | | some more work on forum notifications | Mario Vavti | 2018-06-02 | 5 | -10/+53 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | unread forum notifications - wip/unfinished | Mario Vavti | 2018-06-01 | 4 | -3/+77 | |
* | | | | | | | | | add manage privacy groups entry to the panel channel menu dropdown for now | Mario Vavti | 2018-06-01 | 3 | -15/+8 | |
* | | | | | | | | | fixes for css fix | Mario Vavti | 2018-06-01 | 5 | -5/+12 | |
* | | | | | | | | | css fix | Mario Vavti | 2018-06-01 | 1 | -3/+2 | |
* | | | | | | | | | add hover effect to dropdown caret | Mario Vavti | 2018-06-01 | 3 | -2/+13 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | move file and groups filter to submenu | Mario Vavti | 2018-06-01 | 5 | -35/+94 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | implement reset button for filters | Mario Vavti | 2018-05-31 | 1 | -0/+20 | |
|/ / / / / / | ||||||
* | | | | | | change some strings | Mario Vavti | 2018-05-31 | 1 | -4/+4 | |
* | | | | | | 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 |