Homec4science
Diffusion SHRINE MedCo Fork b7c362164613

merge of branch feature/sprint2 - which is the branch used for the query viewer
b7c362164613
Actions

Authored by bendcarmen <ben.hms.harvard@gmail.com> on Apr 6 2017, 19:27.

Description

merge of branch feature/sprint2 - which is the branch used for the query viewer

Details

Committed
bendcarmen <ben.hms.harvard@gmail.com>Apr 6 2017, 19:27
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:fb149f6ed4b1: merged develop into feature/sprint2
R2664:5ab58d36d9e2: Updating to 1.23.2.3-SNAPSHOT
Branches
Unknown
Tags
Unknown

Event Timeline

bendcarmen <ben.hms.harvard@gmail.com> committed R2664:b7c362164613: merge of branch feature/sprint2 - which is the branch used for the query viewer (authored by bendcarmen <ben.hms.harvard@gmail.com>).Apr 6 2017, 19:27

Merged Changes

CommitAuthorDetailsCommitted
fb149f6ed4b1bendcarmen
merged develop into feature/sprint2 
Apr 6 2017
80fd54e90ce3bendcarmen
shrine plugin parent child iframe route selection 
Apr 5 2017
0a272ba736f0bendcarmen
Fix of shrine-webclinet assembly.xml settings...wilcard changed from /* to… 
Apr 4 2017
6515747cbc8abendcarmen
latest 
Apr 4 2017
c473207eb24dbendcarmen
latest version 
Apr 3 2017
5b4d0b8b474abendcarmen
optimized space, added alternating row colors 
Mar 31 2017
a7150e8fed60bendcarmen
Style fixes for layout 
Mar 31 2017
7b480f897a49bendcarmen
latest version 
Mar 31 2017
2cf5749cc2f7bendcarmen
latest version optimized for both webkit and gecko 
Mar 29 2017
c9683d9ae20bbendcarmen
restyle of table 
Mar 28 2017
96d3997134debendcarmen
latest version of async query viewer 
Mar 28 2017
3a6532cfc68ebendcarmen
latest 
Mar 27 2017
5fc64f51b408bendcarmen
latest version 
Mar 24 2017

Changes (54)

Path
Mshrine-webclient/src/main/js/client/assets/i2b2-NEW.css
Mshrine-webclient/src/main/js/client/index.html
Mshrine-webclient/src/main/js/client/js-i2b2/cells/CRC/CRC_view_Status.js
Mshrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
Mshrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.js
Mshrine-webclient/src/main/js/client/js-i2b2/hive/hive.ui.js
Mshrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
Mshrine-webclient/src/main/js/client/js-shrine/config.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
Pshrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
Copied to shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
A(dir)shrine-webclient/src/main/js/client/js-shrine/dist/repository/
Ashrine-webclient/src/main/js/client/js-shrine/dist/repository/pm-repository.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/repository/pm-repository.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/shell.html
Mshrine-webclient/src/main/js/client/js-shrine/dist/shell.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/shell.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.html
A(dir)shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js.map
Mshrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
Mshrine-webclient/src/main/js/client/js-shrine/export/config.js
Mshrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
Pshrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
Copied from shrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
Pshrine-webclient/src/main/js/client/js-shrine/export/index.html
Copied to shrine-webclient/src/main/js/client/js-shrine/index.html
Mshrine-webclient/src/main/js/client/js-shrine/gulp/tasks/serve.js
Pshrine-webclient/src/main/js/client/js-shrine/index.html
Copied from shrine-webclient/src/main/js/client/js-shrine/export/index.html
Mshrine-webclient/src/main/js/client/js-shrine/package.json
Mshrine-webclient/src/main/js/client/js-shrine/shrine.plugin.html
A(dir)shrine-webclient/src/main/js/client/js-shrine/src/repository/
Ashrine-webclient/src/main/js/client/js-shrine/src/repository/pm-repository.js
Mshrine-webclient/src/main/js/client/js-shrine/src/shell.html
Mshrine-webclient/src/main/js/client/js-shrine/src/shell.js
Mshrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.html
Mshrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.scss
A(dir)shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.service.js
A(dir)shrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/
Pshrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/query-viewer.spec.js
Copied from apps/dashboard-app/src/test/resources/testhappy/keystore
Mshrine-webclient/src/main/js/gulpfile.js
A(dir)shrine-webclient/src/main/js/server/.vscode/
Ashrine-webclient/src/main/js/server/.vscode/launch.json
A(dir)shrine-webclient/src/main/js/server/data/
A(dir)shrine-webclient/src/main/js/server/data/.vscode/
Ashrine-webclient/src/main/js/server/data/.vscode/launch.json
Ashrine-webclient/src/main/js/server/data/async-queries.js
Ashrine-webclient/src/main/js/server/data/institutions.js
Mshrine-webclient/src/main/js/server/pm-mock.js

R2664:b7c362164613

View Options

shrine-webclient/src/main/js/client/assets/i2b2-NEW.css

Loading...
View Options

shrine-webclient/src/main/js/client/index.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-i2b2/cells/CRC/CRC_view_Status.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-i2b2/hive/hive.ui.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/config.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/repository/pm-repository.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/repository/pm-repository.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/shell.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/shell.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/shell.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/config.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/index.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/serve.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/index.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/package.json

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/shrine.plugin.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/repository/pm-repository.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/shell.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/shell.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.scss

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.service.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/query-viewer.spec.js

Loading...
View Options

shrine-webclient/src/main/js/gulpfile.js

Loading...
View Options

shrine-webclient/src/main/js/server/.vscode/launch.json

Loading...
View Options

shrine-webclient/src/main/js/server/data/.vscode/launch.json

Loading...
View Options

shrine-webclient/src/main/js/server/data/async-queries.js

Loading...
View Options

shrine-webclient/src/main/js/server/data/institutions.js

Loading...
View Options

shrine-webclient/src/main/js/server/pm-mock.js

Loading...
c4science · Help