Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openbis
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

34daf5f5

Commit 34daf5f5 authored 3 years ago by vkovtun

Downloads
- Plain Diff

Merge branch 'master' into ssdm-10474-collection-form-views-config

# Conflicts:
#	openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/common-data-model.xls

parents 17e6e177 3ca54962

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py 1 addition, 0 deletions

...dist/core-plugins/eln-lims/1/as/initialize-master-data.py
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/common-data-model.xls 0 additions, 0 deletions

...e-plugins/eln-lims/1/as/master-data/common-data-model.xls
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js 6 additions, 4 deletions

...pps/eln-lims/html/js/views/SampleTable/SampleTableView.js
openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/parsers/excel_to_poi/excel_to_poi.py 6 additions, 1 deletion

...vices/xls-import-api/parsers/excel_to_poi/excel_to_poi.py

with 13 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment