aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* notifications: only handle item otype notify_idsMario Vavti2017-12-181-2/+2
* only use effective uid if we deal with sys channel contentMario Vavti2017-12-151-1/+7
* fix another PHP7.2 warninggMario Vavti2017-12-141-1/+1
* hubzilla #475 continued - show photos in root folder. Part of Andrew's fix fo...zotlabs2017-12-121-1/+1
* notification: slight animation for loading... and do not remove public stream...Mario Vavti2017-12-111-1/+1
* auto promote beginner (techlevel 0) accounts to level 1 after they show signs...zotlabs2017-12-101-1/+23
* strip acct: from OWA auth to API endpointszotlabs2017-12-072-2/+2
* fix loading of theme-specific widgetszotlabs2017-12-071-6/+13
* Merge pull request #924 from dentm42/bugfix-pr922git-marijus2017-12-071-1/+1
|\
| * Fix 'unable to add pages with spaces' (pr 922)M.Dent2017-12-061-1/+1
* | hubzilla issue #680, implement IMoveTarget and recursive file/directory move/...zotlabs2017-12-061-1/+17
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-062-25/+74
|\|
| * missed a spot while resolving merge conflictMario Vavti2017-12-061-1/+1
| * resolve merge conflictMario Vavti2017-12-062-25/+74
* | synchronise an attach_move operation to cloneszotlabs2017-12-061-0/+5
|/
* mod_cloud: provide a themed page with an error notification on errors instead...zotlabs2017-12-052-1/+25