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.

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

Cancel all #3413

Merged
merged 1 commit into from Jan 31, 2015
Merged

Cancel all #3413

merged 1 commit into from Jan 31, 2015

Conversation

jburel
Copy link
Member

@jburel jburel commented Jan 28, 2015

Fix ticket https://trac.openmicroscopy.org.uk/ome/ticket/12165

To test:
test 1

  • Select a folder to import
  • When scanning is done, cancel elements. Make sure the "Cancel All" button is enabled until there are still some import to cancel.

test 2

  • Select few files to import
  • When scanning is done, cancel elements. Make sure the "Cancel All" button is enabled until there are still some import to cancel.

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OME-5.1-merge-push#735. See the console output for more details.
Possible conflicts:

  • PR Imagej prep #3329 jburel 'Imagej prep'
    • components/insight/SRC/org/openmicroscopy/shoola/env/data/util/StatusLabel.java

@jburel
Copy link
Member Author

jburel commented Jan 29, 2015

Removed last commit. I forgot that I fixed it in another PR.

@gusferguson
Copy link

@jburel

Tested using OMERO.insight-5.1.0-m3-850-bf650c9-ice35-b396-mac trout user-3 read-annotate-1

Behaves as expected.
Good to merge.

@jburel
Copy link
Member Author

jburel commented Jan 30, 2015

--no-rebase

sbesson added a commit that referenced this pull request Jan 31, 2015
@sbesson sbesson merged commit 361fec9 into ome:develop Jan 31, 2015
@jburel jburel deleted the cancel-all branch February 5, 2015 12:27
@sbesson sbesson added this to the 5.1.0-m4 milestone Feb 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants