aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-184-6/+20
|\
| * provide local pubstream option (content from this site only).zotlabs2018-01-172-4/+15
| * simplify dir_tagadelic dramaticallyzotlabs2018-01-171-1/+4
| * 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-153-3/+5
| |\
* | | raise the queue threshold default from 300 to 3000Mario Vavti2018-01-181-2/+2
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-162-1/+3
|\| | | |/ |/|
| * surface the article featurezotlabs2018-01-152-1/+3
* | fix some regressions with permission rolesMario Vavti2018-01-152-2/+2
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-151-1/+3
|\ \ | |/ |/|
| * Added minimum registration age to /admin/site settings pageAndrew Manning2018-01-141-1/+3
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-142-2/+7
| |\
* | | move markdown-in-posts/comments feature to pluginzotlabs2018-01-141-8/+6
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-131-3/+3
|\| | | |/ |/|
| * update to bootstrap 4 beta3Mario Vavti2018-01-121-2/+2
| * typoMario Vavti2018-01-121-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-126-85/+232
| |\
| * | mod hq: stick to show latest unseen toplevel post on loadMario Vavti2018-01-121-2/+2
* | | cleanup of last fixzotlabs2018-01-132-2/+2
* | | unexpected openssl resultzotlabs2018-01-132-1/+2
* | | improve owa loggingzotlabs2018-01-131-1/+5
| |/ |/|
* | Merge pull request #951 from dawnbreak/docugit-marijus2018-01-126-85/+232
|\ \ | |/ |/|
| * :bulb: Add source documentation from recent conversations.Klaus Weidenbach2018-01-056-85/+232
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-122-10/+22
|\ \
| * | expose settings for site sellpage and site locationzotlabs2018-01-111-0/+10
| * | 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-111-19/+14
|/ /
* | hubzilla issue #945 continued: We previously blocked directory keywords when ...zotlabs2018-01-101-1/+1
* | scrutinizer modszotlabs2018-01-093-4/+6
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-083-5/+7
|\ \
| * | fix regression in app categoriesMario Vavti2018-01-081-2/+3
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-073-6/+133
| |\ \
| * | | start with nonactive state for the notifications button and display some text...Mario Vavti2018-01-071-0/+1
| | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-026-32/+41
| |\ \
| * \ \ 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
* | | | | scrutinizer issues: none worthy of including in 3.0, there will likely be a f...zotlabs2018-01-081-4/+6
| |_|_|/ |/| | |
* | | | hubzilla issue #946zotlabs2018-01-071-0/+121
* | | | issues with feed parameterszotlabs2018-01-022-6/+12
| |_|/ |/| |
* | | this should finish up hubzilla issue #113zotlabs2017-12-311-2/+5
* | | provide warning if ffmpeg not found and video thumbnail is requestedzotlabs2017-12-301-1/+7
* | | test of new affinity preset code (post 3.0)zotlabs2017-12-302-7/+7
* | | possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted co...zotlabs2017-12-301-1/+1
* | | cleanupzotlabs2017-12-281-3/+5
* | | a different (hopefully better) implementation of affinity presets, but not fo...zotlabs2017-12-282-10/+8
* | | Make affinity widget settings work. It's entirely possible they never did wor...zotlabs2017-12-282-16/+16
|/ /
* | sort cloud directory by 1. is_dir and 2. name until we can figure out a way t...zotlabs2017-12-251-1/+1
* | document that imagick calls/execs ffmpeg for mp4 video thumbnailszotlabs2017-12-251-1/+7
|/
* install smarty via composer and update other php libsMario Vavti2017-12-181-2/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:29:06 +0000