Sync master and dev #80
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
make imgag dropbox raise exception if unknown data types arrive
Add new line at end of file
…nto release/1.5.0
* Feature/checksum maintenance (#50) This PR introduces a maintenance task that will refresh the path info db and update missing checksums * Feature/checksum maintenance (#52) This PR favors the ChecksumCalculationTask over the path info db refresh task and has been confirmed to work in a openbis 18.06.2 test instance. * Update CL * Add new line at end of file Add new line at end of file * convert experiment id to string for v3 objects * Convert experiment id to string for v3 objects (#55) * Rename data folder for pooled data (#54) * adapt changelog Co-authored-by: wow-such-code <andreas.friedrich@uni-tuebingen.de>
* convert experiment id to string for v3 objects * adapt changelog * fetch samples by id without using search service
* retry sample tracking update for incoming data and log failure Co-authored-by: Sven F <sven.fillinger@qbic.uni-tuebingen.de>
Release 1.6.0
* add readme * add regex description * include attachment readme in main readme Co-authored-by: Sven F <sven.fillinger@qbic.uni-tuebingen.de>
* add readme for conversion and registration of mass spec data Co-authored-by: jnnfr <jennifer.boedker@qbic.uni-tuebingen.de> * move readme to the top folder * fix formatting Co-authored-by: Sven F <sven.fillinger@qbic.uni-tuebingen.de> Co-authored-by: jnnfr <jennifer.boedker@qbic.uni-tuebingen.de>
* add HLA typing description to README * remove faulty description from script Co-authored-by: wow-such-code <andreas.friedrich@uni-tuebingen.de>
* Adds completed version of Omero imaging data registration script: * General metadata is stored in openBIS (imaging experiments and samples) * Data and additional metadata key-value-pairs are stored in OMERO * Add readme for Omero etl script * Added some comments to code * Minor code cleanup Co-authored-by: Sven F <sven.fillinger@qbic.uni-tuebingen.de> Co-authored-by: luiskuhn <38211686+luiskuhn@users.noreply.github.com> Co-authored-by: luiskuhn <luis.kuhn@gmail.com> Co-authored-by: Tobias Koch <KochTobi@users.noreply.github.com>
Contributor
Author
|
I would like to sync these branches to add validation to the omero etl script without conflicts |
Contributor
Author
|
looks good |
wow-such-code
approved these changes
May 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.