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 #960

Merged
merged 22 commits into from
Mar 28, 2013
Merged

Split view 10094 #960

merged 22 commits into from
Mar 28, 2013

Commits on Jan 15, 2013

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

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    be94372 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 Jan 15, 2013
    Configuration menu
    Copy the full SHA
    33ebdeb 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 Jan 15, 2013
    Configuration menu
    Copy the full SHA
    ae8c038 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 Jan 15, 2013
    Configuration menu
    Copy the full SHA
    c3afb80 View commit details
    Browse the repository at this point in the history

  5. Image row labels displayed and updated on Figure

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    3747b65 View commit details
    Browse the repository at this point in the history

  6. Figure scripts menu/launch fixes

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    8831e44 View commit details
    Browse the repository at this point in the history

  7. Hide Z-projection controls if disabled

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    90a5dec View commit details
    Browse the repository at this point in the history

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

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    4d3b567 View commit details
    Browse the repository at this point in the history

  9. Moving FigureScripts button to right-panel toolbar

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    c605da1 View commit details
    Browse the repository at this point in the history

  10. Fix rebase with jshint PR545

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    d739a42 View commit details
    Browse the repository at this point in the history

  11. Moving toolbar to top of right panel

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    af8b630 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 Jan 15, 2013
    Configuration menu
    Copy the full SHA
    16df9d8 View commit details
    Browse the repository at this point in the history

  13. Styling dropdown menus and Split View Fig html

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    c42cd0e View commit details
    Browse the repository at this point in the history

  14. Remove placeholder from scripts menu dropdown

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    9b3af0c View commit details
    Browse the repository at this point in the history

  15. Zoom slider for Split_View Fig preview

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    35aaf71 View commit details
    Browse the repository at this point in the history

  16. Disable Figure Scripts if selected objects not suitable

    Will Moore committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    92f3a07 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2013

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

    Will Moore committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    88f2f3c View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2013

  1. Merge branch 'split_view_10094' into split_view_merge 

    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 21, 2013
    Configuration menu
    Copy the full SHA
    75b7227 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 21, 2013
    Configuration menu
    Copy the full SHA
    e547d35 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2013

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

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

Commits on Mar 23, 2013

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

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

Commits on Mar 27, 2013

  1. Removing commented-out conflicts from dusty.css

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