aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-181-1/+1
|\
| * Merge pull request #957 from einervonvielen/homeinstall-fix-cron-devgit-marijus2018-01-181-1/+1
| |\
| | * Fixed poller. Use Master.phpEiner von Vielen2018-01-141-1/+1
* | | consolidate navbar tucson and some javascript cleanupMario Vavti2018-01-185-173/+48
|/ /
* | raise the queue threshold default from 300 to 3000Mario Vavti2018-01-181-2/+2
* | bump versionMario Vavti2018-01-181-1/+1
* | implement notifications name filter and slightly change the way we load notif...Mario Vavti2018-01-183-11/+56
* | section-content-info-wrapper for register textMario Vavti2018-01-161-1/+3
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-165-4/+21
|\ \
| * | surface the article featurezotlabs2018-01-154-4/+6
| * | add summary bbcode tagzotlabs2018-01-151-0/+15
* | | fix some regressions with permission rolesMario Vavti2018-01-157-10/+8
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-152-1/+4
|\ \ \
| * | | Added minimum registration age to /admin/site settings pageAndrew Manning2018-01-142-1/+4
| | |/ | |/|
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-153-27/+19
|\ \ \ | |/ / |/| / | |/
| * 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-143-4/+9
|\| | | |/ |/|
| * 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 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
|\ \ \ | | |/ | |/|
| * | 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
* | | | mod hq: stick to show latest unseen toplevel post on loadMario Vavti2018-01-121-2/+2
|/ / /
* | | 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 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
| |/ / |/| |