Diffusion SHRINE MedCo Fork (feature/i2b2-merge-to-develop) History

i2b2-merge-to…acd0aaa11bf18ffad752533…

Aug 2 2016

fixed problem serialization to serialize as object instead of string
acd0aaa11bf1
·Ty on Aug 2 2016, 22:29.

Aug 1 2016

attempts at fixing intialization error
cb07c39a90fa
·Ty on Aug 1 2016, 15:49.

Jul 29 2016

trying to resolve conflict
b72388e695f8
·Benjamin Carmen on Jul 29 2016, 17:58.
whitespace causing merge conflict
70223dbe04d2
·Benjamin Carmen on Jul 29 2016, 17:53.

Jun 6 2016

Minor tweak for SHRINE-1497
46d471025be2
·David Walend on Jun 6 2016, 21:03.

May 26 2016

Split out the hub json for the status service for SHRINE-1495
e8536309eb02
·David Walend on May 26 2016, 22:06.
Reworked how the dashboard gets optional parts for SHRINE-1521
723ee0f65130
·David Walend on May 26 2016, 17:12.

May 25 2016

Added test and some cleanup for SHRINE-1520
2e901403b86c
·David Walend on May 25 2016, 22:34.
A try at replacing happy with status for getting a summary for SHRINE-1520
9dc9a949d364
·David Walend on May 25 2016, 22:10.
More cleanup for SHRINE-1495
2e1505a18afc
·David Walend on May 25 2016, 17:25.

May 24 2016

More cleanup for SHRINE-1495
de257c0aaede
·David Walend on May 24 2016, 22:10.
More cleanup for SHRINE-1495
691529b5f344
·David Walend on May 24 2016, 21:58.

May 23 2016

Start of SHRINE-1495
141f192c69f0
·David Walend on May 23 2016, 18:33.

Apr 4 2016

Hopefully a fix for our incompatibility with bower 1.7.8
48ce9ac02111
·David Walend on Apr 4 2016, 22:33.

Mar 24 2016

Merge branch 'release/1.21.0' into develop
a7c81c84039a
·David Walend on Mar 24 2016, 14:40.

Mar 23 2016

Possible fix for SHRINE-1374 - happy's xml should come back with an empty…
d0fe8abcc120
·tag: old-shrine-webclient
·David Walend on Mar 23 2016, 20:46.
Logging to figure out SHRINE-1374
3b88331b487c
·David Walend on Mar 23 2016, 19:49.
Possible fix for SHRINE-1325 - URL value for the network hub box in the QEP…
495e4ea71f9b
·David Walend on Mar 23 2016, 17:06.

Mar 22 2016

Merge branch 'release/1.21.0' into develop
b44ba66753e1
·David Walend on Mar 22 2016, 14:25.

Mar 21 2016

Attempted fix of SHRINE-1383 . Adding a field to the wierdly limited shrine…
6876058f4207
·David Walend on Mar 21 2016, 21:18.
Attempt to fix SHRINE-1383 , use the networkStatusQuery term from the config…
a150561c40c7
·David Walend on Mar 21 2016, 20:24.

Mar 15 2016

Merge release branch
0d2c384ab68d
·David Walend on Mar 15 2016, 21:47.
Updated a dashboard test, then commented it out. Needs VPN to work
94c104a31659
·David Walend on Mar 15 2016, 21:29.

Mar 9 2016

Moved to 1.22.0-SNAPSHOT
5457844e5565
·David Walend on Mar 9 2016, 20:38.

Feb 22 2016

Try out default happy and status as https at 6443
55ca127e0a51
·David Walend on Feb 22 2016, 16:59.

Feb 18 2016

fix of title.
e6f4757a1dea
·Ben Carmen on Feb 18 2016, 22:48.
fix of not showing hub info when downstream node in summary.
652129a4afd9
·Ben Carmen on Feb 18 2016, 22:38.
fix of adapter ok.
c20d41dd42af
·Ben Carmen on Feb 18 2016, 21:52.
Commit of latest UI.
3f620351fa66
·Ben Carmen on Feb 18 2016, 21:16.
Latest fix for dashboard.
f9a318de5dcf
·Ben Carmen on Feb 18 2016, 20:28.
update of summary view.
0d26610663a5
·Ben Carmen on Feb 18 2016, 19:45.
Fix of adapter, keystore and config. Ready to test
8c2087fd814d
·Ben Carmen on Feb 18 2016, 19:40.

Feb 17 2016

Merge remote-tracking branch 'origin/develop' into develop
8e13164473dd
·Ben Carmen on Feb 17 2016, 23:43.
Commit of UI for config file display.
f7d151b9ed16
·Ben Carmen on Feb 17 2016, 23:42.
CQRS for breakdowns and errors in query results
f0f63b4fe1f6
·David Walend on Feb 17 2016, 21:56.

