Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-30 | 1 | -1/+2 |
|\ | |||||
| * | fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ↵ | Mario Vavti | 2017-05-30 | 1 | -1/+2 |
| | | | | | | | | case there are further issues we should probably also put a ob_end_clean() right before readfile() | ||||
| * | hubzilla issue #795 | zotlabs | 2017-05-27 | 2 | -3/+5 |
| | | |||||
* | | provide ability to search webpages (either public or which contain the ↵ | zotlabs | 2017-05-30 | 1 | -2/+2 |
| | | | | | | | | observer in the acl) in addition to conversations | ||||
* | | move disapora xrd stuff to plugin | zotlabs | 2017-05-30 | 1 | -13/+2 |
| | | |||||
* | | more deprecate server_role | zotlabs | 2017-05-29 | 1 | -0/+5 |
| | | |||||
* | | start deprecation of server_role | zotlabs | 2017-05-29 | 7 | -32/+6 |
| | | |||||
* | | hubzilla issue #795 | zotlabs | 2017-05-26 | 2 | -3/+5 |
| | | |||||
* | | update link to account roles help on new_channel page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | update the link to account roles help on register page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | start using the abook_not_here flag (requires changes in addons, not easily ↵ | zotlabs | 2017-05-25 | 1 | -0/+4 |
| | | | | | | | | portable to hubzilla) | ||||
* | | only store search info for text filetypes when updating the documentation ↵ | zotlabs | 2017-05-24 | 1 | -4/+10 |
| | | | | | | | | indexes | ||||
* | | some minor help cleanup - add '-/foo' override of language detection | zotlabs | 2017-05-24 | 1 | -37/+37 |
| | | |||||
* | | remove php version checks for older ( < 5.4) code incompatibilities | zotlabs | 2017-05-23 | 1 | -6/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-23 | 1 | -2/+0 |
|\| | |||||
| * | wiki auto language select to match webpages implementation | zotlabs | 2017-05-23 | 2 | -6/+28 |
| | | |||||
| * | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-23 | 3 | -15/+50 |
| | | | | | | | | to webpages | ||||
| * | schema fixes | zotlabs | 2017-05-23 | 1 | -0/+4 |
| | | |||||
| * | some issues with the app order template logic | zotlabs | 2017-05-23 | 1 | -2/+2 |
| | | |||||
| * | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-23 | 3 | -1/+140 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
* | | add 'apps' app | zotlabs | 2017-05-23 | 1 | -0/+1 |
| | | |||||
* | | wiki auto language select to match webpages implementation | zotlabs | 2017-05-22 | 2 | -6/+28 |
| | | |||||
* | | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-22 | 3 | -15/+50 |
| | | | | | | | | to webpages | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-22 | 3 | -56/+107 |
|\| | |||||
| * | some styling for system notifications | Mario Vavti | 2017-05-18 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #783 from zotlabs/app_order | git-marijus | 2017-05-17 | 1 | -0/+44 |
| |\ | | | | | | | provide mechanism to arbitrarily sort the nav tray apps, currently th… | ||||
| | * | provide mechanism to arbitrarily sort the nav tray apps, currently the ↵ | zotlabs | 2017-05-16 | 1 | -0/+44 |
| | | | | | | | | | | | | preferred order list needs to be manually created | ||||
| * | | Merge pull request #782 from dawnbreak/QA_testing | git-marijus | 2017-05-17 | 1 | -52/+106 |
| |\ \ | | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php. | ||||
| | * | | :construction_worker::white_check_mark: Documentation Permissions.php. | Klaus Weidenbach | 2017-05-17 | 1 | -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/pgapps | git-marijus | 2017-05-17 | 1 | -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 ↵ | zotlabs | 2017-05-14 | 1 | -5/+5 |
| | | | | | | | | | | | | but this prevents it from rendering | ||||
* | | | schema fixes | zotlabs | 2017-05-22 | 1 | -0/+4 |
| | | | |||||
* | | | some issues with the app order template logic | zotlabs | 2017-05-21 | 1 | -2/+2 |
| | | | |||||
* | | | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-21 | 3 | -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 ↵ | zotlabs | 2017-05-16 | 1 | -0/+44 |
| | | | | | | | | | | | | preferred order list needs to be manually created | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-16 | 2 | -5/+6 |
|\| | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-12 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge pull request #770 from zotlabs/mast496 | git-marijus | 2017-05-12 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | consolidate and simplify the generation of activitystreams persons, a… | ||||
| | | * | consolidate and simplify the generation of activitystreams persons, add a ↵ | zotlabs | 2017-05-11 | 1 | -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 file | Mario Vavti | 2017-05-11 | 1 | -4/+5 |
| |/ / | |||||
* | | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵ | zotlabs | 2017-05-14 | 1 | -5/+5 |
| | | | | | | | | | | | | but this prevents it from rendering | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-11 | 1 | -1/+3 |
|\| | | |||||
| * | | Merge pull request #767 from zotlabs/realm_ac | git-marijus | 2017-05-11 | 1 | -1/+3 |
| |\ \ | | |/ | |/| | send directory realm_token for navbar autocomplete searches - if conf… | ||||
| | * | send directory realm_token for navbar autocomplete searches - if configured | zotlabs | 2017-05-10 | 1 | -1/+3 |
| | | | |||||
| * | | use correct data type | zotlabs | 2017-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | zot protocol doco updates | zotlabs | 2017-05-10 | 1 | -2/+2 |
| |/ | |||||
* | | consolidate email validation checks | zotlabs | 2017-05-11 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-09 | 1 | -1/+43 |
|\| | |||||
| * | Implemented switch statement logic in Comanche layout parser. | root | 2017-05-08 | 1 | -1/+43 |
| | | |||||
| * | get rid of edit activities | zotlabs | 2017-05-08 | 1 | -1/+11 |
| | |