Fixed minor typos in webadmin views
Send webadmin email as html as well as plain text
merge develop -D org: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
merge develop -D org: PR 2256 (Tablet drag handling)
merge develop -D org: PR 2258 (Truncate js tree dynamically 12161)
merge develop -D org: PR 2268 (Remove last file annotation)
merge develop -D org: PR 2269 (ROI improvements)
merge develop -D org: PR 2301 (fix #12193: replace FilesetVersionInfo with map property on Fileset)
merge develop -D org: PR 2305 (Birdeyeview bugs)
merge develop -D org: PR 2328 (Change CLI naming options (rebased))
merge develop -D org: PR 2346 (Flake8 cleanup of omeroweb/webredirect)
merge develop -D org: PR 2350 (Travis check for Python imports in OmeroWeb)
merge develop -D org: PR 2356 (python: Use os.path.isdir(p) rather than p.isdir())
merge develop -D org: PR 2357 (Generate Python API reference with Sphinx)
merge develop -D org: PR 2360 (Fix port on interactive login (Fix #12228) (rebased onto develop))
merge develop -D org: PR 2362 (Remove .jy from script names)
merge develop -D org: PR 2368 (Fixed minor typos in webadmin views)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2363 dominikl 'Java Gateway API' (label: breaking)
  # PR 2348 knabar 'Flake8 cleanup of omeroweb/webadmin' (exclude comment)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2336 knabar 'New tagging dialog' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
  # PR 2256 will-moore 'Tablet drag handling'
  # PR 2258 will-moore 'Truncate js tree dynamically 12161'
  # PR 2268 dominikl 'Remove last file annotation'
  # PR 2269 dominikl 'ROI improvements'
  # PR 2301 mtbc 'fix #12193: replace FilesetVersionInfo with map property on Fileset'
  # PR 2305 aleksandra-tarkowska 'Birdeyeview bugs'
  # PR 2328 ximenesuk 'Change CLI naming options (rebased)'
  # PR 2346 knabar 'Flake8 cleanup of omeroweb/webredirect'
  # PR 2350 knabar 'Travis check for Python imports in OmeroWeb'
  # PR 2356 rleigh-dundee 'python: Use os.path.isdir(p) rather than p.isdir()'
  # PR 2357 rleigh-dundee 'Generate Python API reference with Sphinx'
  # PR 2360 joshmoore 'Fix port on interactive login (Fix #12228) (rebased onto develop)'
  # PR 2362 will-moore 'Remove .jy from script names'
  # PR 2367 dpwrussell 'Move webadmin navigation to base template'
  # PR 2368 dpwrussell 'Fixed minor typos in webadmin views'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1054 qidane 'Additional annotation points throughout the model' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)'
  # PR 1055 rleigh-dundee 'Fix up Bio-Formats POMs (rebased)'
  # PR 1060 melissalinkert 'Allow dist-matlab to run on Windows'
  # PR 1063 melissalinkert 'Micromanager fixes (rebased onto develop)'
  # PR 1065 sbesson 'Update auto-generated documentation'

Repository: ome/scripts
Already up-to-date.

Merged PRs:
  # PR 76 will-moore 'Fix 'No permissions' error in Make_Movie.py. See #12227'

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 44094aa..2184e7b
Merged PRs (fast-forward):
  # PR 752 rleigh-dundee 'ant: Support API doc generation'

Merged PRs:
  # PR 745 sbesson 'OMERO.matlab improvements (rebased onto develop)'
  # PR 754 sbesson 'Document new integration jobs'
  # PR 755 rleigh-dundee 'Search.txt: Correct use of unicode quotes'

Generated by OMERO-5.1-merge-push#180 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/180/)