Conversation
Might be just temporary to make permission checking easier
automatically delete orphaned non-sharable annotations
Conflicts: components/insight/SRC/org/openmicroscopy/shoola/env/data/views/ImageDataViewImpl.java
- "Create folder" active on single selection - "Remove folder" only active when ROI is in a folder
either implicated in Ice 3.6 failures or added fairly recently by me
previously used admin service's updateGroup
Fix tests for Ice 3.6
have AbstractServerTest.resetGroupPerms use Chmod2
Merge develop into regions
Tag version 5.2.3
This orphaned comment deletion should now be handled server-side when deleting the linked object.
Roi popupmenu fix
5.2.3: final merge
Member
Author
|
Given the successful status of https://ci.openmicroscopy.org/view/Breaking/job/OMERO-DEV-breaking-trigger/647/ including both the build, deployment and integration tests. Removing |
Roi table improvements
Member
Author
|
Since this PR was included, built and deployed into the daily CI workflow without notable issue (barring a few job adjustments) and as all integration tests are passing across plaformats, I propose to get this merged into |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR reintegrates the 2016 model work initiated on the
regionsbranch into thedevelopbranch of openmicroscopy. See https://trello.com/b/1t6i9daP/omero-5-3-0 for more information about the existing set of changes.