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 |
| | | |||||
| * | wiki auto language select to match webpages implementation | zotlabs | 2017-05-23 | 1 | -5/+27 |
| | | |||||
| * | 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 |
| | | |||||
| * | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-23 | 2 | -0/+54 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
* | | 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 | 6 | -30/+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) | ||||
* | | 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 |
| | | |||||
* | | wiki auto language select to match webpages implementation | zotlabs | 2017-05-22 | 1 | -5/+27 |
| | | |||||
* | | 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 | 1 | -1/+1 |
|\| | |||||
| * | some styling for system notifications | Mario Vavti | 2017-05-18 | 1 | -1/+1 |
| | | |||||
* | | schema fixes | zotlabs | 2017-05-22 | 1 | -0/+4 |
| | | |||||
* | | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-21 | 2 | -0/+54 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
* | | 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 |
| |/ / | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-11 | 1 | -1/+3 |
|\| | | |||||
| * | | send directory realm_token for navbar autocomplete searches - if configured | zotlabs | 2017-05-10 | 1 | -1/+3 |
| |/ | |||||
| * | get rid of edit activities | zotlabs | 2017-05-08 | 1 | -1/+11 |
| | | |||||
| * | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-08 | 1 | -3/+4 |
| | | |||||
* | | consolidate email validation checks | zotlabs | 2017-05-11 | 2 | -2/+2 |
| | | |||||
* | | error | zotlabs | 2017-05-08 | 1 | -1/+1 |
| | | |||||
* | | cleanup of last checkin | zotlabs | 2017-05-07 | 1 | -2/+4 |
| | | |||||
* | | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-07 | 1 | -3/+4 |
| | | |||||
* | | get rid of edit activities | zotlabs | 2017-05-07 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 1 | -1/+2 |
|\| | |||||
| * | abook_not_here flag created to indicate singleton connections which are ↵ | zotlabs | 2017-05-03 | 1 | -1/+2 |
| | | | | | | | | connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented. | ||||
* | | oauth2/oidc testing (please do not port - this requires several extra DB ↵ | zotlabs | 2017-05-03 | 2 | -0/+111 |
| | | | | | | | | tables to work) | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-03 | 1 | -1/+6 |
|\| | |||||
| * | add check for php zip extension | Mario Vavti | 2017-05-03 | 1 | -1/+6 |
| | | |||||
| * | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵ | zotlabs | 2017-05-01 | 1 | -1/+2 |
| | | | | | | | | local server bypass the network access and invoke zotfeed directly. | ||||
| * | more work on client side e2ee | zotlabs | 2017-05-01 | 1 | -1/+25 |
| | | |||||
| * | provide a broken feed as a separate module | zotlabs | 2017-04-26 | 3 | -2/+50 |
| | | |||||
* | | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵ | zotlabs | 2017-04-30 | 1 | -1/+2 |
| | | | | | | | | local server bypass the network access and invoke zotfeed directly. | ||||
* | | more work on client side e2ee | zotlabs | 2017-04-29 | 1 | -1/+25 |
| | | |||||
* | | more client-side mail privacy work | zotlabs | 2017-04-26 | 1 | -46/+28 |
| | | |||||
* | | provide a broken feed as a separate module | zotlabs | 2017-04-26 | 3 | -2/+50 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 3 | -12/+12 |
|\| |