Diffusion SHRINE MedCo Fork c874624fddd3

pulling changes from 1.22.2.x
c874624fddd3
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Dec 5 2016, 23:05.

Description

pulling changes from 1.22.2.x

Details

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Dec 5 2016, 23:05

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:37e1a9528a2d: Merge branch '1.22.2.x' into develop
R2664:8c9a4582a17e: replicated fix for home button

Branches

Unknown

Tags

Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:c874624fddd3: pulling changes from 1.22.2.x (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Dec 5 2016, 23:05

Merged Changes

Commit	Author	Details	Committed
8c9a4582a17e	Ty	replicated fix for home button	Dec 5 2016
b70bd14b7567	Ty	trying to refresh on hitting the home button for a remote dashboard	Dec 5 2016
e988dd001ed1	Ty	changed hub to report self	Dec 5 2016
d0bdbcc446c8	Ty	merging versions	Dec 5 2016
d2995dc3ac57	Ty	version fix	Dec 5 2016
95e574f3d3c3	Ty	removed clear button from datepicker	Dec 5 2016
a117d8e3ad5b	Ty	date format unification	Dec 5 2016
7f8d27aa87a8	David Walend	More logging for SHRINE-1811 - email not sending	Dec 5 2016
0173ff79ccef	ben-carmen	Fix for SHRINE-1792	Dec 5 2016
578e3d116863	ben-carmen	added default values for obfuscation if values do not exist in the config	Dec 5 2016
f196e0a67cc6	ben-carmen	added default values for obfuscation if values do not exist in the config	Dec 5 2016
7fb138394090	David Hummel	Set POM versions to 1.22.2.3-SNAPSHOT.	Dec 5 2016
2eec055e71ad	Ty	typo fix	Dec 2 2016
0298997abee6	Ty	updated verison to 1.22.2.3-SNAPSHOT	Dec 2 2016
3ad2a7563fb2	ben-carmen	fix of isMinObfuscation method	Dec 2 2016
493280b5dd5b	ben-carmen	missed a return statement in a method ... duh!	Dec 2 2016
a0d2b99bf7cf	ben-carmen	fix of 2 missing parenthesis bugs	Dec 2 2016
bd8d532e9d9c	ben-carmen	replaced all references to +-3 and ±3 with the configured obfuscation…	Dec 1 2016
09559fa60c88	ben-carmen	Fix of SHRINE-1689 Change the hard-coded +/-3 to +/-10 in the web client, the…	Dec 1 2016
a6a3837e9813	ben-carmen	Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 29 2016
7777b08aabcb	ben-carmen	Enhancement per SHRINE-1792	Nov 29 2016
1f61b651bb4e	David Walend	New exception for when a hub receives plain text from an adapter instead of XML.	Nov 29 2016
bec2d81dc0f2	ben-carmen	fix of unit test	Nov 29 2016
dbd97490c1df	ben-carmen	SHRINE-1792 fix of DSA Statistics: Query digest window - incorrect query count	Nov 28 2016
48d9bd31e508	ben-carmen	Fix of topic ddropdown issue SHRINE-1788	Nov 28 2016

Changes (30)

				Path
	M			adapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala
	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/diagnostic/diagnostic.model.js
	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/keystore.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js
	M			apps/dashboard-app/src/main/js/src/app/header/header.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/test/resources/teststatus/hub
	M			apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
	M			apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
	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/term.service.js
	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.model.js
	M			apps/steward-app/src/main/js/app/client/statistics/statistics.model.spec.js
	M			apps/steward-app/src/main/scala/net/shrine/steward/Boot.scala
	M			apps/steward-app/src/main/scala/net/shrine/steward/email/AuditEmailer.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/AggregatedReadTranslatedQueryDefinitionResponse.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/NonI2b2ShrineResponse.scala
	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