Merge branch '505-default-for-custom-overlays' into 'devel_12.1.x' (da97789d) · Commits · minerva / core

Commit da97789d authored 6 years ago by Piotr Gawron

Merge branch '505-default-for-custom-overlays' into 'devel_12.1.x'

Resolve "Default for `Custom overlays`"

See merge request !398

parents f8b212bb 4b0d4c64

No related branches found

No related tags found

2 merge requests!412changes from 12.1.0~beta.1 into master,!398Resolve "Default for `Custom overlays`"

Pipeline #6404 passed 6 years ago

Expand all Hide whitespace changes

Inline Side-by-side

Showing

frontend-js/src/main/js/gui/admin/EditUserDialog.js 34 additions, 8 deletions

frontend-js/src/main/js/gui/admin/EditUserDialog.js
frontend-js/src/main/js/map/data/User.js 3 additions, 0 deletions

frontend-js/src/main/js/map/data/User.js
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js 20 additions, 0 deletions

frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
frontend-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/POST_organismId=9606&sourceUrl=ftp%3A%2F%2Fhgdownload.cse.ucsc.edu%2FgoldenPath%2Fhg38%2FbigZips%2Fhg38.2bit&type=UCSC&version=hg38&token=ADMIN_TOKEN_ID& 0 additions, 0 deletions

...%2Fhg38.2bit&type=UCSC&version=hg38&token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/genomeTypes/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID& 0 additions, 1 deletion

...91/genomeTypes/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/taxonomies/9606/genomeTypes/UCSC/versions/hg38.getAvailableRemoteUrls/token=ADMIN_TOKEN_ID& 1 addition, 1 deletion

...ersions/hg38.getAvailableRemoteUrls/token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/taxonomies/9606/genomeTypes/UCSC/versions/hg38.getAvailableRemoteUrls/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...versions/hg38.getAvailableRemoteUrls/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/taxonomies/token=ADMIN_TOKEN_ID& 1 addition, 1 deletion

...tFiles/apiCalls/genomics/taxonomies/token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/taxonomies/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...stFiles/apiCalls/genomics/taxonomies/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/token=ADMIN_TOKEN_ID& 1 addition, 1 deletion

...tend-js/testFiles/apiCalls/genomics/token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/genomics/token=MOCK_TOKEN_ID& 1 addition, 0 deletions

frontend-js/testFiles/apiCalls/genomics/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/all/overlays/14081/PATCH_overlay.defaultOverlay=false&overlay.googleLicenseConsent=false&overlay.name=Pathways and compartments&overlay.order=1&overlay.publicOverlay=true&token=ADMIN_TOKEN_ID& 0 additions, 0 deletions

....order=1&overlay.publicOverlay=true&token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_images/overlays/publicOverlay=true&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...h_images/overlays/publicOverlay=true&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_images/statistics/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...complex_model_with_images/statistics/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/bioEntities/elements/columns=id,bounds,modelId,linkedSubmodel&id=345325&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...nds,modelId,linkedSubmodel&id=345325&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/bioEntities/elements/columns=id,bounds,modelId,linkedSubmodel&id=345330&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...nds,modelId,linkedSubmodel&id=345330&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/bioEntities/elements/columns=id,bounds,modelId,linkedSubmodel&id=345330,345331,345337&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...nkedSubmodel&id=345330,345331,345337&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/bioEntities/elements/columns=id,bounds,modelId,linkedSubmodel&id=345331&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...nds,modelId,linkedSubmodel&id=345331&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/bioEntities/elements/columns=id,bounds,modelId,linkedSubmodel&id=345334&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...nds,modelId,linkedSubmodel&id=345334&token=MOCK_TOKEN_ID&

with 71 additions and 22 deletions

Please register or to comment