| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-13 | 38 | -4210/+11849 |
|\ |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 1 | -0/+77 |
| |\ |
|
| | * | ability to parse info blocks in third-party (or system) widgets | zotlabs | 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 |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-12 | 37 | -171/+415 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge pull request #951 from dawnbreak/docu | git-marijus | 2018-01-12 | 9 | -119/+336 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | :bulb: Add source documentation from recent conversations. | Klaus Weidenbach | 2018-01-05 | 9 | -119/+336 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 3 | -10/+25 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | 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 forw... | zotlabs | 2018-01-11 | 1 | -10/+12 |
| * | | | 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 |
| |\| | |
|
| | * | | tag nav_featured_app to apps that the corresponding features may not be enabl... | zotlabs | 2018-01-10 | 4 | -4/+4 |
| | * | | 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 auth... | zotlabs | 2018-01-10 | 1 | -1/+2 |
| | * | | hubzilla issue #945 continued: We previously blocked directory keywords when ... | zotlabs | 2018-01-10 | 2 | -8/+13 |
| | * | | 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-10 | 3 | -4/+6 |
| |\| | | |
|
| | * | | | scrutinizer mods | zotlabs | 2018-01-09 | 3 | -4/+6 |
| * | | | | introduce datasrc2src(selector) js function | Mario Vavti | 2018-01-10 | 2 | -5/+8 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-09 | 5 | -9/+12 |
|\| | | |
|
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-09 | 4 | -8/+11 |
| |\| | |
|
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-08 | 14 | -128/+80 |
| | |\ \ |
|
| | * | | | scrutinizer issues: none worthy of including in 3.0, there will likely be a f... | zotlabs | 2018-01-08 | 4 | -8/+11 |
| * | | | | changelog | Mario Vavti | 2018-01-09 | 1 | -1/+1 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-08 | 34 | -192/+338 |
|\| | | |
|
| * | | | 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 |
| |\| | |
|
| | * | | hubzilla issue #946 | zotlabs | 2018-01-07 | 2 | -2/+128 |
| | * | | issues with feed parameters | zotlabs | 2018-01-02 | 4 | -11/+18 |
| * | | | start with nonactive state for the notifications button and display some text... | Mario Vavti | 2018-01-07 | 4 | -0/+9 |
| * | | | 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 |
| | |\ \ |
|
| | | * | | 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 |
| |\| |
|
| | * | hubzilla issue #947 | zotlabs | 2018-01-01 | 1 | -1/+2 |
| | * | this should finish up hubzilla issue #113 | zotlabs | 2017-12-31 | 4 | -9/+30 |
| | * | provide warning if ffmpeg not found and video thumbnail is requested | zotlabs | 2017-12-30 | 1 | -1/+7 |
| | * | update file thumbnails when imported/synced | zotlabs | 2017-12-30 | 1 | -0/+3 |
| | * | test of new affinity preset code (post 3.0) | zotlabs | 2017-12-30 | 2 | -7/+7 |