Diffusion SHRINE MedCo Fork f2b3826d37dd

shrine…
f2b3826d37dd
Actions

Authored by Luke on Jun 27 2017, 17:30.

Description

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

Details

Committed

Luke	Jun 27 2017, 17:30

Pushed

mickmis

Oct 25 2017, 14:31

Parents

R2664:4919444d7835: accidentally removed parent version from pom.xml in shrine-adapter client
R2664:3a0188ae7afd: This commit is for seting up previous queries for custom test cases

Branches

Unknown

Tags

Unknown

Event Timeline

Luke <luke_bakker@hms.harvard.edu> committed R2664:f2b3826d37dd: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Luke <luke_bakker@hms.harvard.edu>).Jun 27 2017, 17:30

Merged Changes

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

Commit	Author	Details	Committed
4919444d7835	bendcarmen	accidentally removed parent version from pom.xml in shrine-adapter client	Jun 19 2017
67e4fa8df611	bendcarmen	Merge of 1.23.3 into 1.23.4.1	Jun 19 2017
fd3845883949	bendcarmen	Potential fix of SHRINE-1954	Jun 12 2017
7948385f5ac3	bendcarmen	Bumped version from 1.23.3.2-SNAPSHOT to 1.23.3.3-SNAPSHOT	Jun 12 2017
a8f55b8b87d0	bendcarmen	Fix of missing scroll bar	Jun 9 2017
f8c02d495fde	bendcarmen	Fix of SHRINE-2033	Jun 8 2017
197162d8fe12	bendcarmen	Fix for SHRINE-2019	Jun 8 2017
b989026a9ad0	bendcarmen	SHRINE-2083	Jun 6 2017
36d65dc81f88	bendcarmen	Fix of SHINE-2083	Jun 6 2017
4edd0bfddeb1	bendcarmen	Roll in the fix of 2047	Jun 6 2017
1bc822146bee	bendcarmen	some debug cleanup	Jun 6 2017
b5656a70525a	bendcarmen	Fix of SHRINE-2061	Jun 5 2017
6d4b0391cff7	bendcarmen	Merge of release/1.23.3 in order to make sure nothing was paved over.	Jun 1 2017
ccbb55214eae	bendcarmen	Merge branch 'release/1.23.3' into develop	Jun 1 2017
b7d872043716	bendcarmen	Potential fix of SHRINE-2061	Jun 1 2017
7e3852574e3a	bendcarmen	Fix of SHRINE-2047	May 31 2017
e2f34881af26	bendcarmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 31 2017
734fd84a9123	bendcarmen	Fix of SHRINE-2408	May 31 2017
e0465830b185	David Walend	Removing the old combined ddl files for SHRINE-2065	May 30 2017
dced80ee359f	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 30 2017
859070ddbf9b	David Walend	Cleaned up some todos. Added shrine's version. SHRINE-2055	May 30 2017
dfc221423718	bendcarmen	Update pom file to 1.23.3.2-SNAPSHOT	May 30 2017
39857013e331	bendcarmen	updated POM from 1.23.3.2-SNAPSHOT to 1.23.4.1-SNAPSHOT	May 30 2017
a8847140d2db	bendcarmen	updated POM from 1.23.3.1-SNAPSHOT to 1.23.3.2-SNAPSHOT	May 30 2017
8cd73ec081c1	bendcarmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 26 2017
e946c7a14cb6	bendcarmen	Addition of pop up for errors	May 26 2017
40692c8cb1ce	David Walend	Found where exceptions went for SHRINE-2055	May 25 2017
10ef0e1b3101	David Walend	Have almost all of an optimistic transaction for SHRINE-2055	May 25 2017
cfead617c8e5	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 23 2017
627efa00cd3a	David Walend	More tests for SHRINE-2055	May 23 2017
5eda0ba2da9c	David Walend	More tests for SHRINE-2055	May 23 2017
70deb41aea58	David Walend	More tests for SHRINE-2055	May 23 2017
c2533be3d052	David Walend	More tests for SHRINE-2055	May 23 2017
4d5377f1f5e9	bendcarmen	Fix of some erroneous logic	May 23 2017
300a533ac3b1	bendcarmen	Utilizing rowCount when calculating when to run update on scroll	May 23 2017
a869ab868eca	David Walend	Some API cleanup for SHRINE-2055	May 23 2017
41a2f264e66d	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 23 2017
c44fe20b9508	David Walend	Existence tests for shrine results for SHRINE-2055	May 23 2017
baee7a5f50a3	bendcarmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 23 2017
b2982d63925d	bendcarmen	Updated infinite scroll hanlder	May 23 2017
0375fbc294b0	David Walend	Almost ready to test low-level db operations for SHRINE-2055	May 23 2017
946405a34df5	David Walend	Some work on the test shrine.conf has to be merged for SHRINE-2057	May 22 2017
71525b6eae73	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 22 2017
a79d8dafc679	David Walend	Some work on the test shrine.conf has to be merged for SHRINE-2057	May 22 2017
b40f08975a64	David Walend	Added row count and offset to ResultsTable for SHRINE-2072	May 22 2017
7c4fe1667ee1	bendcarmen	Prevent scroll from initiating fetch call if another is already running.	May 22 2017
c86a179e712e	bendcarmen	Compiled	May 22 2017
6dda462f775f	bendcarmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	May 22 2017
7f904fb67242	bendcarmen	Test of infinite scroll on dev1	May 22 2017
285654fb0686	David Walend	First pass at database code. Next up is some unit tests, then more code for…	May 19 2017

