Homec4science
Diffusion SHRINE MedCo Fork fb149f6ed4b1

merged develop into feature/sprint2
fb149f6ed4b1
Actions

Authored by bendcarmen <ben.hms.harvard@gmail.com> on Apr 6 2017, 19:08.

Description

merged develop into feature/sprint2

Details

Committed
bendcarmen <ben.hms.harvard@gmail.com>Apr 6 2017, 19:08
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:80fd54e90ce3: shrine plugin parent child iframe route selection
R2664:5e7831451f6f: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
Branches
Unknown
Tags
Unknown

Event Timeline

bendcarmen <ben.hms.harvard@gmail.com> committed R2664:fb149f6ed4b1: merged develop into feature/sprint2 (authored by bendcarmen <ben.hms.harvard@gmail.com>).Apr 6 2017, 19:08

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
5e7831451f6fbendcarmen
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Apr 4 2017
4e832185eb7dbendcarmen
added yui files 
Apr 4 2017
de28626f3ff0Ty
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Apr 4 2017
a2c6fe2924dbTy
Testing with different drivers, wrote cross table query and can produce it in… 
Apr 4 2017
e24f5086bad5bendcarmen
latest 
Apr 4 2017
973b92b4eb07David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Apr 4 2017
6284d1140170David Walend
DB changes to support previous queries view (for now) SHRINE-1963 
Apr 4 2017
b4caec7f62b9bendcarmen
added missing yui files 
Apr 4 2017
d4261b2a6a81bendcarmen
attempt to fix yui 
Apr 4 2017
149f51424e4ebendcarmen
adding yui additions 
Apr 4 2017
7f59a2b315f3bendcarmen
addition of missing js-ext/yui files 
Apr 4 2017
f7379e5e7ac5David Walend
Web API for SHRINE-1962. 
Apr 4 2017
b84390cc6d4cbendcarmen
Fix of shrine-webclinet assembly.xml settings...wilcard changed from /* to… 
Apr 4 2017
1dbccea73fd8David Walend
User authorization for SHRINE-1962. 
Apr 4 2017
428879639fe9David Walend
First blush of work to get previous queries from a new service. SHRINE-1962. 
Apr 3 2017
4ef1018c50a5David Walend
Spray subservice in meta-war. Wrapping up SHRINE-1967. 
Mar 31 2017
adcddf91cab0David Walend
Partway to turning tests back on for SHRINE-1967 
Mar 31 2017
b677718266fbDavid Walend
todos for the next block of work 
Mar 30 2017
a438ea77b578Ty
update to StorageDemo 
Mar 29 2017
e0d41f28704cDavid Walend
Merging 1.22.6 
Mar 29 2017
b066b8bb2ef8Ty
fixed typo 
Mar 28 2017
1591a01069abTy
fixed port handling 
Mar 28 2017
b0a84d84f89fTy
fixed toDashboard to work with different downstream ports 
Mar 28 2017
98c5cfd9aeafTy
reports problem if malformatted URL is encountered 
Mar 28 2017
da79564328d4Ty
replaced wildcard with the full path 
Mar 28 2017
205beaf470c6Ty
replaced replace with replaceFirst 
Mar 28 2017
1ddca3452937Ty
better url parsing in dashboard service 
Mar 28 2017
364cdfe1db60Catalyst Bamboo
Merge release branch branches/1.22.5 into master. 
Mar 23 2017
d948fbe6527eCatalyst Bamboo
Update POMs with release version 1.22.6. 
Mar 23 2017
54e5ad4a20d9Catalyst Bamboo
POM version updated to 1.22.6-SNAPSHOT by SChang on build server. (ITEAM-1413) 
Mar 23 2017
0126c15da05fTy
moved database section from dashbaord to problem 
Mar 22 2017
29ad73808458Ty
moved dashboard reference.conf to util 
Mar 22 2017
7885b0e55806Ty
undid the changes to bootstrap 
Mar 22 2017
8e5b3dba2034Ty
Added bower_components to gitignore and removed the bootstrap override from… 
Mar 22 2017
341e070756c3David Walend
Review comments for SHRINE-1949 
Mar 21 2017
bcff97d13627David Walend
Removing dead code, and permitting expired certs to support SHRINE-1949 
Mar 20 2017
8cf5d9070eb0David Walend
Merge remote-tracking branch 'origin/patch/1.22.2.4.1' into branches/1.22.5 
Mar 20 2017
cd481d9b795fDavid Walend
Updating the pom.xml to use our standard numbering before moving to QA 
Mar 20 2017
0c7883ace046Ty
updated npm and node versions 
Mar 15 2017
81e7d626b584Ty
update to 1.23.2.2 
Mar 15 2017
70210fb82f2bTy
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Mar 15 2017
275baa8d440cDavid Walend
Added a response and stopped printing shrine.conf's contents. 
Mar 14 2017
61a6bbfc948dDavid Walend
pom.xml updates 
Mar 13 2017
fa452e853b15David Walend
Put together a tool to test https connections on the command line 
Mar 13 2017
8b75dfb7c897Ty
possible update to keystore 
Mar 1 2017
974499085847Ty
storage cleanup 
Mar 1 2017
63a16bee7395Ty
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Mar 1 2017
a3138423e64aTy
testing/formatting 
Feb 28 2017
45ca561853c6Ty
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Feb 28 2017
bb11e9e50d73Ty
spray storage demo 
Feb 28 2017

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.
c4science · Help