aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* convert randprof to use chanlink_hash() instead of chanlink_url() and filter ...git-marijus2017-06-032-7/+7
* Merge pull request #802 from zotlabs/searchwebpagesgit-marijus2017-06-013-3/+9
|\
| * provide ability to search webpages (either public or which contain the observ...zotlabs2017-05-303-3/+9
* | Merge pull request #805 from zotlabs/mailexportgit-marijus2017-06-012-6/+8
|\ \
| * | minor export issue with mailzotlabs2017-05-312-6/+8
| |/
* | Merge pull request #804 from dawnbreak/devgit-marijus2017-06-0152-581/+925
|\ \ | |/ |/|
| * :arrow_up:Update Sabre libraries.Klaus Weidenbach2017-06-0152-581/+925
|/
* update changelogMario Vavti2017-05-301-0/+1
* fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ca...Mario Vavti2017-05-301-1/+2
* Merge pull request #800 from git-marijus/devgit-marijus2017-05-291-1/+6
|\
| * fix update_r1189() for mysql and postgresMario Vavti2017-05-281-1/+6
* | Merge pull request #796 from dawnbreak/QA_testinggit-marijus2017-05-287-142/+538
|\ \ | |/ |/|
| * Don't drop PHP5 support yet.Klaus Weidenbach2017-05-271-1/+1
| * :hammer::white_check_mark: Add html2markdown unit tests.Klaus Weidenbach2017-05-273-9/+208
| * :arrow_up: Update dev libraries.Klaus Weidenbach2017-05-244-133/+330
* | update changelog for 2.4Mario Vavti2017-05-281-1/+78
* | Merge pull request #798 from zotlabs/pagetitlefixgit-marijus2017-05-273-4/+6
|\ \ | |/ |/|
| * hubzilla issue #795zotlabs2017-05-273-4/+6
|/
* 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
|/
* 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
| | | |/ | | |/|
| * | | 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
| |/ /
* | | css first aid for mod setupMario Vavti2017-05-171-0/+6
* | | silence php warning during installMario Vavti2017-05-171-1/+1
|/ /