7993 transition#89
Merged
chris-allan merged 23 commits intoome:developfrom Feb 29, 2012
atarkowska:7993_transition
Merged
Conversation
…ition Conflicts: components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/scripts/script_ui.html
Conflicts: components/tools/OmeroWeb/omeroweb/settings.py components/tools/OmeroWeb/omeroweb/webemdb/templates/webemdb/entries/viewport.html components/tools/OmeroWeb/omeroweb/webmobile/templates/webmobile/viewer.html
joshmoore
pushed a commit
to joshmoore/openmicroscopy
that referenced
this pull request
Apr 21, 2015
Expand populate metadata by image
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
2 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.
Could you please merge it with develop. This branch should be merged after PR_62 (http://github.com/openmicroscopy/openmicroscopy/pull/62) -> 6190_iframe (http://github.com/will-moore/openmicroscopy/tree/6190_iframe)