Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split view 10094 develop #969

Merged
merged 22 commits into from
Apr 4, 2013
Merged

Split view 10094 develop #969

merged 22 commits into from
Apr 4, 2013

Commits on Mar 23, 2013

  1. Bulk of the code/pieces in place to run script

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    4ecf739 View commit details
    Browse the repository at this point in the history

  2. Script_ui 'map' key-value pairs parsed a bit nicer 

    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.
    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    91fbbce View commit details
    Browse the repository at this point in the history

  3. Moving js to ome.split_view_figure.js etc 

    Also update the grey panels code (channels not in merged appear grey in split columns)
    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    91cca29 View commit details
    Browse the repository at this point in the history

  4. Added header and footer to Split_View_Figure page

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    1f3fc11 View commit details
    Browse the repository at this point in the history

  5. Image row labels displayed and updated on Figure

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    2ee7872 View commit details
    Browse the repository at this point in the history

  6. Figure scripts menu/launch fixes

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    972540f View commit details
    Browse the repository at this point in the history

  7. Hide Z-projection controls if disabled

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    e3758cf View commit details
    Browse the repository at this point in the history

  8. metadata_general 'includes' tool bar (contains link btn)

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    7623eba View commit details
    Browse the repository at this point in the history

  9. Moving FigureScripts button to right-panel toolbar

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    4d00c9a View commit details
    Browse the repository at this point in the history

  10. Fix rebase with jshint PR545

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    1bc3d40 View commit details
    Browse the repository at this point in the history

  11. Moving toolbar to top of right panel

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    d214caa View commit details
    Browse the repository at this point in the history

  12. Added scripts button and toolbar to batch_annotate panel

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    d7f8793 View commit details
    Browse the repository at this point in the history

  13. Styling dropdown menus and Split View Fig html

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    8b775d9 View commit details
    Browse the repository at this point in the history

  14. Remove placeholder from scripts menu dropdown

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    54345e5 View commit details
    Browse the repository at this point in the history

  15. Zoom slider for Split_View Fig preview

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    4ffc229 View commit details
    Browse the repository at this point in the history

  16. Disable Figure Scripts if selected objects not suitable

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    46f225e View commit details
    Browse the repository at this point in the history

  17. Number fields in script UIs only accept numbers. See #10055

    Will Moore committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    bac75c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2013

  1. Merge branch 'split_view_10094_develop' into split_view_merge_develop 

    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 committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    87c796c View commit details
    Browse the repository at this point in the history

  2. Merge cleanup - file-paths button added to toolbar

    Will Moore committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    9334641 View commit details
    Browse the repository at this point in the history

  3. Drag-n-drop to re-order figure rows (re-order 'IDs')

    Will Moore committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    69f94a8 View commit details
    Browse the repository at this point in the history

  4. If channel colour is white, labels should be black

    Will Moore committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    2fb374c View commit details
    Browse the repository at this point in the history

  5. Removing commented-out conflicts from dusty.css

    Will Moore committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    105ba63 View commit details
    Browse the repository at this point in the history