Diffusion SHRINE MedCo Fork (master) History

History
master5c7637a876794db5817db4a…

Oct 13 2016

front end to display summary date
9ae80c2ec519
·Ty on Oct 13 2016, 20:23.
Merge branch 'develop' into feature/new-crypto
ac4fa7e85ffc
·Ty on Oct 13 2016, 19:35.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
6cd359fccc17
·David Walend on Oct 13 2016, 19:35.
fixed scanner test
a687e46c86c2
·Ty on Oct 13 2016, 19:34.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
703cb231f2f1
·David Walend on Oct 13 2016, 19:20.
Brought in the courier library for SHRINE-1702
ce89511ea226
·David Walend on Oct 13 2016, 19:20.
Merge branch 'feature/new-crypto' into develop
3e4e094e8447
·Ty on Oct 13 2016, 19:06.
fixed up status tests
a4e626ceed18
·Ty on Oct 13 2016, 19:05.
dug the modified date out of the class path for mappings file
b3ea22479ce2
·Ty on Oct 13 2016, 16:48.

Oct 12 2016

Merge branch 'develop' into feature/new-crypto
5e79894fc65f
·Ty on Oct 12 2016, 21:48.
merge conflicts in problems controller
e2e0d9be4935
·Ty on Oct 12 2016, 21:48.
merge conflicts in diagnostic
60468efc7bf5
·Ty on Oct 12 2016, 21:12.
fixed conflict in dashboard pom
cea3654e998f
·Ty on Oct 12 2016, 20:52.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
24d092ff3bb8
·Ty on Oct 12 2016, 20:31.
merge conflicts
980c37ec1fa2
·Ty on Oct 12 2016, 20:29.
created ontology-term.service.js and ontology-term.factory.js and related tests
f8ef7d8ca29c
·ben-carmen on Oct 12 2016, 19:43.
initial import of bouncy-castle/cryptacular, style changes
ef27c9e77863
·Ty on Oct 12 2016, 16:34.

Oct 11 2016

latest
2cd8e14505bb
·ben-carmen on Oct 11 2016, 22:33.
added getUserQueryHistory method to statistics.model.js along with unit test in…
e62c2f2dbc12
·ben-carmen on Oct 11 2016, 22:31.
Found commons-email in the pom.xml, which we don't use.
49e4df311974
·David Walend on Oct 11 2016, 22:15.
added unit tests for statistics.model.js
54727f32614c
·ben-carmen on Oct 11 2016, 21:13.
adding unit tests for statistics.model.js
950c6fe2cc1c
·ben-carmen on Oct 11 2016, 20:32.
cleanup
10ecc7d15d79
·ben-carmen on Oct 11 2016, 20:31.
cleanup of statistics module
8ee0161d87d9
·ben-carmen on Oct 11 2016, 20:15.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
44c1fa42c880
·Ty on Oct 11 2016, 18:30.
uncommented test, change formatting/comments
814d167d7e53
·Ty on Oct 11 2016, 18:30.
cleanup of statistics module
743418b93ba1
·ben-carmen on Oct 11 2016, 17:50.
cleanup of steward app
3c6e04f36c93
·ben-carmen on Oct 11 2016, 16:42.

Oct 7 2016

Fix for SHRINE-1640. Better error message for nothing to aggregate.
0b351780dd7b
·David Walend on Oct 7 2016, 22:43.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
9562909834e4
·David Walend on Oct 7 2016, 21:18.
Added a comment about the bounds of obfuscation
2d39d6dbc951
·David Walend on Oct 7 2016, 21:17.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
45e08dbe92ac
·Ty on Oct 7 2016, 17:09.
Change to throw a ConfigError on parsing incorrect objects from config
9c5c81272a55
·Ty on Oct 7 2016, 17:08.

Oct 6 2016

Quick fix for a test bug in SHRINE-1714
6f4a465cb2c1
·David Walend on Oct 6 2016, 18:36.
Fix for SHRINE-1644 - better error message when a delete query request has a…
56e8ed449899
·David Walend on Oct 6 2016, 18:04.
button change
0b5c006001cb
·Ty on Oct 6 2016, 17:56.
Problem log slight error reporting improvement
3afea8008d64
·Ty on Oct 6 2016, 17:27.

