Skip to content

Merge develop into regions #4632

Closed
dominikl wants to merge 86 commits intoome:regionsfrom
dominikl:regions_develop_merged
Closed

Merge develop into regions #4632
dominikl wants to merge 86 commits intoome:regionsfrom
dominikl:regions_develop_merged

Conversation

@dominikl
Copy link
Copy Markdown
Member

@dominikl dominikl commented May 5, 2016

This PR merges recent develop PRs ( up to cda8446 (incl), not including Ice 3.6).
The last commit fixes a trivial conflict related to the rebasing of the getROICount PR.

will-moore and others added 30 commits March 21, 2016 23:42
@will-moore
Add paths_to_tag() to show.py
4c525e3
@will-moore
ome.tree.js and views.py use paths_to_tag()
a3c95a2
@will-moore
Show() class supports 'tagset' objects
2f3d5a9
Update OMERO Build to consume BF5.1.9-snapshot
67b0600
@will-moore
Add tagset tests to test_show.py
2f47c66
@will-moore
Show() to support multiple well selection
6b11723
@will-moore
Use var WEBCLIENT.initially_select instead of url for paths_to_object
9316896
@will-moore
Update test_multiple_well_by_id to work with change in Show()
828e184
@will-moore
New Robot tests of 'show' functionality
767d1fe
@will-moore
Fix show Well name
d6f6f02
@will-moore
Move paths_to_tag() to avoid merge conflict
85b6756
@atarkowska
warn about Windows deprecation
fdeadab
@atarkowska
update warning message
bb19e1d
@atarkowska
add windows deprecated warning to -h
6b740b8
@atarkowska
add word WARNING
0151a46
@sbesson
Copy ome.api.IRenderingSettings Javadoc to omero.api.IRenderingSettings
04ac66e
@sbesson
Copy ome.api.ISession Javadoc to omero.api.ISession
9764fb6
@sbesson
Copy ome.api.IShare Javadoc to omero.api.IShare
268d0fb
@sbesson
Copy ome.api.ITypes Javadoc to omero.api.ITypes
4eb678a
@sbesson
Use double quotes cf Ice 3.6 bug
b6e19f7
@atarkowska
allow customize server_name
5693797
@jburel
Change cut/copy for orphaned objects
1da3cd2
@jburel
Synch UI with web so it is not possible to annotate tag or file.
2622fea
@sbesson
Review all usages of <code> in omero.api.IRenderingSettings
30a2a9a
@jburel
cyclic tag sets
7db21c1
@jburel
Select the location for screen
1f2a205
Warn of Windows deprecation in fs plugin.
9b00721
Update OMERO Build to consume BF5.1.9
1f9fae5
Output deprecation warning on fs rename subcommand
de10fbe
@jburel
Remove transform from example.
aead90d
atarkowska and others added 20 commits April 26, 2016 16:44
@atarkowska
use call in foreground
123ae3b
@joshmoore
Merge pull request ome#4583 from jburel/cut-copy
7decb91 
Cut/Copy
@joshmoore
Merge pull request ome#4586 from jburel/annotations
896ab82 
Tag/File annotations
@joshmoore
Merge pull request ome#4587 from jburel/tag-translator
63b4471 
cyclic tag sets
@joshmoore
Merge pull request ome#4588 from jburel/screen-import
54f2e9c 
Plate into screen
@joshmoore
Merge pull request ome#4590 from jburel/transform-examples
44240b1 
Transform examples
@joshmoore
Merge pull request ome#4594 from jburel/session-test
42da31d 
Session test
@joshmoore
Merge pull request ome#4596 from jburel/well-status
c1c339c 
Status field
@jburel
Merge pull request ome#4534 from will-moore/show_tag_tagset
4dbd05f 
Show tag tagset
@jburel
Merge pull request ome#4602 from dominikl/get_roi_count_develop
266f52c 
Get ROI count
@atarkowska
clean up pid file
8515a81
@atarkowska
revert ldap plugin
6aca01b
@snoopycrimecop
Update develop submodules
cd9e993 
Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: ome/scripts
Updating d1bbb59..1de4a24
Previously merged:
  # PR 111 will-moore 'kymograph_script_getDataset'

Generated by OMERO-DEV-latest-submods#202 (https://ci.openmicroscopy.org/job/OMERO-DEV-latest-submods/202/)
@jburel
Merge pull request ome#4535 from bramalingam/OMERO_BF5_1_9_Snapshot
9ccd1a3 
Update OMERO Build to consume BF5.1.9
@jburel
Merge pull request ome#4601 from aleksandra-tarkowska/deprecate_windows
cc7539b 
Deprecate windows
@jburel
Merge pull request ome#4599 from snoopycrimecop/develop/latest/submod…
7c78e87 
…ules

Update develop submodules
@jburel
Merge pull request ome#4578 from sbesson/ome_omero_apidoc_3
dbcc595 
Copy ome.api.* documentation to omero.api.* (3)
@jburel
Merge pull request ome#4604 from aleksandra-tarkowska/foreground
cda8446 
web start --foreground
@dominikl
Merge branch 'earlier_develop' into regions_develop_merged
02130a9
@dominikl
Removed duplicate method
9986ada
@dominikl dominikl changed the title Regions develop merged Merge develop into regions May 5, 2016
@dominikl dominikl mentioned this pull request May 5, 2016
Merged
@sbesson sbesson mentioned this pull request May 5, 2016
Merged
@sbesson sbesson removed the exclude label May 5, 2016
@sbesson sbesson closed this May 5, 2016
@sbesson
Copy link
Copy Markdown
Member

sbesson commented May 5, 2016

#4633 and #4634 seem to be sufficient to fix all Java/Python integration tests with this PR included. Reopening #4623 to check whether the re-inclusion of the Ice 3.6 PR does not cause any regression anymore.

@mtbc
Copy link
Copy Markdown
Member

mtbc commented May 6, 2016 •
edited
Loading

Looks to me like this time tests passed with #4623 in.

@dominikl dominikl deleted the regions_develop_merged branch May 3, 2017 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

regions

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@dominikl @sbesson @mtbc @will-moore @atarkowska @jburel @joshmoore @snoopycrimecop