| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-21 | 388 | -13373/+18884 |
| |\ | |||||
| | * | 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 |
| | |\ | |||||
| | | * | 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. | ||||
| | * | | 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 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | 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 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-14 | 9 | -1400/+1539 |
| |\| | | | |||||
| | * | | | 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 ↵ | zotlabs | 2017-12-12 | 2 | -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 3 | zotlabs | 2017-12-12 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | Revert "try as best we can to keep the directory table (cloud list mode) ↵ | Mario Vavti | 2017-12-12 | 2 | -14/+5 |
| | |/ / | | | | | | | | | | | | | | | | inside the containing div. It looks pretty bad when you have a long filename." This reverts commit 4d7acdd44d4413c5bb712fe05a77bcaccc3054a5. | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-12 | 19 | -38/+199 |
| |\| | | |||||
| | * | | 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 ↵ | zotlabs | 2017-12-11 | 2 | -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 Vavti | 2017-12-11 | 5 | -10/+55 |
| | |/ / | | | | | | | | | | stream items on click (we can not mark them read) | ||||
| | * | | 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 ↵ | zotlabs | 2017-12-10 | 1 | -1/+23 |
| | | | | | | | | | | | | | signs of active participation. | ||||
| | * | | go back to including the photo thumbnail data in the export file. We have ↵ | zotlabs | 2017-12-10 | 1 | -2/+17 |
| | | | | | | | | | | | | | the ability to fetch each thumbnail directly if there is a problem with resource consumption, but this is the most efficient way to deal with it and most sites should be able to handle the memory consumption of our thumbnail data. The original full scale photo is a different issue; these can exhaust memory even before base64. | ||||
| | * | | improvements to file import/export | zotlabs | 2017-12-10 | 3 | -11/+59 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |