5.2.3: final merge#4635
Merged
sbesson merged 112 commits intoome:regionsfrom May 9, 2016
Merged
Conversation
RF: Annotation_tests : File Annotation and Search Result Tests
get better message for status when using apache
Add keepalive for root connection
Clean up newly created P/D/S post tests to maintain database state
It seems that on one browser, CI tests fail because 'Add Comment' button is not visible (it is shown/hidden when text area gets/loses focus and this may be somehow fragile to Robot tests)
Right panel annotation tabs
5.2.3 version history
Tag version 5.2.3
This orphaned comment deletion should now be handled server-side when deleting the linked object.
Member
Author
|
8134023 pushed to address the flake8 failures due to the |
Member
|
Final commit looks good to me. |
Member
Author
|
@will-moore: is the |
Member
|
@sbesson Comment removal is tested by Robot but that won't test that the comment is deleted (just that it's removed from the object). I don't think that this is covered by integration tests either, so manual testing is needed. |
Member
|
Comments are getting deleted from the DB upon deletion in web client so good to merge. |
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
5 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 should be the last PR merging develop into regions before the upcoming reintegration.
The only commit to be reviewed is d0355b7 which includes a trivial conflict fix in
components/tools/OmeroWeb/omeroweb/webclient/controller/container.py. All integration tests should keep passing.