| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #933 from dawnbreak/dev | git-marijus | 2017-12-19 | 1 | -77/+136 |
|\ |
|
| * | Don't drop PHP7.0 compatibility for dev yet. | Klaus Weidenbach | 2017-12-18 | 1 | -77/+136 |
|/ |
|
* | 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 |
|\ |
|
| * | since api_zot (doc page) is now referenced from the project webpage, include ... | zotlabs | 2017-12-17 | 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. | Klaus Weidenbach | 2017-12-17 | 5 | -582/+646 |
|/ / |
|
* | | Merge pull request #930 from mjfriaza/dev | git-marijus | 2017-12-17 | 2 | -1411/+1572 |
|\ \ |
|
| * | | 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 |
|\ \ \
| | |/
| |/| |
|
| * | | 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 |
* | | | 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 |
|\| | |
|
| * | | 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 |
| |\ \ |
|
| * | | | hubzilla issue #928 | zotlabs | 2017-12-14 | 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 |
| |/ /
|/| | |
|
* | | | 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 |
* | | | strings and version bump | Mario Vavti | 2017-12-13 | 2 | -1380/+1514 |
* | | | fix issue with long filenames in mod cloud | Mario Vavti | 2017-12-13 | 1 | -0/+4 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-13 | 3 | -1/+9 |
|\| | |
|
| * | | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix fo... | zotlabs | 2017-12-12 | 2 | -1/+6 |
| * | | hubzilla issue #475, item 3 | zotlabs | 2017-12-12 | 1 | -1/+5 |
* | | | Revert "try as best we can to keep the directory table (cloud list mode) insi... | Mario Vavti | 2017-12-12 | 2 | -14/+5 |
|/ / |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-12 | 2 | -5/+14 |
|\ \ |
|
| * | | try as best we can to keep the directory table (cloud list mode) inside the c... | zotlabs | 2017-12-11 | 2 | -5/+14 |
* | | | notification: slight animation for loading... and do not remove public stream... | Mario Vavti | 2017-12-11 | 5 | -10/+55 |
|/ / |
|
* | | sql compliance issue | zotlabs | 2017-12-10 | 2 | -2/+2 |
* | | regression in channel sources delivery | zotlabs | 2017-12-10 | 1 | -2/+14 |
* | | auto promote beginner (techlevel 0) accounts to level 1 after they show signs... | zotlabs | 2017-12-10 | 1 | -1/+23 |
* | | go back to including the photo thumbnail data in the export file. We have the... | zotlabs | 2017-12-10 | 1 | -2/+17 |
* | | improvements to file import/export | zotlabs | 2017-12-10 | 3 | -11/+59 |
* | | xlink_rating_text default value | zotlabs | 2017-12-09 | 1 | -1/+3 |
* | | hubzilla-addons issues #73 | zotlabs | 2017-12-09 | 1 | -1/+1 |
* | | strip acct: from OWA auth to API endpoints | zotlabs | 2017-12-07 | 3 | -3/+4 |
* | | fix loading of theme-specific widgets | zotlabs | 2017-12-07 | 1 | -6/+13 |
* | | Merge pull request #924 from dentm42/bugfix-pr922 | git-marijus | 2017-12-07 | 1 | -1/+1 |
|\ \ |
|
| * | | Fix 'unable to add pages with spaces' (pr 922) | M.Dent | 2017-12-06 | 1 | -1/+1 |
* | | | hubzilla issue #680, implement IMoveTarget and recursive file/directory move/... | zotlabs | 2017-12-06 | 2 | -3/+38 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-06 | 3 | -25/+108 |
|\| | |
|
| * | | missed a spot while resolving merge conflict | Mario Vavti | 2017-12-06 | 1 | -1/+1 |
| * | | Merge branch 'dentm42-wiki-create-missing' into dev | Mario Vavti | 2017-12-06 | 3 | -25/+108 |
| |\ \ |
|