aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move markdown-in-posts/comments feature to pluginzotlabs2018-01-142-19/+10
* support tables in markdown posts/comments (but not table alignment); and do n...zotlabs2018-01-141-8/+9
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-1337-4210/+11772
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-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
* | | | cleanup of last fixzotlabs2018-01-133-4/+4
* | | | unexpected openssl resultzotlabs2018-01-133-2/+3
* | | | improve owa loggingzotlabs2018-01-131-1/+5
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-1213-144/+364
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | 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
| |\ \
| * | | continue working on hqMario Vavti2018-01-112-20/+20
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-1118-13/+20
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-103-4/+6
| |\ \ \ \
| * | | | | introduce datasrc2src(selector) js functionMario Vavti2018-01-102-5/+8
* | | | | | ability to parse info blocks in third-party (or system) widgetszotlabs2018-01-121-0/+77
| |_|_|/ / |/| | | |
* | | | | 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
| |_|/ / |/| | |
* | | | 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-094-8/+11
| |\ \
| * | | changelogMario Vavti2018-01-091-1/+1
* | | | scrutinizer modszotlabs2018-01-093-4/+6
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-0814-128/+80
|\| |
| * | fix regression in app categoriesMario Vavti2018-01-082-4/+5
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-076-13/+146
| |\ \
| * | | 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
| |\ \
| * | | changelogMario2017-12-281-0/+6
| * | | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooksgit-marijus2017-12-271-3/+3
| |\ \ \
| | * | | Fix whitespace formattingMatthew Dent2017-12-231-14/+14
| | * | | fix dupe bug in content hooksM.Dent2017-12-231-15/+15
| * | | | Merge remote-tracking branch 'mike/master' into devMario2017-12-275-11/+41
| |\ \ \ \