Merge branch 'staging' into pre-2.3-master-to-staging
No related branches found
No related tags found
Showing
- .travis.yml 44 additions, 6 deletions.travis.yml
- Dockerfile 1 addition, 1 deletionDockerfile
- deploy/csp/index.js 2 additions, 4 deletionsdeploy/csp/index.js
- deploy/datasets/testData/mni152JuBrain.js 4 additions, 4 deletionsdeploy/datasets/testData/mni152JuBrain.js
- deploy/datasets/util.js 1 addition, 1 deletiondeploy/datasets/util.js
- docs/releases/v2.2.6.md 14 additions, 0 deletionsdocs/releases/v2.2.6.md
- mkdocs.yml 1 addition, 0 deletionsmkdocs.yml
- package.json 1 addition, 1 deletionpackage.json
- release.sh 70 additions, 0 deletionsrelease.sh
- src/glue.spec.ts 1 addition, 2 deletionssrc/glue.spec.ts
- src/glue.ts 9 additions, 6 deletionssrc/glue.ts
- src/index.html 1 addition, 1 deletionsrc/index.html
- src/res/ext/MNI152.json 9904 additions, 5419 deletionssrc/res/ext/MNI152.json
- src/res/ext/MNI152NehubaConfig.json 132 additions, 2 deletionssrc/res/ext/MNI152NehubaConfig.json
- src/res/ext/colin.json 9996 additions, 5957 deletionssrc/res/ext/colin.json
- src/res/ext/colinNehubaConfig.json 13 additions, 7 deletionssrc/res/ext/colinNehubaConfig.json
- src/services/effect/effect.spec.ts 5 additions, 27 deletionssrc/services/effect/effect.spec.ts
- src/services/state/uiState.store.helper.ts 1 addition, 0 deletionssrc/services/state/uiState.store.helper.ts
- src/ui/databrowserModule/preview/previewComponentWrapper/previewCW.component.ts 3 additions, 0 deletions...le/preview/previewComponentWrapper/previewCW.component.ts
- src/ui/nehubaContainer/splashScreen/splashScreen.template.html 1 addition, 1 deletion...i/nehubaContainer/splashScreen/splashScreen.template.html
Please register or sign in to comment