Split view 10094 develop #969
Merged
Conversation
This file contains 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
added 22 commits
March 23, 2013 23:06
It was inconsistent to have the first key:value pair be ...key & ...value and then have ...key1 & ...value1 etc. Now, the first ones are ...key0 and ...value0.
Also update the grey panels code (channels not in merged appear grey in split columns)
ALSO aligning differences between dev_4_4 and develop at the merge commit by copying metadata_general.html directly between 75b7227 and this commit. Conflicts: components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
|
@will-moore Created a figure correctly. When attempting to view, download or access the attached figure get an unhandled exception response. OS: Mac |
|
@will-moore Was able to access the attachment from within Insight. |
|
The script created the figure as expected and allowed for reordering of images as expected. Just the issue over accessing the attachment via the web. Verified by using Insight. |
|
Ticket for downloading the attached figure: https://trac.openmicroscopy.org.uk/ome/ticket/10657 This PR good to merge now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is in dev_4_4 as #960, now for develop.
One thing to check in develop is that the new toolbar plays OK with the other buttons there (E.g. show FS paths).