Homec4science
Diffusion SHRINE MedCo Fork baee7a5f50a3

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

Authored by bendcarmen <ben.hms.harvard@gmail.com> on May 23 2017, 17:40.

Description

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

Details

Committed
bendcarmen <ben.hms.harvard@gmail.com>May 23 2017, 17:40
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:b2982d63925d: Updated infinite scroll hanlder
R2664:0375fbc294b0: Almost ready to test low-level db operations for SHRINE-2055
Branches
Unknown
Tags
Unknown

Event Timeline

bendcarmen <ben.hms.harvard@gmail.com> committed R2664:baee7a5f50a3: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by bendcarmen <ben.hms.harvard@gmail.com>).May 23 2017, 17:40

Merged Changes

CommitAuthorDetailsCommitted
0375fbc294b0David Walend
Almost ready to test low-level db operations for SHRINE-2055 
May 23 2017
946405a34df5David Walend
Some work on the test shrine.conf has to be merged for SHRINE-2057 
May 22 2017
71525b6eae73David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
May 22 2017
a79d8dafc679David Walend
Some work on the test shrine.conf has to be merged for SHRINE-2057 
May 22 2017
b40f08975a64David Walend
Added row count and offset to ResultsTable for SHRINE-2072 
May 22 2017

Changes (13)

Path
Mapps/meta-app/src/main/scala/net/shrine/metadata/QepService.scala
Mcommons/json-store/src/main/scala/net/shrine/json/store/db/JsonStoreDatabase.scala
A(dir)commons/json-store/src/test/
A(dir)commons/json-store/src/test/resources/
Pcommons/json-store/src/test/resources/shrine.conf
Copied from commons/util/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/
Pcommons/json-store/src/test/scala/net/shrine/json/store/db/JsonStoreDatabaseTest.scala
Copied from commons/util/src/test/scala/net/shrine/problem/DashboardProblemDatabaseTest.scala
Mqep/service/src/main/scala/net/shrine/qep/querydb/QepQueryDb.scala

R2664:baee7a5f50a3

View Options

apps/meta-app/src/main/scala/net/shrine/metadata/QepService.scala

Loading...
View Options

commons/json-store/src/main/scala/net/shrine/json/store/db/JsonStoreDatabase.scala

Loading...
View Options

commons/json-store/src/test/resources/shrine.conf

Loading...
View Options

commons/json-store/src/test/scala/net/shrine/json/store/db/JsonStoreDatabaseTest.scala

Loading...
View Options

qep/service/src/main/scala/net/shrine/qep/querydb/QepQueryDb.scala

Loading...
c4science · Help