Oct 5 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
07a31ad30f4c
·Ty on Oct 5 2016, 21:39.
Added max date to datepicker, fixed datepicker not popping up
aba13b45b209
·Ty on Oct 5 2016, 21:38.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
f270ca922664
·David Walend on Oct 5 2016, 21:27.
More for SHRINE-1714, tests for small and smallish results.
ed462ed32892
·David Walend on Oct 5 2016, 21:27.
title change, remove logs from idle, description field change
af06a62fb588
·Ty on Oct 5 2016, 17:22.

Oct 4 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
0e6456333362
·Ty on Oct 4 2016, 22:44.
fixed Authorization/tomcat7:run issue
0261ef7df2ae
·Ty on Oct 4 2016, 22:44.
More for SHRINE-1714, better behavior for small results.
75e56789a08b
·David Walend on Oct 4 2016, 22:05.
Possible fix for SHRINE-1689
21a9370b972f
·David Walend on Oct 4 2016, 20:25.
Possible fix for SHRINE-1689
c62a028c02d9
·David Walend on Oct 4 2016, 19:59.
First step of fixing SHRINE-1714
6e9fcf61a018
·David Walend on Oct 4 2016, 17:57.
trying to fix optionalParts Authorization header
0df33e44371a
·Ty on Oct 4 2016, 17:17.

Oct 3 2016

Merge pull request #4 in SHRINE/shrine from ~NWATTANASIN/shrine:feature/i2b2…
f571d119036d
·branch: feature/i2b2-merge-to-develop
·Ben Carmen on Oct 3 2016, 22:10.
rewired the Dashboard to use the Status backend
c055b3789ed1
·Ty on Oct 3 2016, 21:53.

Sep 30 2016

updated Status summary call to display query response
beb14e86bc81
·Ty on Sep 30 2016, 15:49.

Sep 29 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
b6a8f85e90f1
·Ty on Sep 29 2016, 16:36.
actual gitignore update w/out cruft
a4d8984aa64f
·Ty on Sep 29 2016, 16:24.
Revert "gitignore update"
0f6215c6fe34
·Ty on Sep 29 2016, 16:23.
gitignore update
7038d86193c1
·Ty on Sep 29 2016, 16:23.
Merge branch 'release/1.22.1' of https://open.med.harvard.
38bafa7a76a5
·Ty on Sep 29 2016, 16:17.
updating to 1.22.1.4-SNAPSHOT
29775c4e5224
·Ty on Sep 29 2016, 16:16.

Sep 28 2016

further work on hooking up to SubStatus service
c280bbdfd30a
·Ty on Sep 28 2016, 22:58.
Fix of SHRINE-SHRINE-1470 [Webclient] Define order of Events dropdown is…
8b069cb547bd
·ben-carmen on Sep 28 2016, 21:05.
Fix of SHRINE-1446 Application is returning results in case of incorrect Date…
351e4f4d9721
·ben-carmen on Sep 28 2016, 20:43.
setup backend status routes and tests
00636da75a87
·Ty on Sep 28 2016, 17:15.
Fix for SHRINE-1684 - typo in obfuscation
6c457a4bedd4
·David Walend on Sep 28 2016, 16:45.
actual epoch fix
9e168cf6967c
·Ty on Sep 28 2016, 15:45.
fixed epoch caching
f41185671ba3
·Ty on Sep 28 2016, 15:08.
pagination after date search fix
0a45747e2c18
·Ty on Sep 28 2016, 15:01.

Sep 27 2016