Changes (175)
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-service/pom.xml
A		adapter/adapter-service/src/main/sql/adapterAuditDB-mssql.ddl
A		adapter/adapter-service/src/main/sql/adapterAuditDB-mysql.ddl
A		adapter/adapter-service/src/main/sql/adapterAuditDB-oracle.ddl
V		adapter/adapter-service/src/main/sql/{mssql.ddl → shrine_query_history-mssql.ddl}
V		adapter/adapter-service/src/main/sql/{mysql.ddl → shrine_query_history-mysql.ddl}
V		adapter/adapter-service/src/main/sql/{oracle.ddl → shrine_query_history-oracle.ddl}
V		adapter/adapter-service/src/main/sql/{shrine_query_history-mssql.ddl ← mssql.ddl}
V		adapter/adapter-service/src/main/sql/{shrine_query_history-mysql.ddl ← mysql.ddl}
V		adapter/adapter-service/src/main/sql/{shrine_query_history-oracle.ddl ← oracle.ddl}
M		adapter/adapter-service/src/test/xml/testI2b2AdminService.xml
M		apps/dashboard-app/pom.xml
M		apps/dashboard-app/src/main/js/package.json
M		apps/dashboard-app/src/main/js/pom.xml
M		apps/dashboard-war/pom.xml
M		apps/meta-app/pom.xml
M		apps/meta-app/src/main/scala/net/shrine/metadata/QepService.scala
M		apps/meta-war/pom.xml
M		apps/proxy/pom.xml
M		apps/proxy/src/test/scala/net/shrine/proxy/DefaultShrineProxyTest.scala
M		apps/shrine-app/pom.xml
M		apps/steward-app/pom.xml
M		apps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
M		apps/steward-app/src/test/resources/test.conf
M		apps/steward-war/pom.xml
M		apps/war/pom.xml
M		commons/auth/pom.xml
M		commons/client/pom.xml
M		commons/client/src/test/scala/net/shrine/client/PosterOntClientTest.scala
M		commons/config/pom.xml
M		commons/config/src/test/resources/shrine-no-optional-configs.conf
M		commons/config/src/test/resources/shrine-some-optional-props.conf
M		commons/config/src/test/resources/shrine.conf
M		commons/crypto/pom.xml
M		commons/data-commons/pom.xml
M		commons/email/pom.xml
A	(dir)	commons/json-store/
A		commons/json-store/pom.xml
A	(dir)	commons/json-store/src/
A	(dir)	commons/json-store/src/main/
A	(dir)	commons/json-store/src/main/resources/
A		commons/json-store/src/main/resources/reference.conf
A	(dir)	commons/json-store/src/main/scala/
A	(dir)	commons/json-store/src/main/scala/net/
A	(dir)	commons/json-store/src/main/scala/net/shrine/
A	(dir)	commons/json-store/src/main/scala/net/shrine/json/
A	(dir)	commons/json-store/src/main/scala/net/shrine/json/store/
A	(dir)	commons/json-store/src/main/scala/net/shrine/json/store/db/
A		commons/json-store/src/main/scala/net/shrine/json/store/db/JsonStoreDatabase.scala
A		commons/json-store/src/main/scala/net/shrine/json/store/db/package.scala
A	(dir)	commons/json-store/src/test/
A	(dir)	commons/json-store/src/test/resources/
A		commons/json-store/src/test/resources/shrine.conf
A	(dir)	commons/json-store/src/test/scala/
A	(dir)	commons/json-store/src/test/scala/net/
A	(dir)	commons/json-store/src/test/scala/net/shrine/
A	(dir)	commons/json-store/src/test/scala/net/shrine/json/
A	(dir)	commons/json-store/src/test/scala/net/shrine/json/store/
A	(dir)	commons/json-store/src/test/scala/net/shrine/json/store/db/
A		commons/json-store/src/test/scala/net/shrine/json/store/db/JsonStoreDatabaseTest.scala
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		commons/util/src/main/scala/net/shrine/problem/DashboardProblemDatabase.scala
M		commons/util/src/test/scala/net/shrine/problem/DashboardProblemDatabaseTest.scala
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/i2b2-1.7/i2b2/oracle/UpdateCells.java
M		install/i2b2-1.7/i2b2/oracle/i2b2.rc
M		install/i2b2-1.7/i2b2/oracle/skel/configure_pm.sql
M		install/i2b2-1.7/i2b2/oracle/skel/ont-ds.xml
M		install/i2b2-1.7/i2b2/postgres/UpdateCells.java
M		install/i2b2-1.7/i2b2/postgres/i2b2.rc
M		install/i2b2-1.7/i2b2/postgres/skel/configure_pm.sql
M		install/i2b2-1.7/i2b2/postgres/skel/ont-ds.xml
M		install/i2b2-1.7/i2b2/sqlserver/UpdateCells.java
M		install/i2b2-1.7/i2b2/sqlserver/i2b2.rc
M		install/i2b2-1.7/i2b2/sqlserver/skel/configure_pm.sql
M		install/i2b2-1.7/i2b2/sqlserver/skel/ont-ds.xml
M		install/i2b2-1.7/shrine/shrine.rc
M		install/i2b2-1.7/shrine/skel/shrine.xml
M		install/i2b2-1.7/shrine/sqlserver/shrine.rc
M		install/pom.xml
D		install/src/main/resources
V		{install → shrine-setup}/src/main/resources/shrine.conf
M		integration/pom.xml
M		integration/src/test/resources/shrine.conf
A		output.txt
M		pom.xml
M		qep/service/pom.xml
M		qep/service/src/main/scala/net/shrine/qep/querydb/QepQueryDb.scala
A	(dir)	shrine-setup/
P		shrine-setup/pom.xml Copied from shrine-webclient/pom.xml
A	(dir)	shrine-setup/src/
A	(dir)	shrine-setup/src/main/
A	(dir)	shrine-setup/src/main/assembly/
A		shrine-setup/src/main/assembly/assembly.xml
A	(dir)	shrine-setup/src/main/resources/
V		{shrine-setup ← install}/src/main/resources/shrine.conf
P		shrine-webclient/pom.xml Copied to shrine-setup/pom.xml
M		shrine-webclient/src/main/js/client/js-i2b2/cells/CRC/CRC_ctrlr_QryStatus.js
M		shrine-webclient/src/main/js/client/js-i2b2/cells/CRC/CRC_view_Graphs.js
M		shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
M		shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.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
P		shrine-webclient/src/main/js/client/js-shrine/dist/common/container.js Copied to multiple locations: shrine-webclient/src/main/js/client/js-shrine/dist/common/tabs.model.js shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.model.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/common/container.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.pub-sub.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.pub-sub.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map
P		shrine-webclient/src/main/js/client/js-shrine/dist/common/tabs.model.js Copied from shrine-webclient/src/main/js/client/js-shrine/dist/common/container.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/common/tabs.model.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/repository/qep.repository.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/repository/qep.repository.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/mailto/mailto.config.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.config.js.map
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar/row-loader.html
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.config.js
M		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.config.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
P		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.model.js Copied from shrine-webclient/src/main/js/client/js-shrine/dist/common/container.js
M		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
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/scroll.service.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/scroll.service.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
M		shrine-webclient/src/main/js/client/js-shrine/src/common/container.js
A		shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.pub-sub.js
M		shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js
A		shrine-webclient/src/main/js/client/js-shrine/src/common/tabs.model.js
M		shrine-webclient/src/main/js/client/js-shrine/src/main.js
M		shrine-webclient/src/main/js/client/js-shrine/src/repository/qep.repository.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.config.js
M		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.js
A		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/loading-bar/row-loader.html
M		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.config.js
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
M		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
A		shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/scroll.service.js
A		shrine-webclient/src/main/js/client/js-shrine/test/unit/query-viewer/scroll.service.spec.js
M		shrine-webclient/src/main/js/server/data/async-queries.js
M		shrine-webclient/src/main/js/server/data/curl-async-queries.js
M		shrine-webclient/src/main/js/server/pm-mock.js
M		tools/adapter-queries-to-qep/pom.xml
M		tools/batch-querier/pom.xml
M		tools/many-qep-queries/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