Homec4science
Diffusion SHRINE MedCo Fork bfcbf9a4e5f5

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

Authored by David Walend <david_walend@hms.harvard.edu> on Oct 19 2016, 18:35.

Description

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

Details

Committed
David Walend <david_walend@hms.harvard.edu>Oct 19 2016, 18:35
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:dae40a77f22a: update of graph with ng-repeat
R2664:4c248b5ac3f6: Got things working via typesafe config and postfix. A step towards SHRINE-1703
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:bfcbf9a4e5f5: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Oct 19 2016, 18:35

Merged Changes

CommitAuthorDetailsCommitted
dae40a77f22aben-carmen
update of graph with ng-repeat 
Oct 19 2016
4d21c3f8a3a3ben-carmen
added mock steward Node API 
Oct 18 2016
3006b6329168ben-carmen
merge of the graphing fixes by Nich see SHRINE-1555 
Oct 18 2016
fe153e4b7bbfben-carmen
Merge branch 'feature/i2b2-merge-to-develop' into develop 
Oct 18 2016
2b34a744dfc3ben-carmen
latest version of Steward App 
Oct 18 2016
f571d119036dBen Carmen
Merge pull request #4 in SHRINE/shrine from ~NWATTANASIN/shrine:feature/i2b2… 
Oct 3 2016
5a20337973ecNich
Graph improvements 
Sep 26 2016

Changes (25)

Path
Aapps/steward-app/src/main/js/.vscode/launch.json
Mapps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.js
Mapps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.tpl.html
Mapps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html
A(dir)apps/steward-app/src/main/js/app/server/
A(dir)apps/steward-app/src/main/js/app/server/data/
Aapps/steward-app/src/main/js/app/server/data/query-history.js
Aapps/steward-app/src/main/js/app/server/data/query-result.js
Aapps/steward-app/src/main/js/app/server/data/steward-data.js
Aapps/steward-app/src/main/js/app/server/data/topic.js
Aapps/steward-app/src/main/js/app/server/package.json
Aapps/steward-app/src/main/js/app/server/query-history-result.js
Aapps/steward-app/src/main/js/app/server/shrine-mock.service.js
Aapps/steward-app/src/main/js/app/server/steward-mock.js
Aapps/steward-app/src/main/js/app/server/steward-mock.service.js
Aapps/steward-app/src/main/js/app/server/test.js
Mapps/steward-app/src/main/js/package.json
Mshrine-webclient/src/main/html/index.html
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_Graphs.js
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/assets/query_report.css
A(dir)tools/js/
A(dir)tools/js/i2b2-msg-parser/
Atools/js/i2b2-msg-parser/SHRINE-1522.xml

R2664:bfcbf9a4e5f5

View Options

apps/steward-app/src/main/js/.vscode/launch.json

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics.controller.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/server/data/query-history.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/data/query-result.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/data/steward-data.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/data/topic.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/package.json

Loading...
View Options

apps/steward-app/src/main/js/app/server/query-history-result.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/shrine-mock.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/steward-mock.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/steward-mock.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/server/test.js

Loading...
View Options

apps/steward-app/src/main/js/package.json

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_Graphs.js

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/assets/query_report.css

Loading...
View Options

tools/js/i2b2-msg-parser/SHRINE-1522.xml

Loading...
c4science · Help