close to replacing happy, need to fix summary and adapter
577223e2bce7
·Ty on Sep 27 2016, 22:59.
changing front end to use Substatus Service
7599681d68ac
·Ty on Sep 27 2016, 22:07.
merging steward changes
0034ac01bbe7
·Ty on Sep 27 2016, 20:22.
cleaned up log in problems; changed startup command in dashboard
aef223a13fc3
·Ty on Sep 27 2016, 19:15.
Merge branch 'release/1.22.1' of https://open.med.harvard.
d16cecb11fcf
·Ty on Sep 27 2016, 15:32.
updated poms to 1.22.1.3
ea1e3b2b7e39
·Ty on Sep 27 2016, 15:32.

Sep 26 2016

commit of latest changes
3f460cfac253
·ben-carmen on Sep 26 2016, 22:31.
Graph improvements
5a20337973ec
·Nich on Sep 26 2016, 22:25.
merging datepicker/steward call changes
f9a4dca10af7
·Ty on Sep 26 2016, 22:16.
Merge branch 'release/1.22.1' of https://open.med.harvard.
cfed12df5ca2
·Ty on Sep 26 2016, 22:13.
changed input to a button, updated steward query call
5388fae1d8b3
·Ty on Sep 26 2016, 22:13.
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
f0c2a9106c50
·ben-carmen on Sep 26 2016, 21:32.
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
7b956a7867f4
·ben-carmen on Sep 26 2016, 21:22.
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
a75c497fab02
·ben-carmen on Sep 26 2016, 21:22.
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
799e1b5ca584
·ben-carmen on Sep 26 2016, 21:20.
Researcher is unable to see Approved and Rejected Topics.
ae1ce427adc0
·ben-carmen on Sep 26 2016, 17:06.
Fix of SHRINE-1612 "Statistics Tab, the date for "Start Date" is not set for 7…
72289cac5716
·ben-carmen on Sep 26 2016, 17:01.

Sep 23 2016

merging
72c4fe2b8ec1
·Ty on Sep 23 2016, 22:43.
Mt push erge branch 'release/1.22.1' of https://open.med.harvard.
976f23f69cfb
·Ty on Sep 23 2016, 22:42.
fixing lines if else error
256455139bf1
·Ty on Sep 23 2016, 22:42.
Merge branch 'release/1.22.1' of https://open.med.harvard.
3379f48f7086
·ben-carmen on Sep 23 2016, 17:42.
Fix for SHRINE-1610: User is unable to see the Approved and Rejected topics
28efe25db0f1
·ben-carmen on Sep 23 2016, 17:39.
fix ie11 jump-to-home bug and pointer styles w/out cruft
d95aaad2009d
·Ty on Sep 23 2016, 16:55.
Revert "fix ie11 jump-to-home bug and pointer styles"
6d14a491bd3e
·Ty on Sep 23 2016, 16:54.
fix ie11 jump-to-home bug and pointer styles
383fb493a8e0
·Ty on Sep 23 2016, 16:54.
updated pointers
1496a137710d
·Ty on Sep 23 2016, 16:52.
trying to remove #
bd1904e8750a
·Ty on Sep 23 2016, 16:24.

Sep 22 2016

debugging ie11
efb69fe42d6b
·Ty on Sep 22 2016, 22:08.
changing npm version to install for steward/pom.xml w/out other cruft
5a87d9f5bea2
·Ty on Sep 22 2016, 21:49.
Revert "changing npm version to install for steward/pom.xml"
e5d94ef52337
·Ty on Sep 22 2016, 21:49.
changing npm version to install for steward/pom.xml
bd7500fac79d
·Ty on Sep 22 2016, 21:47.
pom update
627b61288562
·Ty on Sep 22 2016, 20:38.
removing debug statement from test
77180bc30190
·Ty on Sep 22 2016, 20:27.
merging
74d6556290ca
·Ty on Sep 22 2016, 19:43.

Historymaster5c7637a876794db5817db4a…

Oct 13 2016

Oct 12 2016

Oct 11 2016

Oct 7 2016

Oct 6 2016

Oct 5 2016

Oct 4 2016

Oct 3 2016

Sep 30 2016

Sep 29 2016

Sep 28 2016

Sep 27 2016

Sep 26 2016

Sep 23 2016

Sep 22 2016

History
master5c7637a876794db5817db4a…