aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1338-4210/+11849
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-121-0/+77
| |\
| | * ability to parse info blocks in third-party (or system) widgetszotlabs2018-01-121-0/+77
| * | update league/html-to-markdown via composerMario Vavti2018-01-1210-390/+379
| * | fix some breaking changes with bootstrap 4 beta3Mario Vavti2018-01-125-5/+5
| * | update to bootstrap 4 beta3Mario Vavti2018-01-1222-3814/+11387
| * | typoMario Vavti2018-01-121-1/+1
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-129-119/+336
| |\ \
| * | | mod hq: stick to show latest unseen toplevel post on loadMario Vavti2018-01-121-2/+2
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1237-171/+415
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #951 from dawnbreak/docugit-marijus2018-01-129-119/+336
| |\ \ \ | | |/ / | |/| |
| | * | :bulb: Add source documentation from recent conversations.Klaus Weidenbach2018-01-059-119/+336
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-123-10/+25
| |\ \ \ | | | |/ | | |/|
| | * | expose settings for site sellpage and site locationzotlabs2018-01-112-0/+13
| | * | OpenWebAuth: can fail after site re-installs; this may need to be pushed forw...zotlabs2018-01-111-10/+12
| * | | continue working on hqMario Vavti2018-01-112-20/+20
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-1118-13/+20
| |\| |
| | * | tag nav_featured_app to apps that the corresponding features may not be enabl...zotlabs2018-01-104-4/+4
| | * | provide de-de language since some browsers do not offer de on its ownzotlabs2018-01-1011-0/+1
| | * | db issue reported in hubzilla #953 - this does not do anything about the auth...zotlabs2018-01-101-1/+2
| | * | hubzilla issue #945 continued: We previously blocked directory keywords when ...zotlabs2018-01-102-8/+13
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-091-1/+1
| | |\ \
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-103-4/+6
| |\| | |
| | * | | scrutinizer modszotlabs2018-01-093-4/+6
| * | | | introduce datasrc2src(selector) js functionMario Vavti2018-01-102-5/+8
| | |/ / | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-095-9/+12
|\| | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-094-8/+11
| |\| |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-0814-128/+80
| | |\ \
| | * | | scrutinizer issues: none worthy of including in 3.0, there will likely be a f...zotlabs2018-01-084-8/+11
| * | | | changelogMario Vavti2018-01-091-1/+1
| | |/ / | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-0834-192/+338
|\| | |
| * | | fix regression in app categoriesMario Vavti2018-01-082-4/+5
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-076-13/+146
| |\| |
| | * | hubzilla issue #946zotlabs2018-01-072-2/+128
| | * | issues with feed parameterszotlabs2018-01-024-11/+18
| * | | start with nonactive state for the notifications button and display some text...Mario Vavti2018-01-074-0/+9
| * | | make active notifications filter stickyMario Vavti2018-01-061-1/+1
| | |/ | |/|
| * | bump versionMario Vavti2018-01-041-1/+1
| * | fix nav update regressions - fixes issue #950Mario Vavti2018-01-042-6/+6
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-033-113/+41
| |\ \
| | * \ Merge pull request #949 from einervonvielen/dev-fix-homeinstallgit-marijus2018-01-033-113/+41
| | |\ \
| | | * | TypoEiner von Vielen2018-01-031-2/+2
| | | * | Fixed homeinstall for dev as in 3.0RCEiner von Vielen2018-01-033-114/+42
| | |/ /
| * / / update changelogMario Vavti2018-01-031-0/+6
| |/ /
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-0210-40/+71
| |\|
| | * hubzilla issue #947zotlabs2018-01-011-1/+2
| | * this should finish up hubzilla issue #113zotlabs2017-12-314-9/+30
| | * provide warning if ffmpeg not found and video thumbnail is requestedzotlabs2017-12-301-1/+7
| | * update file thumbnails when imported/syncedzotlabs2017-12-301-0/+3
| | * test of new affinity preset code (post 3.0)zotlabs2017-12-302-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:23:58 +0000