aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* changelogMario2017-12-281-0/+6
* 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
* | Merge remote-tracking branch 'mike/master' into devMario2017-12-275-11/+41
|\ \
| * | hubzilla issue #945 - directory keywords returned from twkn in standalone modezotlabs2017-12-261-6/+19
| * | 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
| * | util/dcp - argument warning when arguments are correctzotlabs2017-12-251-1/+1
| * | cannot use file_get/put_contents in attach_store, must use pipe_streamszotlabs2017-12-251-2/+13
| |/
* / changelogMario2017-12-231-0/+2
|/
* more changelogMario2017-12-221-0/+16
* Merge pull request #939 from einervonvielen/Debian9git-marijus2017-12-223-99/+119
|\
| * Changes for Debian 9. Serveral fixes.Einer von Vielen2017-12-213-99/+119
* | Merge pull request #940 from einervonvielen/Doku-homeinstall-Debian-9git-marijus2017-12-221-8/+4
|\ \
| * | Changes for homeinstall for Debian 9Einer von Vielen2017-12-211-8/+4
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-21384-13370/+18872
|\|
| * add url and headings to bbco_autocomplete()Mario Vavti2017-12-211-1/+1
| * remove additional linebreaks after headingsMario Vavti2017-12-211-0/+7
| * html2bbcode: use headings bbcode for headingsMario Vavti2017-12-201-6/+6
| * Merge pull request #936 from phellmes/devgit-marijus2017-12-192-1439/+1599
| |\
| | * Update DE translation stringsphellmes2017-12-192-1439/+1599
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-12-191-77/+136
| |\
| | * Merge pull request #933 from dawnbreak/devgit-marijus2017-12-191-77/+136
| | |\
| | | * Don't drop PHP7.0 compatibility for dev yet.Klaus Weidenbach2017-12-181-77/+136
| | |/
| * / changelogMario Vavti2017-12-191-0/+114
| |/
| * actually add the smarty libMario Vavti2017-12-18225-0/+37157
| * 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
| |\
| * \ 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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | 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-addons issue #74 - delayed posts not honoured for GNU-Socialzotlabs2017-12-211-1/+1
| |_|_|_|/ |/| | | |
* | | | | since api_zot (doc page) is now referenced from the project webpage, include ...zotlabs2017-12-171-0/+4
| |_|/ / |/| | |
* | | | reverse the logic so we zidify by defaultzotlabs2017-12-161-3/+3
* | | | don't zidify all permalinks, only zot permalinkszotlabs2017-12-161-1/+6
| |/ / |/| |
* | | wrong constant namezotlabs2017-12-141-1/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-147-1401/+1531
|\| |
| * | 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