aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move code syntax highlighting to pluginzotlabs2017-05-3054-23416/+7
* re-arrange a few functionszotlabs2017-05-303-67/+68
* bring back html2markdown which went away in the mergezotlabs2017-05-301-0/+30
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-3010-141/+580
|\
| * 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
* | | provide ability to search webpages (either public or which contain the observ...zotlabs2017-05-303-3/+9
* | | move disapora xrd stuff to pluginzotlabs2017-05-303-20/+3
* | | create account_store_lowlevel()zotlabs2017-05-291-34/+58
* | | remove server role from language configszotlabs2017-05-2910-78/+0
* | | more deprecate server_rolezotlabs2017-05-294-14/+6
* | | start deprecation of server_rolezotlabs2017-05-2913-76/+23
* | | work through the diaspora_v2 outgoing status postszotlabs2017-05-281-1/+2
* | | replace really old example widgets with pointer to current widget listzotlabs2017-05-281-7/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-270-0/+0
|\| |
| * | Merge pull request #798 from zotlabs/pagetitlefixgit-marijus2017-05-273-4/+6
| |\ \ | | |/ | |/|
| | * hubzilla issue #795zotlabs2017-05-273-4/+6
| |/
* | hubzilla issue #795zotlabs2017-05-263-4/+6
* | update link to account roles help on new_channel pagezotlabs2017-05-251-1/+1
* | update the link to account roles help on register pagezotlabs2017-05-251-1/+1
* | looks like a commit was lost someplace, but I'll re-do it later (convert sql ...zotlabs2017-05-251-18/+18
* | 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