Diffusion SHRINE MedCo Fork 60c422155cf0

Merge release branch release/1.22.2.4 into master.
60c422155cf0
Actions

Authored by Catalyst Bamboo <catalyst-iteam@hms.harvard.edu> on Dec 21 2016, 23:16.

Description

Merge release branch release/1.22.2.4 into master.

Details

Committed

Catalyst Bamboo <catalyst-iteam@hms.harvard.edu>

Dec 21 2016, 23:16

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:5f1835cc9118: Update POMs with release version 1.22.2.4.
R2664:dbd131381033: Merge release branch release/1.22.2 into master.

Branches

Unknown

Tags

Unknown

References

tag: 1.22.2.4

Event Timeline

Catalyst Bamboo <catalyst-iteam@hms.harvard.edu> committed R2664:60c422155cf0: Merge release branch release/1.22.2.4 into master. (authored by Catalyst Bamboo <catalyst-iteam@hms.harvard.edu>).Dec 21 2016, 23:16

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
5f1835cc9118	Catalyst Bamboo	Update POMs with release version 1.22.2.4.	Dec 21 2016
d790946550b8	Ty	Revert "resetting to 1.22.2.5"	Dec 20 2016
b5bb2ab35756	Ty	resetting to 1.22.2.5	Dec 20 2016
e55eb140216e	Ty	1.22.2.4 w/ help files	Dec 20 2016
14b581de4f77	ben-carmen	Update of latest shrine-webclient help guide	Dec 20 2016
6a34ac3fe19d	ben-carmen	Update of latest Steward Help File	Dec 20 2016
39b15b5d2b72	Ty	grabbing query from context uri	Dec 19 2016
b61761ba2f72	Ty	further debugging	Dec 19 2016
420141663367	Ty	adding debug statements	Dec 19 2016
5933d9d32976	Ty	added queries to fowarded paths	Dec 19 2016
fe1be87bc825	Ty	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 16 2016
29e0a2a9db4e	Ty	fixed it so you can't connect to remote dashboards with an incorrect keystore	Dec 16 2016
ec5f2f11f51f	Ty	date fix... again	Dec 16 2016
e448ae847237	ben-carmen	SHRINE-1755	Dec 14 2016
9d741e380d18	ben-carmen	SHRINE-1755	Dec 14 2016
a86fb58f7a54	Ty	utc month fix	Dec 14 2016
9c81e55d49a6	Ty	version bump	Dec 14 2016
1a5978a10f95	ben-carmen	update of term usage label	Dec 14 2016
0b03152f7d45	ben-carmen	fix of bar graphs in IE	Dec 14 2016
a6d473cd5bd1	ben-carmen	code cleanup	Dec 14 2016
495b90e2b0bc	ben-carmen	code cleanup	Dec 14 2016
493aec5b995e	Ty	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 14 2016
02fafa3d3f56	Ty	removed loading wheel for just timeout error	Dec 14 2016
2c441d012775	ben-carmen	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 14 2016
c833d0e254d8	ben-carmen	SHRINE-1838	Dec 14 2016
fe73d191f184	Ty	added a loading screen to summary	Dec 13 2016
532f2e0ea45d	Ty	fix for safari version 9	Dec 13 2016
1d6ccd1e522c	Ty	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 13 2016
12ace3debfb4	Ty	removed useless import	Dec 13 2016
a6fa22f8787f	ben-carmen	fix of mystery IE issue attempt #2	Dec 13 2016
f033e2760742	Ty	Merge branch 'backwards-check' into 1.22.2.x	Dec 13 2016
f65b498e1100	Ty	date fix	Dec 13 2016
d924ba8c5bfb	ben-carmen	Fix of mysterious IE parsing issue	Dec 13 2016
992ec5567e35	Ty	update to 1.22.2.4	Dec 12 2016
4f52d2b1c870	Ty	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 12 2016
eb8b66546529	Ty	minor commenting/formatting	Dec 12 2016
f627c4ef3ef7	ben-carmen	refinement of date range	Dec 12 2016
f700d59eb571	ben-carmen	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 12 2016
5bd76f3ee426	ben-carmen	Fix for SHRINE-1833	Dec 12 2016
acc750dfec32	David Walend	Now creates a problem for a missing database for SHRINE-1824	Dec 12 2016
981c6a37b8c2	David Walend	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 12 2016
8b97ba02e01e	David Walend	Attempt to fix SHRINE-1824 - better error handling if the DSA email audit table…	Dec 12 2016
84f4225330ff	David Walend	Missing semicolons	Dec 12 2016
102ae7da8213	ben-carmen	Fix for SHRINE-1588	Dec 9 2016
b75812d58e21	ben-carmen	fix of clearUsers method missing	Dec 9 2016
c04a8c3a7324	Ty	home-button summary page fix	Dec 8 2016
d999e1de604b	Ty	shrine-tools-module readded angular-loading-bar	Dec 8 2016
7b2041d0ffee	ben-carmen	Added fix to truncate username in graphing	Dec 8 2016
5621ad765682	ben-carmen	fix of topic dropdown styles	Dec 7 2016
32f56ae07837	ben-carmen	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Dec 7 2016

