Merge pull request #408 from HumanBrainProject/staging (48bb1680) · Commits · Xiao Gui / siibra-explorer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

siibra-explorer
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

48bb1680

Unverified Commit 48bb1680 authored 5 years ago by

xgui3783 Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #408 from HumanBrainProject/staging

hotfix: fixing regression:receptor data

parents 2cf13407 a8ae67c0

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

deploy/datasets/query.js 2 additions, 10 deletions

deploy/datasets/query.js
deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json 212 additions, 0 deletions

...oy/datasets/supplements/data/pmapJuBrainExtraPreview.json
deploy/datasets/supplements/previewFile.js 3 additions, 1 deletion

deploy/datasets/supplements/previewFile.js
src/atlasViewer/atlasViewer.template.html 15 additions, 7 deletions

src/atlasViewer/atlasViewer.template.html
src/components/flatTree/flatTree.style.css 6 additions, 1 deletion

src/components/flatTree/flatTree.style.css
src/res/css/extra_styles.css 2 additions, 2 deletions

src/res/css/extra_styles.css
src/res/ext/colin.json 39 additions, 26 deletions

src/res/ext/colin.json
src/theme.scss 26 additions, 0 deletions

src/theme.scss
src/ui/nehubaContainer/nehubaContainer.template.html 1 addition, 1 deletion

src/ui/nehubaContainer/nehubaContainer.template.html
src/ui/nehubaContainer/splashScreen/splashScreen.template.html 2 additions, 2 deletions

...i/nehubaContainer/splashScreen/splashScreen.template.html
src/ui/sharedModules/angularMaterial.module.ts 13 additions, 2 deletions

src/ui/sharedModules/angularMaterial.module.ts

with 321 additions and 52 deletions

0% 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