Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changelog | Mario | 2017-12-28 | 1 | -0/+6 |
| | |||||
* | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooks | git-marijus | 2017-12-27 | 1 | -3/+3 |
|\ | | | | | Fix dupe bug in content hooks | ||||
| * | Fix whitespace formatting | Matthew Dent | 2017-12-23 | 1 | -14/+14 |
| | | |||||
| * | fix dupe bug in content hooks | M.Dent | 2017-12-23 | 1 | -15/+15 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2017-12-27 | 5 | -11/+41 |
|\ \ | |||||
| * | | hubzilla issue #945 - directory keywords returned from twkn in standalone mode | zotlabs | 2017-12-26 | 1 | -6/+19 |
| | | | |||||
| * | | sort cloud directory by 1. is_dir and 2. name until we can figure out a way ↵ | zotlabs | 2017-12-25 | 1 | -1/+1 |
| | | | | | | | | | | | | to request different sort orders | ||||
| * | | document that imagick calls/execs ffmpeg for mp4 video thumbnails | zotlabs | 2017-12-25 | 1 | -1/+7 |
| | | | |||||
| * | | util/dcp - argument warning when arguments are correct | zotlabs | 2017-12-25 | 1 | -1/+1 |
| | | | |||||
| * | | cannot use file_get/put_contents in attach_store, must use pipe_streams | zotlabs | 2017-12-25 | 1 | -2/+13 |
| |/ | |||||
* / | changelog | Mario | 2017-12-23 | 1 | -0/+2 |
|/ | |||||
* | more changelog | Mario | 2017-12-22 | 1 | -0/+16 |
| | |||||
* | Merge pull request #939 from einervonvielen/Debian9 | git-marijus | 2017-12-22 | 3 | -99/+119 |
|\ | | | | | Debian9 - Changes for Debian 9 and several fixes | ||||
| * | Changes for Debian 9. Serveral fixes. | Einer von Vielen | 2017-12-21 | 3 | -99/+119 |
| | | |||||
* | | Merge pull request #940 from einervonvielen/Doku-homeinstall-Debian-9 | git-marijus | 2017-12-22 | 1 | -8/+4 |
|\ \ | | | | | | | Changes for homeinstall for Debian 9 | ||||
| * | | Changes for homeinstall for Debian 9 | Einer von Vielen | 2017-12-21 | 1 | -8/+4 |
| |/ | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-21 | 384 | -13370/+18872 |
|\| | |||||
| * | add url and headings to bbco_autocomplete() | Mario Vavti | 2017-12-21 | 1 | -1/+1 |
| | | |||||
| * | remove additional linebreaks after headings | Mario Vavti | 2017-12-21 | 1 | -0/+7 |
| | | |||||
| * | html2bbcode: use headings bbcode for headings | Mario Vavti | 2017-12-20 | 1 | -6/+6 |
| | | |||||
| * | Merge pull request #936 from phellmes/dev | git-marijus | 2017-12-19 | 2 | -1439/+1599 |
| |\ | | | | | | | Update DE translation strings (for 3.0RC too) | ||||
| | * | Update DE translation strings | phellmes | 2017-12-19 | 2 | -1439/+1599 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-12-19 | 1 | -77/+136 |
| |\ | |||||
| | * | Merge pull request #933 from dawnbreak/dev | git-marijus | 2017-12-19 | 1 | -77/+136 |
| | |\ | | | | | | | | | Don't drop PHP7.0 compatibility for dev yet. | ||||
| | | * | Don't drop PHP7.0 compatibility for dev yet. | Klaus Weidenbach | 2017-12-18 | 1 | -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. | ||||
| * / | changelog | Mario Vavti | 2017-12-19 | 1 | -0/+114 |
| |/ | |||||
| * | actually add the smarty lib | Mario Vavti | 2017-12-18 | 225 | -0/+37157 |
| | | |||||
| * | install smarty via composer and update other php libs | Mario Vavti | 2017-12-18 | 316 | -34992/+2763 |
| | | |||||
| * | do not use text-muted class for $sitelocation | Mario Vavti | 2017-12-18 | 1 | -1/+1 |
| | | |||||
| * | notifications: only handle item otype notify_ids | Mario Vavti | 2017-12-18 | 2 | -2/+5 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-18 | 1 | -0/+4 |
| |\ | |||||
| * \ | Merge pull request #932 from dawnbreak/dev | git-marijus | 2017-12-18 | 5 | -582/+646 |
| |\ \ | | | | | | | | | Update classmap caches and add phpunit/dbunit. | ||||
| | * | | Update classmap caches and add phpunit/dbunit. | Klaus Weidenbach | 2017-12-17 | 5 | -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/dev | git-marijus | 2017-12-17 | 2 | -1411/+1572 |
| |\ \ | | | | | | | | | Updated Spanish translation. | ||||
| | * | | Updated Spanish translation. | Manuel Jiménez Friaza | 2017-12-16 | 2 | -1411/+1572 |
| | | | | |||||
| * | | | merge red master into dev | Mario Vavti | 2017-12-17 | 1 | -1/+6 |
| |\ \ \ | |||||
| * | | | | silence PHP7.2 warning | Mario Vavti | 2017-12-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix undefined constant warning | Mario Vavti | 2017-12-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-15 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | only use effective uid if we deal with sys channel content | Mario Vavti | 2017-12-15 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | fix another PHP7.2 warningg | Mario Vavti | 2017-12-14 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | hubzilla-addons issue #74 - delayed posts not honoured for GNU-Social | zotlabs | 2017-12-21 | 1 | -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 ↵ | zotlabs | 2017-12-17 | 1 | -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 default | zotlabs | 2017-12-16 | 1 | -3/+3 |
| | | | | |||||
* | | | | don't zidify all permalinks, only zot permalinks | zotlabs | 2017-12-16 | 1 | -1/+6 |
| |/ / |/| | | |||||
* | | | wrong constant name | zotlabs | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-14 | 7 | -1401/+1531 |
|\| | | |||||
| * | | fix some more PHP7.2 warnings | Mario Vavti | 2017-12-14 | 1 | -2/+2 |
| | | | |||||
| * | | make remote homelink link to the home host and not to the home channel | Mario Vavti | 2017-12-14 | 1 | -4/+6 |
| | | | |||||
| * | | bump version | Mario Vavti | 2017-12-14 | 1 | -1/+1 |
| | | |