Diffusion SHRINE MedCo Fork 1b259b5cce91

merge of branches/1.22.3-SNAPSHOT
1b259b5cce91
Actions

Authored by bendcarmen <ben.hms.harvard@gmail.com> on May 1 2017, 18:24.

Description

merge of branches/1.22.3-SNAPSHOT

Details

Committed

bendcarmen <ben.hms.harvard@gmail.com>

May 1 2017, 18:24

Pushed

mickmis

Oct 25 2017, 14:31

Parents

R2664:638adaac8ce5: Fix of SHRINE-1954
R2664:116ed0a57a10: Some cleanup of command line output for SHRINE-2021

Branches

Unknown

Tags

Unknown

Event Timeline

bendcarmen <ben.hms.harvard@gmail.com> committed R2664:1b259b5cce91: merge of branches/1.22.3-SNAPSHOT (authored by bendcarmen <ben.hms.harvard@gmail.com>).May 1 2017, 18:24

Merged Changes

Commit	Author	Details	Committed
638adaac8ce5	bendcarmen	Fix of SHRINE-1954	Apr 27 2017
e803a1743c9a	bendcarmen	fix of SHRINE-1875	Apr 27 2017
171c27b39861	bendcarmen	Fix of SHRINE-2012	Apr 25 2017
bc60ca68b251	bendcarmen	some optimization	Apr 25 2017
397cca580e38	bendcarmen	Fix of SHRINE-1952	Apr 24 2017
a6759ea2bb92	bendcarmen	fix of styles for max vs. min query viewer	Apr 21 2017
b108060ca333	bendcarmen	latest css changes	Apr 21 2017
4b0f7df8b91f	bendcarmen	Fix of max and min styles for query viewer	Apr 20 2017
6307592ffd73	bendcarmen	addition of i2b2 API service, subscribed to resize and history refresh events	Apr 20 2017
cf3e80133137	bendcarmen	Fix of SHRINE-1996	Apr 18 2017
14df74d37aa9	bendcarmen	Fix of SHRINE-1992	Apr 18 2017
5942067c2e92	David Walend	Created the 1.23.2 branch for QA. Moved the pom.xml to 1.23.2.4	Apr 17 2017

Changes (80)

		Path
M		adapter/adapter-api/pom.xml
M		adapter/adapter-service/pom.xml
M		apps/dashboard-app/pom.xml
M		apps/dashboard-app/src/main/js/pom.xml
M		apps/dashboard-war/pom.xml
M		apps/meta-app/pom.xml
M		apps/meta-war/pom.xml
M		apps/proxy/pom.xml
M		apps/shrine-app/pom.xml
M		apps/steward-app/pom.xml
M		apps/steward-app/src/main/js/app/assets/css/core.css
M		apps/steward-app/src/main/js/app/assets/css/shrine.css
M		apps/steward-app/src/main/js/app/client/statistics/query-digest/topic-dropdown.js
M		apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.js
M		apps/steward-app/src/main/js/app/client/steward.controller.js
M		apps/steward-app/src/main/js/app/client/topics/topics.controller.js
M		apps/steward-app/src/main/js/app/mock/steward-mock.service.js
M		apps/steward-app/src/main/js/app/sass/core.scss
M		apps/steward-app/src/main/js/index.html
M		apps/steward-war/pom.xml
M		apps/war/pom.xml
M		commons/auth/pom.xml
M		commons/client/pom.xml
M		commons/config/pom.xml
M		commons/crypto/pom.xml
M		commons/data-commons/pom.xml
M		commons/email/pom.xml
M		commons/ont-support/pom.xml
M		commons/protocol-query/pom.xml
M		commons/protocol/pom.xml
M		commons/test-commons/pom.xml
M		commons/util/pom.xml
M		hms-support/hms-core/pom.xml
M		hms-support/pom.xml
M		hub/broadcaster-aggregator/pom.xml
M		hub/broadcaster-service/pom.xml
M		install/pom.xml
M		integration/pom.xml
M		pom.xml
M		qep/service/pom.xml
M		shrine-webclient/pom.xml
M		shrine-webclient/src/main/js/client/js-i2b2/cells/CRC/CRC_ctrlr_Dates.js
M		shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
M		shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
M		shrine-webclient/src/main/js/client/js-shrine/config.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/dist/common/
A		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/shell.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/shell.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.model.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.model.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.service.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-value.converter.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-value.converter.js.map
M		shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
M		shrine-webclient/src/main/js/client/js-shrine/export/config.js
M		shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/src/common/
A		shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js
M		shrine-webclient/src/main/js/client/js-shrine/src/shell.js
M		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.scss
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
A		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.model.js
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.service.js
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-value.converter.js
M		tools/adapter-queries-to-qep/pom.xml
M		tools/batch-querier/pom.xml
M		tools/mapping-automation/pom.xml
M		tools/monitor/pom.xml
M		tools/pom.xml
M		tools/scanner/pom.xml
M		tools/utility-commons/pom.xml