| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-13 | 37 | -4210/+11772 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 1 | -0/+77 |
| | |\ | |||||
| | * | | update league/html-to-markdown via composer | Mario Vavti | 2018-01-12 | 10 | -390/+379 |
| | | | | |||||
| | * | | fix some breaking changes with bootstrap 4 beta3 | Mario Vavti | 2018-01-12 | 5 | -5/+5 |
| | | | | |||||
| | * | | update to bootstrap 4 beta3 | Mario Vavti | 2018-01-12 | 22 | -3814/+11387 |
| | | | | |||||
| | * | | typo | Mario Vavti | 2018-01-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-12 | 9 | -119/+336 |
| | |\ \ | |||||
| | * | | | mod hq: stick to show latest unseen toplevel post on load | Mario Vavti | 2018-01-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | cleanup of last fix | zotlabs | 2018-01-13 | 3 | -4/+4 |
| | | | | | |||||
| * | | | | unexpected openssl result | zotlabs | 2018-01-13 | 3 | -2/+3 |
| | | | | | |||||
| * | | | | improve owa logging | zotlabs | 2018-01-13 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-12 | 13 | -144/+364 |
| |\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| | * | | Merge pull request #951 from dawnbreak/docu | git-marijus | 2018-01-12 | 9 | -119/+336 |
| | |\ \ | | |/ | |/| | :bulb: Add source documentation from recent conversations. | ||||
| | | * | :bulb: Add source documentation from recent conversations. | Klaus Weidenbach | 2018-01-05 | 9 | -119/+336 |
| | | | | | | | | | | | | | | | | | | | There have been some conversations in the last weeks which explained several parts of the code, so add it to the source code documentation. Also some other small source code documentation improvements. | ||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 3 | -10/+25 |
| | |\ \ | |||||
| | * | | | continue working on hq | Mario Vavti | 2018-01-11 | 2 | -20/+20 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-11 | 18 | -13/+20 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-10 | 3 | -4/+6 |
| | |\ \ \ \ | |||||
| | * | | | | | introduce datasrc2src(selector) js function | Mario Vavti | 2018-01-10 | 2 | -5/+8 |
| | | | | | | | |||||
| * | | | | | | ability to parse info blocks in third-party (or system) widgets | zotlabs | 2018-01-12 | 1 | -0/+77 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | expose settings for site sellpage and site location | zotlabs | 2018-01-11 | 2 | -0/+13 |
| | | | | | | |||||
| * | | | | | OpenWebAuth: can fail after site re-installs; this may need to be pushed ↵ | zotlabs | 2018-01-11 | 1 | -10/+12 |
| | |_|/ / |/| | | | | | | | | | | | forward to master | ||||
| * | | | | tag nav_featured_app to apps that the corresponding features may not be ↵ | zotlabs | 2018-01-10 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | enabled by default, so that they will become visible in the app menu when enabled | ||||
| * | | | | provide de-de language since some browsers do not offer de on its own | zotlabs | 2018-01-10 | 11 | -0/+1 |
| | | | | | |||||
| * | | | | db issue reported in hubzilla #953 - this does not do anything about the ↵ | zotlabs | 2018-01-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | auth issue | ||||
| * | | | | hubzilla issue #945 continued: We previously blocked directory keywords when ↵ | zotlabs | 2018-01-10 | 2 | -8/+13 |
| | | | | | | | | | | | | | | | | | searching the local directory as it produced errant results and included results from the entire directory space (an issue that was resolved satisfactorily by that fix sometime in the past). As a result of issue #945 this was reworked so that we should return correct results for keywords when searching either the local directory or a standalone directory. | ||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-09 | 1 | -1/+1 |
| |\| | | | |/ / |/| | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-09 | 4 | -8/+11 |
| | |\ \ | |||||
| | * | | | changelog | Mario Vavti | 2018-01-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | scrutinizer mods | zotlabs | 2018-01-09 | 3 | -4/+6 |
| | |/ / |/| | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-08 | 14 | -128/+80 |
| |\| | | |||||
| | * | | fix regression in app categories | Mario Vavti | 2018-01-08 | 2 | -4/+5 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-07 | 6 | -13/+146 |
| | |\ \ | |||||
| | * | | | start with nonactive state for the notifications button and display some ↵ | Mario Vavti | 2018-01-07 | 4 | -0/+9 |
| | | | | | | | | | | | | | | | | | text if there are no notifications on small screens only | ||||
| | * | | | make active notifications filter sticky | Mario Vavti | 2018-01-06 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| | * | | bump version | Mario Vavti | 2018-01-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix nav update regressions - fixes issue #950 | Mario Vavti | 2018-01-04 | 2 | -6/+6 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-03 | 3 | -113/+41 |
| | |\ \ | |||||
| | | * \ | Merge pull request #949 from einervonvielen/dev-fix-homeinstall | git-marijus | 2018-01-03 | 3 | -113/+41 |
| | | |\ \ | | | | | | | | | | | Dev fix homeinstall | ||||
| | | | * | | Typo | Einer von Vielen | 2018-01-03 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | Fixed homeinstall for dev as in 3.0RC | Einer von Vielen | 2018-01-03 | 3 | -114/+42 |
| | | |/ / | |||||
| | * / / | update changelog | Mario Vavti | 2018-01-03 | 1 | -0/+6 |
| | |/ / | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-02 | 10 | -40/+71 |
| | |\ \ | |||||
| | * | | | changelog | Mario | 2017-12-28 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooks | git-marijus | 2017-12-27 | 1 | -3/+3 |
| | |\ \ \ | | | | | | | | | | | Fix dupe bug in content hooks | ||||
| | | * | | | Fix whitespace formatting | Matthew Dent | 2017-12-23 | 1 | -14/+14 |
| | | | | | | |||||
| | | * | | | fix dupe bug in content hooks | M.Dent | 2017-12-23 | 1 | -15/+15 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2017-12-27 | 5 | -11/+41 |
| | |\ \ \ \ | |||||
| | * | | | | | changelog | Mario | 2017-12-23 | 1 | -0/+2 |
| | | |/ / / | |/| | | | |||||
| * | | | | | scrutinizer issues: none worthy of including in 3.0, there will likely be a ↵ | zotlabs | 2018-01-08 | 4 | -8/+11 |
| | |_|_|/ |/| | | | | | | | | | | | few hundred more before all is said and done. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |