Skip to content

Commit

Permalink
merge master -Dorg -Ssuccess-only
Browse files Browse the repository at this point in the history
Repository: ome/omero-python-superbuild
Already up-to-date.

Repository: ome/omero-dropbox
Excluded PRs:
  - PR 16 joshmoore 'Review all instances of whitelist/blacklist' (state: failure)
Already up-to-date.

Repository: ome/omero-marshal
Excluded PRs:
  - PR 69 will-moore 'Roi encoder allows Shape None' (state: failure)
  - PR 34 chris-allan 'Initial support for Event' (exclude comment)
  - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
  - PR 29 chris-allan 'Initial support for FileAnnotation and OriginalFile' (exclude comment)
Already up-to-date.

Repository: ome/omero-py
Excluded PRs:
  - PR 184 manics 'Auto-format code with black' (exclude comment)
  - PR 160 manics 'prefs.py: config throw if OMERODIR not set' (exclude comment)
  - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
  - PR 115 manics 'Remove omero_ext.argparse' (exclude comment)
Already up-to-date.

Merged PRs:
  - PR 194 manics 'Support Python 3 asyncio concurrency'
  - PR 199 joshmoore 'user: allow setting default group'
  - PR 207 manics 'BlitzGateway.connect raise on error'
  - PR 266 joshmoore 'errors: use raise_error from cli plugins'
  - PR 287 sbesson 'Add logic to search OMERO.tables on non Pythonic named columns'
  - PR 290 glyg 'Assert connection decorator, see ome#289'
  - PR 299 joshmoore 'Add parents and children to omero obj'
  - PR 303 joshmoore 'import --fetch-jars: allow direct link'
  - PR 304 jburel 'Trigger pr'
  - PR 305 chris-allan 'Ensure we are using pyopenssl (See ome/omero-py#240)'

Repository: ome/omero-scripts
Excluded PRs:
  - PR 187 jburel 'Rtd' (state: failure)
Already up-to-date.

Merged PRs:
  - PR 103 joshmoore 'Script for calculating min/max'
  - PR 173 will-moore 'ROI export with Well ID'

Repository: ome/omero-web
Excluded PRs:
  - PR 226 manics 'WIP: Prettier autoformat (js, css, md)' (exclude comment)
  - PR 224 manics 'WIP: Rewrite Dockerfile' (exclude comment)
  - PR 200 bramalingam 'WIP:Django upgrade to 2.2' (exclude comment)
  - PR 196 manics 'OMERO.web default log can be changed, e.g. to stdout' (exclude comment)
  - PR 168 stick 'Changes to nginx @maintenance handler' (state: failure)
  - PR 142 manics 'omero.web.secure defaults to true' (state: failure)
  - PR 64 manics 'Remove omero_ext.argparse' (exclude comment)
  - PR 63 manics 'Web templating with Jinja 2' (state: failure)
Already up-to-date.

Merged PRs:
  - PR 225 will-moore 'Query string ids'
  - PR 308 kkoz 'Obj id bitmask endpoint'
  - PR 323 will-moore 'Filtering handles ampersands in image names'

Conflicting PRs (not included):
  - PR 313 emilroz 'Add option to hide "Forgot Password"'

Generated by OMERO-python-superbuild-push#851 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/851/)
  • Loading branch information
snoopycrimecop committed Oct 16, 2021
1 parent d01d40c commit 565b621
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[submodule "omero-py"]
path = omero-py
url = git://github.com/ome/omero-py
url = git://github.com/snoopycrimecop/omero-py
[submodule "omero-web"]
path = omero-web
url = git://github.com/ome/omero-web
url = git://github.com/snoopycrimecop/omero-web
[submodule "omero-marshal"]
path = omero-marshal
url = git://github.com/ome/omero-marshal
url = git://github.com/snoopycrimecop/omero-marshal
[submodule "omero-dropbox"]
path = omero-dropbox
url = git://github.com/ome/omero-dropbox
url = git://github.com/snoopycrimecop/omero-dropbox
[submodule "omero-scripts"]
path = omero-scripts
url = git://github.com/ome/omero-scripts
url = git://github.com/snoopycrimecop/omero-scripts
2 changes: 1 addition & 1 deletion omero-dropbox
Submodule omero-dropbox updated 0 files
2 changes: 1 addition & 1 deletion omero-marshal
Submodule omero-marshal updated 0 files
2 changes: 1 addition & 1 deletion omero-scripts

0 comments on commit 565b621

Please sign in to comment.