aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* put back obsolete permission fields in abook and channel schema files so we c...zotlabs2017-05-251-0/+20
* start using the abook_not_here flag (requires changes in addons, not easily p...zotlabs2017-05-253-5/+14
* only store search info for text filetypes when updating the documentation ind...zotlabs2017-05-241-4/+10
* some minor help cleanup - add '-/foo' override of language detectionzotlabs2017-05-242-42/+45
* remove php version checks for older ( < 5.4) code incompatibilitieszotlabs2017-05-233-30/+15
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-2346-3355/+2376
|\
| * bump versionMario Vavti2017-05-231-1/+1
| * this looks like a slightly cleaner solution to the unicode dl issuezotlabs2017-05-231-1/+1
| * hubzilla issue #777zotlabs2017-05-231-1/+1
| * wiki auto language select to match webpages implementationzotlabs2017-05-232-6/+28
| * apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-236-17/+55
| * schema fixeszotlabs2017-05-232-3/+7
| * some issues with the app order template logiczotlabs2017-05-232-7/+8
| * apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-235-2/+153
| * Merge pull request #794 from dawnbreak/devgit-marijus2017-05-2344-3352/+2372
| |\
| | * Replace Mardownify library with html-to-markdown library.Klaus Weidenbach2017-05-2344-3352/+2372
| |/
* | add 'apps' appzotlabs2017-05-232-0/+6
* | wiki auto language select to match webpages implementationzotlabs2017-05-222-6/+28
* | apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-226-17/+55
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-2211-73/+276
|\|
| * bump versionMario Vavti2017-05-201-1/+1
| * resolve merge conflictzotlabs2017-05-202-24/+24
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-193-13/+13
| |\
| | * some styling for system notificationsMario Vavti2017-05-183-13/+13
| * | smileybutton fixesMario Vavti2017-05-191-2/+0
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-1713-497/+2764
| |\
| | * Merge pull request #783 from zotlabs/app_ordergit-marijus2017-05-172-0/+46
| | |\
| | | * provide mechanism to arbitrarily sort the nav tray apps, currently the prefer...zotlabs2017-05-162-0/+46
| | * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-172-52/+254
| | |\ \
| | | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-172-52/+254
| | | |/
| | * | Merge pull request #780 from zotlabs/docbuggit-marijus2017-05-172-10/+12
| | |\ \
| | | * | no bug reporting info in docszotlabs2017-05-152-10/+12
| | * | | Merge pull request #778 from beardyunixer/devgit-marijus2017-05-171-1/+1
| | |\ \ \
| | | * | | Update nginxThomas Willingham2017-05-151-1/+1
| | | |/ /
| | * | | Merge pull request #774 from zotlabs/pgappsgit-marijus2017-05-171-5/+5
| | |\ \ \
| | | * | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ...zotlabs2017-05-141-5/+5
| | * | | | Merge pull request #775 from zotlabs/pgstuffgit-marijus2017-05-173-429/+429
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | always wonder about people who say "do as I say, not as I do..."zotlabs2017-05-143-429/+429
| | | | |/ | | | |/|
| * | | | css first aid for mod setupMario Vavti2017-05-171-0/+6
| * | | | silence php warning during installMario Vavti2017-05-171-1/+1
| | |/ / | |/| |
* | | | schema fixeszotlabs2017-05-222-3/+7
* | | | some issues with the app order template logiczotlabs2017-05-212-7/+8
* | | | apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-215-2/+153
* | | | provide mechanism to arbitrarily sort the nav tray apps, currently the prefer...zotlabs2017-05-162-0/+46
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-166-18/+2061
|\ \ \ \ | | |/ / | |/| |
| * | | regenerate optimized autoload filesMario Vavti2017-05-162-0/+2016
| * | | include attach.php here (boot.php) instead of each file that uses it. Eventua...zotlabs2017-05-161-0/+1
| |/ /
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-124-16/+42
| |\ \
| | * \ Merge pull request #770 from zotlabs/mast496git-marijus2017-05-123-14/+40
| | |\ \
| | | * | consolidate and simplify the generation of activitystreams persons, add a cou...zotlabs2017-05-113-14/+40