aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-21388-13373/+18884
|\
| * 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
| |\
| | * since api_zot (doc page) is now referenced from the project webpage, include ...zotlabs2017-12-171-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
| |\ \ \ | | | |/ | | |/|
| | * | reverse the logic so we zidify by defaultzotlabs2017-12-161-3/+3
| | * | don't zidify all permalinks, only zot permalinkszotlabs2017-12-161-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
| |\| |
| | * | wrong constant namezotlabs2017-12-141-1/+1
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-147-1401/+1531
| | |\ \
| | * | | hubzilla issue #928zotlabs2017-12-141-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
| | |/ / | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-149-1400/+1539
|\| | |
| * | | 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
| |\| |
| | * | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix fo...zotlabs2017-12-122-1/+6
| | * | hubzilla issue #475, item 3zotlabs2017-12-121-1/+5
| * | | Revert "try as best we can to keep the directory table (cloud list mode) insi...Mario Vavti2017-12-122-14/+5
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-1219-38/+199
|\| |
| * | 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 c...zotlabs2017-12-112-5/+14
| * | | notification: slight animation for loading... and do not remove public stream...Mario Vavti2017-12-115-10/+55
| |/ /
| * | sql compliance issuezotlabs2017-12-102-2/+2
| * | regression in channel sources deliveryzotlabs2017-12-101-2/+14
| * | auto promote beginner (techlevel 0) accounts to level 1 after they show signs...zotlabs2017-12-101-1/+23
| * | go back to including the photo thumbnail data in the export file. We have the...zotlabs2017-12-101-2/+17
| * | improvements to file import/exportzotlabs2017-12-103-11/+59
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:17:43 +0000