Homec4science
Diffusion SHRINE MedCo Fork 4cc83d16fc7f

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
4cc83d16fc7f
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Apr 12 2017, 21:12.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed
Ty <Ty_Coghlan@hms.harvard.edu>Apr 12 2017, 21:12
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:f3b6e3f1fda5: Query Viewer code is added
R2664:7ac952d2b9b5: HTTPS clients will now fall back to java installed CA Certs
Branches
Unknown
Tags
Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:4cc83d16fc7f: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Apr 12 2017, 21:12

Merged Changes

CommitAuthorDetailsCommitted
f3b6e3f1fda5bendcarmen
Query Viewer code is added 
Apr 12 2017
d9a18a675f34David Hummel
Revert test <distributionManagement/> section. (ITEAM-390) 
Apr 11 2017

Changes (33)

Path
Mpom.xml
Mshrine-webclient/src/main/js/client/js-i2b2/cells/PM/PM_ctrlr.js
Mshrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
A(dir)shrine-webclient/src/main/js/client/js-shrine/.vscode/
Pshrine-webclient/src/main/js/client/js-shrine/.vscode/launch.json
Copied from shrine-webclient/src/main/js/server/data/.vscode/launch.json
Mshrine-webclient/src/main/js/client/js-shrine/config.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
Pshrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
Copied from shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/main.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/main.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js.map
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-style.converter.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-style.converter.js.map
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-value.converter.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-value.converter.js.map
Mshrine-webclient/src/main/js/client/js-shrine/export/config.js
Mshrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
Mshrine-webclient/src/main/js/client/js-shrine/src/main.js
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.service.js
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-style.converter.js
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-value.converter.js
Ashrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/async-queries-mock.js
Ashrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/query-viewer.service.spec.js
Mshrine-webclient/src/main/js/server/.vscode/launch.json
Ashrine-webclient/src/main/js/server/data/curl-async-queries.js
Mshrine-webclient/src/main/js/server/pm-mock.js
Ashrine-webclient/src/main/js/server/test.js

R2664:4cc83d16fc7f

View Options

pom.xml

Loading...
View Options

shrine-webclient/src/main/js/client/js-i2b2/cells/PM/PM_ctrlr.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-shrine/.vscode/launch.json

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/main.js

Loading...
View Options

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

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/dist/views/query-viewer/result-style.converter.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

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/src/main.js

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.service.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/async-queries-mock.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/js/server/test.js

Loading...
c4science · Help