Feb 16 2016

Ported logic for fatal failure and loading.
e20fbddb30cc
·Ben Carmen on Feb 16 2016, 20:37.
Latest version of diagnostic cool. Fixed Header and Footer. Refined logic for…
05d26b3250a9
·Ben Carmen on Feb 16 2016, 02:56.

Feb 13 2016

pick up changes.
7db500a8ab6c
·Ben Carmen on Feb 13 2016, 01:08.
Updated Dashboard Client.
b423aca39ca9
·Ben Carmen on Feb 13 2016, 01:05.

Feb 12 2016

Latest version of diagnostic.model with added controllers.
a5730b8e8226
·Ben Carmen on Feb 12 2016, 04:20.
Fix for issue with unset values causing an error in config route.
123baffbae49
·Ben Carmen on Feb 12 2016, 01:29.
Fix for rest url call in deployment, will use named url instead of localhost.
837046454acf
·Ben Carmen on Feb 12 2016, 00:49.

Feb 11 2016

Trying to get Bamboo to pick up latest changes.
81241aecf1db
·Ben Carmen on Feb 11 2016, 20:44.
Fixing bug with header authorization when in deploy.
c7f9371c61b7
·Ben Carmen on Feb 11 2016, 20:41.
test of rest call from deploy.
d50622a53640
·Ben Carmen on Feb 11 2016, 20:24.
Test of local rest url.
6e6b42b14856
·Ben Carmen on Feb 11 2016, 20:02.
Test of local vs named url on https in live deployment.
29fbc6fb5cd3
·Ben Carmen on Feb 11 2016, 19:59.
Commit of POSO stuff for Status
337a2bbcc0a4
·Ben Carmen on Feb 11 2016, 19:33.

Feb 4 2016

Commit of local test data.
a6db4a7b1b6a
·Ben Carmen on Feb 4 2016, 21:52.
Commit of latest JS includes (need to move static includes to ocLazyLoad)
88d3df388753
·Ben Carmen on Feb 4 2016, 21:52.
Commit of latest Dashboard JS source.
9dca7ff9402b
·Ben Carmen on Feb 4 2016, 21:51.
Updated Dashboard Service to strip out nested quotes when appropriate.
41d06d0f6988
·Ben Carmen on Feb 4 2016, 20:31.

Feb 2 2016

Latest version of diagnostic tool
1fcf5b3f075a
·Ben Carmen on Feb 2 2016, 19:50.

Feb 1 2016

Update of Dashboard routing.
0dad039a6372
·Ben Carmen on Feb 1 2016, 23:58.
Correct default url for status is internalstatus
9fc96147e16e
·David Walend on Feb 1 2016, 19:54.

Jan 30 2016

update of script includes
0ced7f817fe6
·Ben Carmen on Jan 30 2016, 22:23.
Merge remote-tracking branch 'origin/develop' into develop
e68ef1d35f16
·Ben Carmen on Jan 30 2016, 22:21.
Huge refactor of dashboard
033fc768b659
·Ben Carmen on Jan 30 2016, 22:21.

Jan 29 2016

Some stray actor systems after the merge
fd3950857159
·David Walend on Jan 29 2016, 19:13.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
f875ded313d0
·David Walend on Jan 29 2016, 18:56.
Added some logging to see what else happens
16bf34625454
·David Walend on Jan 29 2016, 18:56.
Merge remote-tracking branch 'origin/develop' into develop
aee3ad95c7d1
·Ben Carmen on Jan 29 2016, 17:42.
Probing a bit into why the steward's actors aren't daemonic
5ae5189a064b
·David Walend on Jan 29 2016, 16:53.
Commit of the latest Dashboard Service.
ce9bac970888
·Ben Carmen on Jan 29 2016, 15:41.
Merge remote-tracking branch 'origin/develop' into develop
5d48cd0ab33d
·Ben Carmen on Jan 29 2016, 15:39.

Jan 28 2016

Another try at getting akka to run as all-daemon
3ef029060a95
·David Walend on Jan 28 2016, 22:29.
Seeing if I can get some control over akka threads and make them daemons via…
6c7bf41ae493
·David Walend on Jan 28 2016, 21:36.

Jan 26 2016

Factored the JDNI/tomcat boilerplate off into its own class
5315849aa994
·David Walend on Jan 26 2016, 21:49.
todo node to check finding the right cert.
685c37db95eb
·David Walend on Jan 26 2016, 20:10.
Handling a case where the dashboard's KeyStore just has the right cert in it.
3c0dcb5f165c
·David Walend on Jan 26 2016, 19:47.

