aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1817-211/+139
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-188-29/+37
| |\
| | * provide local pubstream option (content from this site only).zotlabs2018-01-173-4/+16
| | * simplify dir_tagadelic dramaticallyzotlabs2018-01-172-19/+8
| | * use mid/parent_mid to trigger $top_level_postzotlabs2018-01-171-1/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-171-1/+3
| | |\
| | * | remove sendzid core code from core (put in plugin where it belongs)zotlabs2018-01-172-5/+12
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-159-11/+12
| | |\ \
| * | \ \ 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
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-176-5/+24
|\| | | |
| * | | | 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
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1515-42/+40
|\| | |
| * | | 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 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
| |\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 11:20:51 +0000