aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* install smarty via composer and update other php libsMario Vavti2017-12-18316-34992/+2763
* do not use text-muted class for $sitelocationMario Vavti2017-12-181-1/+1
* notifications: only handle item otype notify_idsMario Vavti2017-12-182-2/+5
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-181-0/+4
|\
| * since api_zot (doc page) is now referenced from the project webpage, include ...zotlabs2017-12-171-0/+4
* | Merge pull request #932 from dawnbreak/devgit-marijus2017-12-185-582/+646
|\ \
| * | Update classmap caches and add phpunit/dbunit.Klaus Weidenbach2017-12-175-582/+646
|/ /
* | Merge pull request #930 from mjfriaza/devgit-marijus2017-12-172-1411/+1572
|\ \
| * | Updated Spanish translation.Manuel Jiménez Friaza2017-12-162-1411/+1572
* | | merge red master into devMario Vavti2017-12-171-1/+6
|\ \ \ | | |/ | |/|
| * | reverse the logic so we zidify by defaultzotlabs2017-12-161-3/+3
| * | don't zidify all permalinks, only zot permalinkszotlabs2017-12-161-1/+6
* | | silence PHP7.2 warningMario Vavti2017-12-161-1/+1
* | | fix undefined constant warningMario Vavti2017-12-161-1/+1
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-151-1/+1
|\| |
| * | wrong constant namezotlabs2017-12-141-1/+1
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-147-1401/+1531
| |\ \
| * | | hubzilla issue #928zotlabs2017-12-141-1/+1
* | | | 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
| |/ / |/| |
* | | fix some more PHP7.2 warningsMario Vavti2017-12-141-2/+2
* | | make remote homelink link to the home host and not to the home channelMario Vavti2017-12-141-4/+6
* | | bump versionMario Vavti2017-12-141-1/+1
* | | strings and version bumpMario Vavti2017-12-132-1380/+1514
* | | fix issue with long filenames in mod cloudMario Vavti2017-12-131-0/+4
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-133-1/+9
|\| |
| * | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix fo...zotlabs2017-12-122-1/+6
| * | hubzilla issue #475, item 3zotlabs2017-12-121-1/+5
* | | Revert "try as best we can to keep the directory table (cloud list mode) insi...Mario Vavti2017-12-122-14/+5
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-122-5/+14
|\ \
| * | try as best we can to keep the directory table (cloud list mode) inside the c...zotlabs2017-12-112-5/+14
* | | notification: slight animation for loading... and do not remove public stream...Mario Vavti2017-12-115-10/+55
|/ /
* | sql compliance issuezotlabs2017-12-102-2/+2
* | regression in channel sources deliveryzotlabs2017-12-101-2/+14
* | auto promote beginner (techlevel 0) accounts to level 1 after they show signs...zotlabs2017-12-101-1/+23
* | go back to including the photo thumbnail data in the export file. We have the...zotlabs2017-12-101-2/+17
* | improvements to file import/exportzotlabs2017-12-103-11/+59
* | xlink_rating_text default valuezotlabs2017-12-091-1/+3
* | hubzilla-addons issues #73zotlabs2017-12-091-1/+1
* | strip acct: from OWA auth to API endpointszotlabs2017-12-073-3/+4
* | 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-062-3/+38
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-063-25/+108
|\| |
| * | missed a spot while resolving merge conflictMario Vavti2017-12-061-1/+1
| * | Merge branch 'dentm42-wiki-create-missing' into devMario Vavti2017-12-063-25/+108
| |\ \
| | * | resolve merge conflictMario Vavti2017-12-063-25/+108
| |/ /
* / / synchronise an attach_move operation to cloneszotlabs2017-12-063-3/+17
|/ /
* | don't force tile photos to be square, as there's no way to sensibly auto-crop...zotlabs2017-12-051-8/+9