aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cannot use file_get/put_contents in attach_store, must use pipe_streamszotlabs2017-12-251-2/+13
|
* more changelogMario2017-12-221-0/+16
|
* Merge pull request #939 from einervonvielen/Debian9git-marijus2017-12-223-99/+119
|\ | | | | Debian9 - Changes for Debian 9 and several fixes
| * 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 9
| * | 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 strings (for 3.0RC too)
| | * 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.
| | | * Don't drop PHP7.0 compatibility for dev yet.Klaus Weidenbach2017-12-181-77/+136
| | |/ | | | | | | | | | | | | | | | | | | There is no need yet to drop PHP7.0 compatibility for running tests in TravisCI. The next PHPUnit release in Feb 2018 will drop PHP7.0, but current version with PHP7.0 will be supported until 2019.
| * / 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.
| | * | Update classmap caches and add phpunit/dbunit.Klaus Weidenbach2017-12-175-582/+646
| |/ / | | | | | | | | | | | | | | | In preparation for DB unit tests add phpunit/dbunit and update dev libraries. Update autoload classmap caches.
| * | Merge pull request #930 from mjfriaza/devgit-marijus2017-12-172-1411/+1572
| |\ \ | | | | | | | | Updated Spanish translation.
| | * | 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
| |_|_|_|/ |/| | | | | | | | | | | | | | There is a very high probability this will also fix hubzilla-addons issue #75
* | | | | since api_zot (doc page) is now referenced from the project webpage, include ↵zotlabs2017-12-171-0/+4
| |_|/ / |/| | | | | | | | | | | a mention of the twitter/statusnet API plugin since that enables some degree of compatibility with dozens of third-party apps out of the box.
* | | | 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
| | |
| * | 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
| |\ \
| * | | Revert "try as best we can to keep the directory table (cloud list mode) ↵Mario Vavti2017-12-122-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | inside the containing div. It looks pretty bad when you have a long filename." This reverts commit 4d7acdd44d4413c5bb712fe05a77bcaccc3054a5.
* | | | hubzilla issue #928zotlabs2017-12-141-1/+1
| |/ / |/| |
* | | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix ↵zotlabs2017-12-122-1/+6
| | | | | | | | | | | | for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check.
* | | hubzilla issue #475, item 3zotlabs2017-12-121-1/+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 ↵zotlabs2017-12-112-5/+14
| | | | | | | | | | | | containing div. It looks pretty bad when you have a long filename.
* | | notification: slight animation for loading... and do not remove public ↵Mario Vavti2017-12-115-10/+55
|/ / | | | | | | stream items on click (we can not mark them read)