Changes (128)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			adapter/adapter-api/pom.xml
	M			adapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala
	M			adapter/adapter-service/pom.xml
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/service/AdapterResource.scala
	M			adapter/adapter-service/src/main/sql/mssql.ddl
	M			adapter/adapter-service/src/main/sql/mysql.ddl
	M			adapter/adapter-service/src/main/sql/oracle.ddl
	A			adapter/adapter-service/src/main/sql/oracle_flag_message_to_clob.ddl
	M			apps/dashboard-app/pom.xml
	M			apps/dashboard-app/src/main/js/index.html
	M			apps/dashboard-app/src/main/js/pom.xml
	M			apps/dashboard-app/src/main/js/src/app/common/authentication/authentication.service.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/diagnostic.model.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/sidebar.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/sidebar.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/adapter.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/hub.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/header/header.js
	M			apps/dashboard-app/src/main/js/src/app/header/user-status.js
	M			apps/dashboard-app/src/main/js/src/app/shrine-tools.module.js
	M			apps/dashboard-app/src/main/js/src/assets/css/shrine.css
	M			apps/dashboard-app/src/main/js/test/admin/status/hub.json
	M			apps/dashboard-app/src/main/js/test/admin/status/i2b2.json
	M			apps/dashboard-app/src/test/resources/teststatus/hub
	M			apps/dashboard-app/src/test/resources/teststatus/i2b2
	M			apps/dashboard-war/pom.xml
	M			apps/meta-app/pom.xml
	M			apps/meta-app/src/main/scala/net/shrine/metadata/MetaDataService.scala
	M			apps/meta-war/pom.xml
	M			apps/proxy/pom.xml
	M			apps/shrine-app/pom.xml
	M			apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
	M			apps/shrine-app/src/main/scala/net/shrine/wiring/ShrineOrchestrator.scala
	M			apps/shrine-app/src/test/resources/shrine.conf
	M			apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
	M			apps/shrine-app/src/test/scala/net/shrine/wiring/NodeHandleTest.scala
	M			apps/steward-app/pom.xml
	M			apps/steward-app/src/main/js/app/assets/css/shrine.css
	M			apps/steward-app/src/main/js/app/assets/css/topic-dropdown.css
	M			apps/steward-app/src/main/js/app/assets/img/SHRINE-Data-Steward-Help.pdf
	M			apps/steward-app/src/main/js/app/client/common/date.service.js
	M			apps/steward-app/src/main/js/app/client/directives/history.tpl.html
	D			apps/steward-app/src/main/js/app/client/statistics/query-counts-table.tpl.html
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/ontology-term.factory.js
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/ontology-term.service.js
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/query-digest.tpl.html
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/term.service.js
	M			apps/steward-app/src/main/js/app/client/statistics/query-digest/term.tpl.html
	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/query-digest/topic-dropdown.tpl.html
	D			apps/steward-app/src/main/js/app/client/statistics/query-topic-status-table.tpl.html
	M			apps/steward-app/src/main/js/app/client/statistics/statistics-graph/bar.tpl.html
	M			apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.service.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.service.spec.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.tpl.html
	M			apps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics.model.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics.model.spec.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html
	M			apps/steward-app/src/main/js/app/sass/topic-dropdown.scss
	M			apps/steward-app/src/main/js/bower.json
	M			apps/steward-app/src/main/js/bower_components/angular/.bower.json
	M			apps/steward-app/src/main/scala/net/shrine/steward/Boot.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/StewardService.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/db/StewardDatabase.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/email/AuditEmailer.scala
	V			apps/steward-app/src/main/sql/{mssql.ddl ← sqlserver.ddl}
	V			apps/steward-app/src/main/sql/{sqlserver.ddl → mssql.ddl}
	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/crypto/src/main/scala/net/shrine/crypto/SigningCertStrategy.scala
	M			commons/crypto/src/test/scala/net/shrine/crypto/DownStreamCertCollectionTest.scala
	M			commons/crypto/src/test/scala/net/shrine/crypto/NewTestKeyStore.scala
	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/protocol/src/main/scala/net/shrine/i2b2/protocol/pm/HiveConfig.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/AggregatedReadTranslatedQueryDefinitionResponse.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/NonI2b2ShrineResponse.scala
	M			commons/test-commons/pom.xml
	M			commons/util/pom.xml
	M			commons/util/src/test/resources/shrine.conf
	M			hms-support/hms-core/pom.xml
	M			hms-support/pom.xml
	M			hub/broadcaster-aggregator/pom.xml
	M			hub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/BroadcastAndAggregationService.scala
	M			hub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/HubBroadcastAndAggregationService.scala
	M			hub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/SigningBroadcastAndAggregationService.scala
	V			hub/broadcaster-aggregator/src/main/sql/{hub.sql → mysql.ddl}
	A			hub/broadcaster-aggregator/src/main/sql/mssql.ddl
	V			hub/broadcaster-aggregator/src/main/sql/{mysql.ddl ← hub.sql}
	A			hub/broadcaster-aggregator/src/main/sql/oracle.ddl
	M			hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/BroadcastAndAggregationServiceTest.scala
	M			hub/broadcaster-service/pom.xml
	M			install/pom.xml
	M			install/src/main/resources/shrine.conf
	M			integration/pom.xml
	M			pom.xml
	M			qep/service/pom.xml
	M			shrine-webclient/pom.xml
	M			shrine-webclient/src/main/html/help/pdf/shrine-client-guide.pdf
	M			shrine-webclient/src/main/html/i2b2_config_data.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryStatus.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_sdx_QI.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_DownloadData.js
	M			shrine-webclient/src/main/html/js-i2b2/hive/hive_helpers.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/scanner/src/test/scala/net/shrine/utilities/scanner/BroadcastServiceScannerClientTest.scala
	M			tools/utility-commons/pom.xml