Homec4science

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

Authored by Benjamin Carmen <ben.hms.harvard@gmail.com> on Aug 10 2016, 17:52.

Description

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

Event Timeline

Benjamin Carmen <ben.hms.harvard@gmail.com> committed R2664:40d848e14e62: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Benjamin Carmen <ben.hms.harvard@gmail.com>).Aug 10 2016, 17:52

Merged Changes

CommitAuthorDetailsCommitted
522cc8342e5bTy
removed local jar dependency 
Aug 9 2016
89bfeb73afc2Ty
typos 
Aug 9 2016
39b2353a8b06Ty
reset dashboard.conf 
Aug 9 2016
cf3d5ece4070Ty
removed some unnecessary debugging 
Aug 9 2016
c4568fcad821Ty
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Aug 9 2016
d1debf20c5d4Ty
changes made to problems while doing repl exploring 
Aug 9 2016
10f923c44c67David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Aug 8 2016
913dc186fe31David Walend
Rename net.shrine.protocol.Failure to FailureResult 
Aug 8 2016
c58f681ff91fTy
Printing database connection info 
Aug 8 2016
099864950139Ty
Testing whether data source is different than config 
Aug 8 2016
bbe54bbc069eTy
debugging objectForName 
Aug 8 2016
5559b91485e7Ty
Detailed debugging of whether a problem is successfully inserted into the… 
Aug 8 2016
596883403cc0Ty
Undid purposeful breaking of problems tab 
Aug 8 2016
449d9615d7e6Ty
Are these commits being seen by deploy? 
Aug 8 2016
c0deab197cdaTy
Temporarily changing backend call to force return status name 
Aug 8 2016
b49cd38e3b54Ty
Testing a change to reference.conf 
Aug 8 2016
945aaa9034e2Ty
Trying to get slick class printed 
Aug 8 2016
bc86176daecdTy
moved debug line 
Aug 8 2016
cf8a5aef819cTy
Merge branch 'release/1.22.0' of https://open.med.harvard. 
Aug 5 2016
689b31483f15Ty
Printing slick class driver name 
Aug 5 2016
c7205d2883deBenjamin Carmen
fix of sorting arrow indicators 
Aug 5 2016
c4e0211ab249Ty
Merge branch 'release/1.22.0' of https://open.med.harvard. 
Aug 5 2016
30a98225eab6Benjamin Carmen
fix of enabled status drop down when viewing a query detail SHRINE-1607 
Aug 5 2016
253085a33e6fBenjamin Carmen
fix for enabled query history button when status is pending SHRINE-1606 
Aug 5 2016
0fa819151389Benjamin Carmen
Merge branch 'release/1.22.0' of https://open.med.harvard. 
Aug 5 2016
dd3b550ddeceBenjamin Carmen
fix of unwanted horizontal scrollbar SHRINE-1407 
Aug 5 2016
94cab896b754Ty
merge conflict with reference.conf in dashboard-app: 
Aug 5 2016
7ebc75fa1a6aTy
Merge branch 'release/1.22.0' of https://open.med.harvard. 
Aug 5 2016
11891ae9e8a6Ty
reset mysql.ddl, added varchar(max) to mssql.ddl, added clob to oracle.ddl 
Aug 5 2016
2ba05d4e5027Benjamin Carmen
fix for capitalized username issue SHRINE-1247 
Aug 5 2016
64fd8b13ed34Benjamin Carmen
fix for incorrect error message issue SHRINE-1603 
Aug 5 2016
c68b3dbe032dBenjamin Carmen
fix of missing role in drop down SHRINE-1596 
Aug 5 2016
e43431da9eaeBenjamin Carmen
fix of missing help link SHRINE-1597 
Aug 5 2016
e3f2063c5ba8Benjamin Carmen
Merge branch 'release/1.22.0' of https://open.med.harvard. 
Aug 5 2016
b592d2fda7a4Benjamin Carmen
fix of login centering issue SHRINE-1598 
Aug 5 2016
28587f4ad72fTy
Merge remote-tracking branch 'origin/release/1.22.0' into release/1.22.0 
Aug 5 2016
ed6bf09e2626Ty
Further testing of ddl hypothesis 
Aug 5 2016
f51020e527e9Benjamin Carmen
fix of mysterious redirect on logout SHRINE-1602 
Aug 5 2016
42f903655edfTy
Further testing mysql.ddl hypothesis 
Aug 5 2016
eb212a5cf6f9Ty
testing to see if oracle/mssql are using mysql.ddl 
Aug 5 2016
d197251b57b6Ty
rewrote problem database query to avoid using a join 
Aug 4 2016
ba51bbffd9beTy
logging 
Aug 4 2016
396683b4a1d9Benjamin Carmen
typo causing blank error popup 
Aug 4 2016
0cb0429c62c1Ty
changed data-commons and dashboard-app reference.conf to use adapterAuditDB 
Aug 4 2016
4bad29121e15Ty
changed data-commons and dashboard-app reference.conf to use adapterAuditDB 
Aug 4 2016
cb319e94825eTy
Undoing the Undo of the pom.xml (also known as a 360 degree turn) 
Aug 4 2016
f4edb13f7c0cTy
undid pom.xml change 
Aug 4 2016