Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-08 | 1 | -3/+4 |
| | | |||||
* | | use correct data type | zotlabs | 2017-05-09 | 1 | -1/+1 |
| | | |||||
* | | zot protocol doco updates | zotlabs | 2017-05-09 | 1 | -2/+2 |
| | | |||||
* | | error | zotlabs | 2017-05-08 | 2 | -7/+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 |
|\| | |||||
| * | markdown autolinks - hubzilla bug #752 | zotlabs | 2017-05-05 | 1 | -5/+12 |
| | | |||||
| * | 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. | ||||
* | | markdown autolinks - hubzilla bug #752 | zotlabs | 2017-05-05 | 1 | -5/+12 |
| | | |||||
* | | do away with single delivery (delivery from clones to singleton networks ↵ | zotlabs | 2017-05-04 | 1 | -20/+3 |
| | | | | | | | | attached to other clones) | ||||
* | | 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 | 2 | -31/+104 |
|\| | |||||
| * | add check for php zip extension | Mario Vavti | 2017-05-03 | 1 | -1/+6 |
| | | |||||
| * | :white_check_mark::bulb: Add Unit Tests for AccessList class. | Klaus Weidenbach | 2017-05-01 | 1 | -30/+98 |
| | | | | | | | | Also some Doxygen docu for this class. | ||||
| * | use hostname, not url | zotlabs | 2017-05-01 | 1 | -1/+1 |
| | | |||||
| * | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵ | zotlabs | 2017-05-01 | 2 | -5/+22 |
| | | | | | | | | local server bypass the network access and invoke zotfeed directly. | ||||
| * | more work on client side e2ee | zotlabs | 2017-05-01 | 1 | -1/+25 |
| | | |||||
| * | issues from hubzilla:#737 | zotlabs | 2017-04-27 | 3 | -5/+16 |
| | | |||||
| * | provide a broken feed as a separate module | zotlabs | 2017-04-26 | 3 | -2/+50 |
| | | |||||
* | | new function Hook::register_array() to bulk register several hooks from the ↵ | zotlabs | 2017-05-01 | 1 | -0/+9 |
| | | | | | | | | same file with default settings | ||||
* | | use hostname, not url | zotlabs | 2017-04-30 | 1 | -1/+1 |
| | |