aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-301-1/+2
|\
| * fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ↵Mario Vavti2017-05-301-1/+2
| | | | | | | | case there are further issues we should probably also put a ob_end_clean() right before readfile()
| * hubzilla issue #795zotlabs2017-05-272-3/+5
| |
* | provide ability to search webpages (either public or which contain the ↵zotlabs2017-05-301-2/+2
| | | | | | | | observer in the acl) in addition to conversations
* | move disapora xrd stuff to pluginzotlabs2017-05-301-13/+2
| |
* | more deprecate server_rolezotlabs2017-05-291-0/+5
| |
* | start deprecation of server_rolezotlabs2017-05-297-32/+6
| |
* | hubzilla issue #795zotlabs2017-05-262-3/+5
| |
* | 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
| |
* | start using the abook_not_here flag (requires changes in addons, not easily ↵zotlabs2017-05-251-0/+4
| | | | | | | | 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-241-37/+37
| |
* | remove php version checks for older ( < 5.4) code incompatibilitieszotlabs2017-05-231-6/+0
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-231-2/+0
|\|
| * 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-233-15/+50
| | | | | | | | to webpages
| * schema fixeszotlabs2017-05-231-0/+4
| |
| * some issues with the app order template logiczotlabs2017-05-231-2/+2
| |
| * apporder module and all the associated backend stuff to make it work; ↵zotlabs2017-05-233-1/+140
| | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere
* | add 'apps' appzotlabs2017-05-231-0/+1
| |
* | 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-223-15/+50
| | | | | | | | to webpages
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-223-56/+107
|\|
| * some styling for system notificationsMario Vavti2017-05-181-1/+1
| |
| * Merge pull request #783 from zotlabs/app_ordergit-marijus2017-05-171-0/+44
| |\ | | | | | | provide mechanism to arbitrarily sort the nav tray apps, currently th…
| | * provide mechanism to arbitrarily sort the nav tray apps, currently the ↵zotlabs2017-05-161-0/+44
| | | | | | | | | | | | preferred order list needs to be manually created
| * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-171-52/+106
| |\ \ | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php.
| | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-171-52/+106
| | |/ | | | | | | | | | | | | Also add some phpunit tests for this class, but there are some problems yet with mocking static functions.
| * | 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
* | | schema fixeszotlabs2017-05-221-0/+4
| | |
* | | some issues with the app order template logiczotlabs2017-05-211-2/+2
| | |
* | | apporder module and all the associated backend stuff to make it work; ↵zotlabs2017-05-213-1/+140
| | | | | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere
* | | provide mechanism to arbitrarily sort the nav tray apps, currently the ↵zotlabs2017-05-161-0/+44
| | | | | | | | | | | | preferred order list needs to be manually created
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-162-5/+6
|\| |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-121-1/+1
| |\ \
| | * \ Merge pull request #770 from zotlabs/mast496git-marijus2017-05-121-1/+1
| | |\ \ | | | |/ | | |/| consolidate and simplify the generation of activitystreams persons, a…
| | | * consolidate and simplify the generation of activitystreams persons, add a ↵zotlabs2017-05-111-1/+1
| | | | | | | | | | | | | | | | couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also.
| * | | Empty ACL should not result in no ACL when uploading a fileMario Vavti2017-05-111-4/+5
| |/ /
* | | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-111-1/+3
|\| |
| * | Merge pull request #767 from zotlabs/realm_acgit-marijus2017-05-111-1/+3
| |\ \ | | |/ | |/| send directory realm_token for navbar autocomplete searches - if conf…
| | * send directory realm_token for navbar autocomplete searches - if configuredzotlabs2017-05-101-1/+3
| | |
| * | use correct data typezotlabs2017-05-101-1/+1
| | |
| * | zot protocol doco updateszotlabs2017-05-101-2/+2
| |/
* | consolidate email validation checkszotlabs2017-05-112-2/+2
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-091-1/+43
|\|
| * Implemented switch statement logic in Comanche layout parser.root2017-05-081-1/+43
| |
| * get rid of edit activitieszotlabs2017-05-081-1/+11
| |