aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
|/ /
* | 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
|/
* 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
|
* 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.
* 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
|
* make mastodon happy argsMario Vavti2017-04-262-2/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-261-10/+10
|\
| * database support for client side e2ee for private mailzotlabs2017-04-251-10/+10
| |
| * if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-231-1/+1
| | | | | | | | fact be null. As long as it isn't 1, we should attempt delivery.
* | The rest of the library and backend changes to support client-side e2ee and ↵zotlabs2017-04-264-19/+10
| | | | | | | | deprecate previous uses of item_obscured.
* | In the rare case where a default channel is not selected but channels ↵zotlabs2017-04-261-78/+82
| | | | | | | | actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel.
* | provide a broken feed for services which require a broken feedzotlabs2017-04-263-32/+37
| |
* | Revert "fix the query of last pullrequest"Mario Vavti2017-04-241-1/+1
| | | | | | | | This reverts commit bda9a833ba2511a36a569dd03991130e775c5ca7.
* | fix the query of last pullrequestMario Vavti2017-04-231-1/+1
| |
* | Revert "Revert "if there is no site record, site_dead won't be 0, in a left ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | join it will in fact be null. As long as it isn't 1, we should attempt delivery."" This reverts commit b6be0e1b996840192ea50b864b260d4d4cefbbb2.
* | Revert "if there is no site record, site_dead won't be 0, in a left join it ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | will in fact be null. As long as it isn't 1, we should attempt delivery." This reverts commit 42f5291f692965944076a5005b101fe409bb182c.
* | if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-221-1/+1
|/ | | | fact be null. As long as it isn't 1, we should attempt delivery.
* order wiki pages by creation dateMario Vavti2017-04-191-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-191-31/+29
|\
| * envelope privacyzotlabs2017-04-181-31/+29
| |
* | don't allow any null fields in notify creationzotlabs2017-04-191-2/+3
| |
* | webfinger cleanupzotlabs2017-04-191-20/+23
|/
* allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
|
* missing includesMario Vavti2017-04-131-0/+1
|
* sql error photos_albums_list with non-logged-in viewerzotlabs2017-04-031-1/+1
|
* fix connectDefaultShare generated js function, though it isn't obvious if we ↵zotlabs2017-04-031-19/+11
| | | | still use it.
* app sorting issuezotlabs2017-04-031-3/+13
|
* Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-312-0/+6
|\ | | | | :lock: Add CSRF protection for import and import_items.