Commit 0d7984f0 authored 1 year ago by vkovtun

Merge branch 'master' into bis-999-export-fixes

parents 0a1954b5 63cbe1dc

No related branches found

No related tags found

1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...

Hide whitespace changes

Inline Side-by-side

Showing

api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchCriteria.java 12 additions, 0 deletions

...eric/asapi/v3/dto/global/search/GlobalSearchCriteria.java
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/UploadedDataSetCreation.java 13 additions, 1 deletion

...dssapi/v3/dto/dataset/create/UploadedDataSetCreation.java
api-openbis-javascript/src/v3/openbis.js 24 additions, 1 deletion

api-openbis-javascript/src/v3/openbis.js
api-openbis-typescript/build.gradle 4 additions, 3 deletions

api-openbis-typescript/build.gradle
api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/OpenBISExtension.java 171 additions, 39 deletions

...ethz/sis/openbis/generic/typescript/OpenBISExtension.java
api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/TypeScriptObject.java 13 additions, 0 deletions

...ethz/sis/openbis/generic/typescript/TypeScriptObject.java
api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/dto/OpenBISJavaScriptDSSFacade.java 34 additions, 3 deletions

...is/generic/typescript/dto/OpenBISJavaScriptDSSFacade.java
api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/dto/OpenBISJavaScriptFacade.java 5 additions, 2 deletions

...enbis/generic/typescript/dto/OpenBISJavaScriptFacade.java
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/core-plugin.properties 0 additions, 0 deletions

.../core-plugins/imaging-nanonis/1/as/core-plugin.properties
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/initialize-master-data.py 0 additions, 0 deletions

...re-plugins/imaging-nanonis/1/as/initialize-master-data.py
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/imaging-test-data-model.xls 0 additions, 0 deletions

...ging-nanonis/1/as/master-data/imaging-test-data-model.xls
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00063.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00063.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00064.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00064.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00065.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00065.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00066.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00066.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00067.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00067.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00068.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00068.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00069.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00069.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/didv_00070.dat 0 additions, 0 deletions

...onis/1/as/master-data/nanonis_example/data/didv_00070.dat
core-plugin-openbis/dist/core-plugins/imaging-nanonis/1/as/master-data/nanonis_example/data/img_0150.sxm 0 additions, 0 deletions

...anonis/1/as/master-data/nanonis_example/data/img_0150.sxm

with 276 additions and 49 deletions

Please register or to comment