aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-081-3/+4
| |
* | use correct data typezotlabs2017-05-091-1/+1
| |
* | zot protocol doco updateszotlabs2017-05-091-2/+2
| |
* | errorzotlabs2017-05-082-7/+1
| |
* | cleanup of last checkinzotlabs2017-05-071-2/+4
| |
* | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-071-3/+4
| |
* | get rid of edit activitieszotlabs2017-05-071-1/+11
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-051-1/+2
|\|
| * markdown autolinks - hubzilla bug #752zotlabs2017-05-051-5/+12
| |
| * abook_not_here flag created to indicate singleton connections which are ↵zotlabs2017-05-031-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 #752zotlabs2017-05-051-5/+12
| |
* | do away with single delivery (delivery from clones to singleton networks ↵zotlabs2017-05-041-20/+3
| | | | | | | | attached to other clones)
* | oauth2/oidc testing (please do not port - this requires several extra DB ↵zotlabs2017-05-032-0/+111
| | | | | | | | tables to work)
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-032-31/+104
|\|
| * add check for php zip extensionMario Vavti2017-05-031-1/+6
| |
| * :white_check_mark::bulb: Add Unit Tests for AccessList class.Klaus Weidenbach2017-05-011-30/+98
| | | | | | | | Also some Doxygen docu for this class.
| * use hostname, not urlzotlabs2017-05-011-1/+1
| |
| * authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵zotlabs2017-05-012-5/+22
| | | | | | | | local server bypass the network access and invoke zotfeed directly.
| * more work on client side e2eezotlabs2017-05-011-1/+25
| |
| * issues from hubzilla:#737zotlabs2017-04-273-5/+16
| |
| * provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
| |
* | new function Hook::register_array() to bulk register several hooks from the ↵zotlabs2017-05-011-0/+9
| | | | | | | | same file with default settings
* | use hostname, not urlzotlabs2017-04-301-1/+1
| |