{"action":"created","comment":{"url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/comments/30487092","id":30487092,"diff_hunk":"@@ -58,176 +58,96 @@\n <li>groups can have more than one owner</li>\n <li>can manage group membership</li>\n <li>can increase the permissions level on a group</li>\n-<li>can view, annotate, edit and delete data belonging to other members in the group\n-</li>\n+<li>can view, annotate, edit and delete data belonging to other members in the group (except annotate in Private groups)</li>\n <li>other interactions with data belonging to other group members depends on group type.</li>\n </ul>\n \n-<p><span class=\"bold\">Administrator</span> - this role is typically reserved for the OMERO server administrator:</p>\n+<p><span class=\"bold\">Admin</span> - this role is typically reserved for the OMERO server administrator:</p>\n <ul class=\"bullet-list\">\n-<li>practically speaking, Administrators can do anything they like to any user’s data, in any group.</li>\n+<li>practically speaking, Administrators can do anything they like to any user’s data, in any group (except annotate in Private groups).</li>\n </ul>\n \n-\n-<div class=\"line-block\">\n-<div class=\"line\"><br /></div> <!-- end #line -->\n-</div> <!-- end #line-block -->\n-\n-<p class=\"top_link\"><a href=\"#top\"><img src=\"images/back_to_top.png\" alt=\"Image for link to top of page\" style=\"float: right;\"/></a></p>\n-\n <h2><a class=\"anchor\" id=\"groups\"></a>Group types</h2>\n \n-<p>For the purposes of describing the actions permitted within each type of group, the following terms are used:</p>\n+<p>There are four types of group in OMERO, Private, Read-Only, Read-Annotate and Read-Write.</p>\n \n-<p><span class=\"bold\">Save rendering settings</span> means:</p>\n-<ul class=\"bullet-list\">\n-<li>selecting channels</li>\n-<li>setting pixel intensity range</li>\n-<li>allocating channel colour</li>\n-<li>these are saved under the user’s name and can be viewed by other group members</li>\n-<li>the owner’s settings are not affected.</li>\n-\n-</ul>\n-\n-<p><span class=\"bold\">Draw Regions of Interest (ROIs)</span> means:</p>\n-<ul class=\"bullet-list\">\n-<li>add and save shapes or text drawn on images.</li>\n-\n-</ul>\n-\n-<p><span class=\"bold\">Annotate</span> means adding:<p/>\n-<ul class=\"bullet-list\">\n-<li>ratings</li>\n-<li>tags</li>\n-<li>file attachments</li>\n-<li>key-value pairs</li>\n-<li>comments.</li>\n-\n-</ul>\n-\n-<p><span class=\"bold\">Edit</span> means:</p>\n+<p>The main points can be summarised as:</p>\n <ul class=\"bullet-list\">\n-<li>change the name of an Project, Dataset and Image</li>\n-<li>add or edit a description</li>\n-<li>remove annotations added by other users including you</li>\n-<li>delete data.</li>\n-\n+<li>you can be in many groups, each with different permissions</li>\n+<li>you always retain ownership of your data</li>\n+<li>your rendering settings cannot be over-written by any other user</li>","path":"sharing-data.html","position":89,"original_position":89,"commit_id":"d541feb558372dc9114a4d07486669047a85b12e","original_commit_id":"d541feb558372dc9114a4d07486669047a85b12e","user":{"login":"mtbc","id":2630707,"avatar_url":"https://avatars.githubusercontent.com/u/2630707?v=3","gravatar_id":"","url":"https://api.github.com/users/mtbc","html_url":"https://github.com/mtbc","followers_url":"https://api.github.com/users/mtbc/followers","following_url":"https://api.github.com/users/mtbc/following{/other_user}","gists_url":"https://api.github.com/users/mtbc/gists{/gist_id}","starred_url":"https://api.github.com/users/mtbc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mtbc/subscriptions","organizations_url":"https://api.github.com/users/mtbc/orgs","repos_url":"https://api.github.com/users/mtbc/repos","events_url":"https://api.github.com/users/mtbc/events{/privacy}","received_events_url":"https://api.github.com/users/mtbc/received_events","type":"User","site_admin":false},"body":"overwritten","created_at":"2015-05-18T07:55:59Z","updated_at":"2015-05-18T07:55:59Z","html_url":"https://github.com/openmicroscopy/ome-help/pull/73#discussion_r30487092","pull_request_url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73","_links":{"self":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/comments/30487092"},"html":{"href":"https://github.com/openmicroscopy/ome-help/pull/73#discussion_r30487092"},"pull_request":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73"}}},"pull_request":{"url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73","id":34915327,"html_url":"https://github.com/openmicroscopy/ome-help/pull/73","diff_url":"https://github.com/openmicroscopy/ome-help/pull/73.diff","patch_url":"https://github.com/openmicroscopy/ome-help/pull/73.patch","issue_url":"https://api.github.com/repos/openmicroscopy/ome-help/issues/73","number":73,"state":"open","locked":false,"title":"Adding Read-write group to Sharing Data","user":{"login":"gusferguson","id":1552703,"avatar_url":"https://avatars.githubusercontent.com/u/1552703?v=3","gravatar_id":"","url":"https://api.github.com/users/gusferguson","html_url":"https://github.com/gusferguson","followers_url":"https://api.github.com/users/gusferguson/followers","following_url":"https://api.github.com/users/gusferguson/following{/other_user}","gists_url":"https://api.github.com/users/gusferguson/gists{/gist_id}","starred_url":"https://api.github.com/users/gusferguson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gusferguson/subscriptions","organizations_url":"https://api.github.com/users/gusferguson/orgs","repos_url":"https://api.github.com/users/gusferguson/repos","events_url":"https://api.github.com/users/gusferguson/events{/privacy}","received_events_url":"https://api.github.com/users/gusferguson/received_events","type":"User","site_admin":false},"body":"Keeping this on a separate branch just in case it does not make it in (again).\r\n\r\nCheck Sharing Data\r\n- now states there are 4 groups\r\n- accurately describes Read-write group\r\n- accurate Read-write permissions table\r\n- read-write added to options available to admin when creating/editing groups (commit to come)\r\n- new warnings about risks of using Read-write permissions (commit to come)\r\n- check all screenshots to make sure old group names eliminated\r\n- check Read-Write is available where appropriate\r\n\r\nhttp://help.staging.openmicroscopy.org\r\n\r\nPDF in downloads staging.","created_at":"2015-05-07T13:30:42Z","updated_at":"2015-05-18T07:55:59Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bd0e5953a0b8195181d5f7e1c8c41934c996adaf","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73/commits","review_comments_url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73/comments","review_comment_url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openmicroscopy/ome-help/issues/73/comments","statuses_url":"https://api.github.com/repos/openmicroscopy/ome-help/statuses/d541feb558372dc9114a4d07486669047a85b12e","head":{"label":"gusferguson:version-5_1_2-02","ref":"version-5_1_2-02","sha":"d541feb558372dc9114a4d07486669047a85b12e","user":{"login":"gusferguson","id":1552703,"avatar_url":"https://avatars.githubusercontent.com/u/1552703?v=3","gravatar_id":"","url":"https://api.github.com/users/gusferguson","html_url":"https://github.com/gusferguson","followers_url":"https://api.github.com/users/gusferguson/followers","following_url":"https://api.github.com/users/gusferguson/following{/other_user}","gists_url":"https://api.github.com/users/gusferguson/gists{/gist_id}","starred_url":"https://api.github.com/users/gusferguson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gusferguson/subscriptions","organizations_url":"https://api.github.com/users/gusferguson/orgs","repos_url":"https://api.github.com/users/gusferguson/repos","events_url":"https://api.github.com/users/gusferguson/events{/privacy}","received_events_url":"https://api.github.com/users/gusferguson/received_events","type":"User","site_admin":false},"repo":{"id":21353524,"name":"ome-help","full_name":"gusferguson/ome-help","owner":{"login":"gusferguson","id":1552703,"avatar_url":"https://avatars.githubusercontent.com/u/1552703?v=3","gravatar_id":"","url":"https://api.github.com/users/gusferguson","html_url":"https://github.com/gusferguson","followers_url":"https://api.github.com/users/gusferguson/followers","following_url":"https://api.github.com/users/gusferguson/following{/other_user}","gists_url":"https://api.github.com/users/gusferguson/gists{/gist_id}","starred_url":"https://api.github.com/users/gusferguson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gusferguson/subscriptions","organizations_url":"https://api.github.com/users/gusferguson/orgs","repos_url":"https://api.github.com/users/gusferguson/repos","events_url":"https://api.github.com/users/gusferguson/events{/privacy}","received_events_url":"https://api.github.com/users/gusferguson/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/gusferguson/ome-help","description":"OME Project User Guides","fork":true,"url":"https://api.github.com/repos/gusferguson/ome-help","forks_url":"https://api.github.com/repos/gusferguson/ome-help/forks","keys_url":"https://api.github.com/repos/gusferguson/ome-help/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gusferguson/ome-help/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gusferguson/ome-help/teams","hooks_url":"https://api.github.com/repos/gusferguson/ome-help/hooks","issue_events_url":"https://api.github.com/repos/gusferguson/ome-help/issues/events{/number}","events_url":"https://api.github.com/repos/gusferguson/ome-help/events","assignees_url":"https://api.github.com/repos/gusferguson/ome-help/assignees{/user}","branches_url":"https://api.github.com/repos/gusferguson/ome-help/branches{/branch}","tags_url":"https://api.github.com/repos/gusferguson/ome-help/tags","blobs_url":"https://api.github.com/repos/gusferguson/ome-help/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gusferguson/ome-help/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gusferguson/ome-help/git/refs{/sha}","trees_url":"https://api.github.com/repos/gusferguson/ome-help/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gusferguson/ome-help/statuses/{sha}","languages_url":"https://api.github.com/repos/gusferguson/ome-help/languages","stargazers_url":"https://api.github.com/repos/gusferguson/ome-help/stargazers","contributors_url":"https://api.github.com/repos/gusferguson/ome-help/contributors","subscribers_url":"https://api.github.com/repos/gusferguson/ome-help/subscribers","subscription_url":"https://api.github.com/repos/gusferguson/ome-help/subscription","commits_url":"https://api.github.com/repos/gusferguson/ome-help/commits{/sha}","git_commits_url":"https://api.github.com/repos/gusferguson/ome-help/git/commits{/sha}","comments_url":"https://api.github.com/repos/gusferguson/ome-help/comments{/number}","issue_comment_url":"https://api.github.com/repos/gusferguson/ome-help/issues/comments{/number}","contents_url":"https://api.github.com/repos/gusferguson/ome-help/contents/{+path}","compare_url":"https://api.github.com/repos/gusferguson/ome-help/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gusferguson/ome-help/merges","archive_url":"https://api.github.com/repos/gusferguson/ome-help/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gusferguson/ome-help/downloads","issues_url":"https://api.github.com/repos/gusferguson/ome-help/issues{/number}","pulls_url":"https://api.github.com/repos/gusferguson/ome-help/pulls{/number}","milestones_url":"https://api.github.com/repos/gusferguson/ome-help/milestones{/number}","notifications_url":"https://api.github.com/repos/gusferguson/ome-help/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gusferguson/ome-help/labels{/name}","releases_url":"https://api.github.com/repos/gusferguson/ome-help/releases{/id}","created_at":"2014-06-30T14:15:10Z","updated_at":"2014-06-24T19:22:15Z","pushed_at":"2015-05-17T14:42:33Z","git_url":"git://github.com/gusferguson/ome-help.git","ssh_url":"git@github.com:gusferguson/ome-help.git","clone_url":"https://github.com/gusferguson/ome-help.git","svn_url":"https://github.com/gusferguson/ome-help","homepage":null,"size":343776,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"gh-pages"}},"base":{"label":"openmicroscopy:master","ref":"master","sha":"0f5f1a8f0924d6c0982599906c57e2f43ba09377","user":{"login":"openmicroscopy","id":975861,"avatar_url":"https://avatars.githubusercontent.com/u/975861?v=3","gravatar_id":"","url":"https://api.github.com/users/openmicroscopy","html_url":"https://github.com/openmicroscopy","followers_url":"https://api.github.com/users/openmicroscopy/followers","following_url":"https://api.github.com/users/openmicroscopy/following{/other_user}","gists_url":"https://api.github.com/users/openmicroscopy/gists{/gist_id}","starred_url":"https://api.github.com/users/openmicroscopy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmicroscopy/subscriptions","organizations_url":"https://api.github.com/users/openmicroscopy/orgs","repos_url":"https://api.github.com/users/openmicroscopy/repos","events_url":"https://api.github.com/users/openmicroscopy/events{/privacy}","received_events_url":"https://api.github.com/users/openmicroscopy/received_events","type":"Organization","site_admin":false},"repo":{"id":13249805,"name":"ome-help","full_name":"openmicroscopy/ome-help","owner":{"login":"openmicroscopy","id":975861,"avatar_url":"https://avatars.githubusercontent.com/u/975861?v=3","gravatar_id":"","url":"https://api.github.com/users/openmicroscopy","html_url":"https://github.com/openmicroscopy","followers_url":"https://api.github.com/users/openmicroscopy/followers","following_url":"https://api.github.com/users/openmicroscopy/following{/other_user}","gists_url":"https://api.github.com/users/openmicroscopy/gists{/gist_id}","starred_url":"https://api.github.com/users/openmicroscopy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmicroscopy/subscriptions","organizations_url":"https://api.github.com/users/openmicroscopy/orgs","repos_url":"https://api.github.com/users/openmicroscopy/repos","events_url":"https://api.github.com/users/openmicroscopy/events{/privacy}","received_events_url":"https://api.github.com/users/openmicroscopy/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openmicroscopy/ome-help","description":"OME Project User Guides","fork":false,"url":"https://api.github.com/repos/openmicroscopy/ome-help","forks_url":"https://api.github.com/repos/openmicroscopy/ome-help/forks","keys_url":"https://api.github.com/repos/openmicroscopy/ome-help/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openmicroscopy/ome-help/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openmicroscopy/ome-help/teams","hooks_url":"https://api.github.com/repos/openmicroscopy/ome-help/hooks","issue_events_url":"https://api.github.com/repos/openmicroscopy/ome-help/issues/events{/number}","events_url":"https://api.github.com/repos/openmicroscopy/ome-help/events","assignees_url":"https://api.github.com/repos/openmicroscopy/ome-help/assignees{/user}","branches_url":"https://api.github.com/repos/openmicroscopy/ome-help/branches{/branch}","tags_url":"https://api.github.com/repos/openmicroscopy/ome-help/tags","blobs_url":"https://api.github.com/repos/openmicroscopy/ome-help/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openmicroscopy/ome-help/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openmicroscopy/ome-help/git/refs{/sha}","trees_url":"https://api.github.com/repos/openmicroscopy/ome-help/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openmicroscopy/ome-help/statuses/{sha}","languages_url":"https://api.github.com/repos/openmicroscopy/ome-help/languages","stargazers_url":"https://api.github.com/repos/openmicroscopy/ome-help/stargazers","contributors_url":"https://api.github.com/repos/openmicroscopy/ome-help/contributors","subscribers_url":"https://api.github.com/repos/openmicroscopy/ome-help/subscribers","subscription_url":"https://api.github.com/repos/openmicroscopy/ome-help/subscription","commits_url":"https://api.github.com/repos/openmicroscopy/ome-help/commits{/sha}","git_commits_url":"https://api.github.com/repos/openmicroscopy/ome-help/git/commits{/sha}","comments_url":"https://api.github.com/repos/openmicroscopy/ome-help/comments{/number}","issue_comment_url":"https://api.github.com/repos/openmicroscopy/ome-help/issues/comments{/number}","contents_url":"https://api.github.com/repos/openmicroscopy/ome-help/contents/{+path}","compare_url":"https://api.github.com/repos/openmicroscopy/ome-help/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openmicroscopy/ome-help/merges","archive_url":"https://api.github.com/repos/openmicroscopy/ome-help/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openmicroscopy/ome-help/downloads","issues_url":"https://api.github.com/repos/openmicroscopy/ome-help/issues{/number}","pulls_url":"https://api.github.com/repos/openmicroscopy/ome-help/pulls{/number}","milestones_url":"https://api.github.com/repos/openmicroscopy/ome-help/milestones{/number}","notifications_url":"https://api.github.com/repos/openmicroscopy/ome-help/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openmicroscopy/ome-help/labels{/name}","releases_url":"https://api.github.com/repos/openmicroscopy/ome-help/releases{/id}","created_at":"2013-10-01T16:55:18Z","updated_at":"2015-05-04T10:24:29Z","pushed_at":"2015-05-17T14:42:33Z","git_url":"git://github.com/openmicroscopy/ome-help.git","ssh_url":"git@github.com:openmicroscopy/ome-help.git","clone_url":"https://github.com/openmicroscopy/ome-help.git","svn_url":"https://github.com/openmicroscopy/ome-help","homepage":null,"size":347463,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":11,"mirror_url":null,"open_issues_count":2,"forks":11,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73"},"html":{"href":"https://github.com/openmicroscopy/ome-help/pull/73"},"issue":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/issues/73"},"comments":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/issues/73/comments"},"review_comments":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73/comments"},"review_comment":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/pulls/73/commits"},"statuses":{"href":"https://api.github.com/repos/openmicroscopy/ome-help/statuses/d541feb558372dc9114a4d07486669047a85b12e"}}}}