aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #795
| | * 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
| | | | | | | | schema files to default integers to int values); in any event change all the mysql strings that were 255 maxlength to 191 maxlength in case they get used as indexes down the line
* | put back obsolete permission fields in abook and channel schema files so we ↵zotlabs2017-05-251-0/+20
| | | | | | | | can restore the old data without choking when upgrading the table type
* | start using the abook_not_here flag (requires changes in addons, not easily ↵zotlabs2017-05-253-5/+14
| | | | | | | | portable to hubzilla)
* | only store search info for text filetypes when updating the documentation ↵zotlabs2017-05-241-4/+10
| | | | | | | | indexes
* | 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 ↵zotlabs2017-05-236-17/+55
| | | | | | | | to webpages
| * 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; ↵zotlabs2017-05-235-2/+153
| | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere
| * Merge pull request #794 from dawnbreak/devgit-marijus2017-05-2344-3352/+2372
| |\ | | | | | | Replace Mardownify library with html-to-markdown library.
| | * 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 ↵zotlabs2017-05-226-17/+55
| | | | | | | | to webpages
* | 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 th…
| | | * provide mechanism to arbitrarily sort the nav tray apps, currently the ↵zotlabs2017-05-162-0/+46
| | | | | | | | | | | | | | | | preferred order list needs to be manually created
| | * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-172-52/+254
| | |\ \ | | | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php.
| | | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-172-52/+254
| | | |/ | | | | | | | | | | | | | | | | Also add some phpunit tests for this class, but there are some problems yet with mocking static functions.
| | * | Merge pull request #780 from zotlabs/docbuggit-marijus2017-05-172-10/+12
| | |\ \ | | | | | | | | | | no bug reporting info in docs
| | | * | no bug reporting info in docszotlabs2017-05-152-10/+12
| | | | |
| | * | | Merge pull request #778 from beardyunixer/devgit-marijus2017-05-171-1/+1
| | |\ \ \ | | | | | | | | | | | | Update nginx
| | | * | | 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 li…
| | | * | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵zotlabs2017-05-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | but this prevents it from rendering
| | * | | | 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..."
| | | * | | 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
| | | | |