Jan 15 2016

Trying out trimming the url to save mischief
8dc4aedc6b15
·David Walend on Jan 15 2016, 16:45.
Cleaning up some suggestions from IDEA
03430c9da802
·David Walend on Jan 15 2016, 16:38.

Jan 14 2016

Rearranged dashboard-to-dashboard auth, got through IDEAs checks to green
42aa7426ea22
·David Walend on Jan 14 2016, 19:21.
Last of the for comprehension
bd59adccfa3c
·David Walend on Jan 14 2016, 18:59.
Added more to the for comprehension
87ff89e8081d
·David Walend on Jan 14 2016, 18:47.
Added more to the for comprehension
9579770dc231
·David Walend on Jan 14 2016, 17:48.
Added more to the for comprehension
865dfd959dbe
·David Walend on Jan 14 2016, 17:29.
Started refactoring to a for comprehension
7bf1574d5841
·David Walend on Jan 14 2016, 16:56.
Added a null check for the issuer
4f5b748e323c
·David Walend on Jan 14 2016, 16:07.
More sensible values for the jwts subject field to help refill the user object…
c2f3e5bc06fd
·David Walend on Jan 14 2016, 16:02.

Jan 13 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
8a37f2c00429
·Ben Carmen on Jan 13 2016, 23:52.
Commit of updated Dashboard Service and Tests
1a9eae471950
·Ben Carmen on Jan 13 2016, 23:51.
Found a bug where my http headers were being ignored
59a98d288a3d
·David Walend on Jan 13 2016, 22:42.
Comment for java code's reason to exist
852f9f302d7e
·David Walend on Jan 13 2016, 21:56.
Now verifying the keys that signed the jwts string
338c83b1c654
·David Walend on Jan 13 2016, 21:43.
Restored tests of dashboard-to-dashboard comms
7fc8a17aba50
·David Walend on Jan 13 2016, 20:55.
Now sending a Spray OAuth token with the request
fa62d920c198
·David Walend on Jan 13 2016, 20:28.
Switched to Bearer auth scheme, step 1
bfb561311772
·David Walend on Jan 13 2016, 19:24.
Reformatted ShrineJwtAuthenticator.scala
63d938c2d6c8
·David Walend on Jan 13 2016, 17:29.
Now using just the jwtsString, almost able to switch to Bearer authentication.
d7464de1cfe9
·David Walend on Jan 13 2016, 16:07.

Jan 12 2016

Removed some less interesting dead code
013344e6f0e3
·David Walend on Jan 12 2016, 22:09.
Now using jwt's kid field for the public part of the cert.
a41433107ccb
·David Walend on Jan 12 2016, 21:56.
Trying out an ssl client that accepts all certs
08ea31cca746
·David Walend on Jan 12 2016, 20:26.
More logging and a fix - default value for status
41ea6d99dcab
·David Walend on Jan 12 2016, 16:29.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
c44036dbcc75
·David Walend on Jan 12 2016, 15:16.
Try sending the cert
10a6cae3528b
·David Walend on Jan 12 2016, 15:16.
Commit of merge.
339655e8be9d
·Ben Carmen on Jan 12 2016, 00:53.
Merge remote-tracking branch 'origin/develop' into develop
86f7b56eb576
·Ben Carmen on Jan 12 2016, 00:50.
Commit of POSO stuff for Dashboard Status...also, commit of tests.
3ad3fc618d32
·Ben Carmen on Jan 12 2016, 00:48.

Jan 11 2016

Try a comma as a delimiter
3542b6d3ba3a
·David Walend on Jan 11 2016, 17:56.

shrine-medco/apps/dashboard-app/src/mainfeature/i2b2-merge-to…acd0aaa11bf18ffad752533…

Aug 2 2016

Aug 1 2016

Jul 29 2016

Jun 6 2016

May 26 2016

May 25 2016

May 24 2016

May 23 2016

Apr 4 2016

Mar 24 2016

Mar 23 2016

Mar 22 2016

Mar 21 2016

Mar 15 2016

Mar 9 2016

Feb 22 2016

Feb 18 2016

Feb 17 2016

Feb 16 2016

Feb 13 2016

Feb 12 2016

Feb 11 2016

Feb 4 2016

Feb 2 2016

Feb 1 2016

Jan 30 2016

Jan 29 2016

Jan 28 2016

Jan 26 2016

Jan 15 2016

Jan 14 2016

Jan 13 2016

Jan 12 2016

Jan 11 2016

shrine-medco/apps/dashboard-app/src/main
feature/i2b2-merge-to…acd0aaa11bf18ffad752533…