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

History
feature/i2b2-merge-to…b1fa113c4065be249220661…

Sep 15 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
b1fa113c4065
·David Walend on Sep 15 2016, 18:02.
Added a bit of logging
7b3e29d4f544
·David Walend on Sep 15 2016, 18:01.
preprocess front end to pull apart periods
903f82730b62
·Ty on Sep 15 2016, 18:00.
removed get config
d16247d6c3f7
·Ty on Sep 15 2016, 17:23.
revert factory
09308937ad76
·Ty on Sep 15 2016, 17:02.
using a different config factory
5b30638276ac
·Ty on Sep 15 2016, 16:34.
replacing shrine key filter
0f9c825e4604
·Ty on Sep 15 2016, 15:59.
removed peeling away layer of config
adb140154bac
·Ty on Sep 15 2016, 15:40.
Testing sending all of config
aa04ae25376b
·Ty on Sep 15 2016, 15:22.

Sep 14 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
89d2fde5f453
·Ty on Sep 14 2016, 22:54.
path was truncuated, changed lookup from shrine.networkStatusQuery to just…
2e7d44a01b2b
·Ty on Sep 14 2016, 22:54.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
995af4a84287
·David Walend on Sep 14 2016, 22:27.
dashboard debugging config route
08a6ec401c88
·Ty on Sep 14 2016, 21:48.
Configurable obfuscation, SHRINE-1546
2b47beaab25f
·David Walend on Sep 14 2016, 21:23.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
56bf185f053c
·Ty on Sep 14 2016, 20:57.
removed debug statements
21d527670756
·Ty on Sep 14 2016, 20:57.
removing filter
68df4be316b7
·Ty on Sep 14 2016, 20:56.
re-adding vestigial pom.xml to quell a merge conflict
295b75ff7daa
·branch: feature/internal-release-pom
·Keith Dwyer on Sep 14 2016, 20:45.
testing dashboard endpoint
0fec3e1b232d
·Ty on Sep 14 2016, 20:07.
detailed debug info
6c63f142e207
·Ty on Sep 14 2016, 19:56.
further debugging of JSON serialization
9e9398125d24
·Ty on Sep 14 2016, 19:07.
further debugging
a5b679894737
·Ty on Sep 14 2016, 19:04.
debug printing
5c0a3c52cd99
·Ty on Sep 14 2016, 16:21.

Sep 13 2016

removed erroneous trait
896475063432
·Ty on Sep 13 2016, 21:23.
fixed a test working off of dashboard.conf
a3f8290535e2
·Ty on Sep 13 2016, 21:11.
renamed steward.confs to shrine.conf
1fc83309c019
·Ty on Sep 13 2016, 20:46.
switched configs to use shrine.conf
ceefcb24e134
·Ty on Sep 13 2016, 20:23.
removed typo
3abbd69515b7
·Ty on Sep 13 2016, 19:39.
made merge script work with up to 3 files at once
344bb8b14c0d
·Ty on Sep 13 2016, 19:38.
added merge script
616ee0233e29
·Ty on Sep 13 2016, 18:51.

Sep 12 2016

deleted copies of add_json_data
d2c8772e82c4
·Ty on Sep 12 2016, 22:05.
error handling for add_json_data.py
e7d0a4475b6e
·Ty on Sep 12 2016, 21:56.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
6eba49180619
·Ty on Sep 12 2016, 21:47.
updated py file
e33065702112
·Ty on Sep 12 2016, 21:46.
rename of json generator python file
024535cd8775
·ben-carmen on Sep 12 2016, 21:33.
resolving conflict with resources/client
bd0be219f994
·ben-carmen on Sep 12 2016, 21:04.
clean of client
7e3705a5a6dc
·ben-carmen on Sep 12 2016, 20:54.

Sep 9 2016

point snapshotRepository back to snapshots/
76455027b087
·Keith Dwyer on Sep 9 2016, 22:45.
revert base pom, go back to 1.22.1.0-SNAPSHOT
15076a191735
·Keith Dwyer on Sep 9 2016, 22:10.
experiment: remove uniqueVersion constraint from snapshotRepository
1a9fe45c2c04
·Keith Dwyer on Sep 9 2016, 22:05.
change version back to 1.22.1-SNAPSHOT
a35479dd1574
·Keith Dwyer on Sep 9 2016, 22:00.
change <repository> back to default temporarily (snapshotRepository remains…
796a0548625b
·Keith Dwyer on Sep 9 2016, 21:56.
change pom targets to releases-internal, use version of 1.22.1.0
f9d89d570858
·Keith Dwyer on Sep 9 2016, 21:41.
typos
9c2662de4ec7
·Ty on Sep 9 2016, 21:28.
Implemented steward timeout
5c64367f2189
·Ty on Sep 9 2016, 20:50.
Moved idle code in steward again
fbc537798700
·Ty on Sep 9 2016, 18:12.
moved idleHandler in steward
d5aa392a47f6
·Ty on Sep 9 2016, 17:20.
refactored to check for click events
bd869187c12d
·Ty on Sep 9 2016, 16:57.
bumped timeout back to 20 minutes
391e1524daf0
·Ty on Sep 9 2016, 16:24.
refactored timeout to fire on route changes instead of every event
dc2e48270cdd
·Ty on Sep 9 2016, 16:02.

Sep 8 2016

now redirects user to login page, dashboard only
58fc21c431bc
·Ty on Sep 8 2016, 23:55.
improved timeout to restart after every action
a6f61058d2d4
·Ty on Sep 8 2016, 23:35.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
3a3eb2c163ac
·Ty on Sep 8 2016, 22:05.
uncommented
0c631592028b
·Ty on Sep 8 2016, 22:05.
Fix for SHRINE-1545, mostly adding comments and a default value to a reference.
f1440ecd0bdc
·David Walend on Sep 8 2016, 21:58.
prelim implementation using and
eb70e48809ce
·Ty on Sep 8 2016, 21:41.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
c93d313674ec
·Ty on Sep 8 2016, 18:16.
implemented date picker get call
faac65a32029
·Ty on Sep 8 2016, 18:15.
implemented date picker
d7deba7ea06c
·Ty on Sep 8 2016, 17:55.

Sep 7 2016

Better text for SHRINE-1544
14c63ce983e4
·David Walend on Sep 7 2016, 22:23.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
9d65a722ebfb
·David Walend on Sep 7 2016, 22:04.
Fencepost problem while fixing SHRINE-1544
a2b4e8d73134
·David Walend on Sep 7 2016, 22:04.
if/else if typo
46bcba499835
·Ty on Sep 7 2016, 21:36.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
4ca7c25c4551
·David Walend on Sep 7 2016, 21:28.
Pulling along the exception for bot defense, to get all the gritty details.
664880f59ec9
·David Walend on Sep 7 2016, 21:28.
front end improvements
37588761bd87
·Ty on Sep 7 2016, 21:00.
fixed typo
1a50440ea3b6
·Ty on Sep 7 2016, 02:20.

Sep 6 2016

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
a1904bf9f1fc
·Ty on Sep 6 2016, 22:33.
Needs Warmup Trait, beginning of Bootstrap visualization for dashboard
d34faaa42f78
·Ty on Sep 6 2016, 22:33.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
6ac899021c49
·David Walend on Sep 6 2016, 22:24.
Loading bot detection thresholds from reference.conf
ba4a8fa6ed8c
·David Walend on Sep 6 2016, 22:24.
added boot entries to steward and dashboard
3d0abc0232c2
·Ty on Sep 6 2016, 20:29.
removed clob from problemsT, fixed 0 page bug
eef1f80bf7aa
·Ty on Sep 6 2016, 17:42.

Sep 2 2016

reverting shrine_histroy changes
3d10670a4031
·Ty on Sep 2 2016, 21:28.
more forcefully forcing creation
e39df71e43f6
·Ty on Sep 2 2016, 21:00.
forcing creation
e871ce1bf25d
·Ty on Sep 2 2016, 20:38.
migrating to shrine_query_history
85dbaf34b526
·Ty on Sep 2 2016, 20:19.
updated reference.conf to move problems to shrine_query_history
7c7f1f2734dd
·Ty on Sep 2 2016, 19:35.
drevil json dump
ec32424a0458
·Ty on Sep 2 2016, 19:19.
added shebang
8a90c60d742f
·Ty on Sep 2 2016, 18:48.
add_data_json.py script created
a0dcb6d208d5
·Ty on Sep 2 2016, 18:42.
cleaned up dashboard rest call, used optional
3ed49505f65c
·Ty on Sep 2 2016, 16:34.

Sep 1 2016

realized one layer of escaping is necessary
558768d16b8d
·Ty on Sep 1 2016, 22:17.
fixed parsing to use an actual json object instead of a string json object
ac1b78a7f982
·Ty on Sep 1 2016, 21:22.
fixed json bug
67b0bb0ea088
·Ty on Sep 1 2016, 17:36.
added optional json param to query history
345a83deb377
·Ty on Sep 1 2016, 16:55.

Aug 31 2016

uncommented get Problems
e7df83e08b0a
·Ty on Aug 31 2016, 16:29.
Merge branch 'backlog' into develop
380b90616ff8
·Ty on Aug 31 2016, 15:46.
updated conf files
b8e6c4167cb6
·Ty on Aug 31 2016, 15:46.

Aug 30 2016

fix of SHRINE-1482 Event dropdown is not expanding in case a user is clicking…
3eb4382928ae
·ben-carmen on Aug 30 2016, 22:26.
currently trying to figure out how to add a global config file
9003df1e6811
·Ty on Aug 30 2016, 19:31.
decoupled problems from database handler
2d52094a7fd6
·Ty on Aug 30 2016, 17:38.
refactored problem intialization hack to be much nicer
337b2ce0a2ec
·Ty on Aug 30 2016, 16:22.

Aug 29 2016

fixed problem hack. So many try catches
8c86fafab634
·Ty on Aug 29 2016, 22:22.
Testing creation of all problems
01bab6c41c42
·Ty on Aug 29 2016, 16:28.

Aug 26 2016

refactored delayedInit
2f54aea4a4c4
·Ty on Aug 26 2016, 22:34.
a little cleanup for SHRINE-1544
8454095b83e5
·David Walend on Aug 26 2016, 16:34.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
b4655f6270aa
·Ty on Aug 26 2016, 16:34.
typo
3db5049a0cab
·Ty on Aug 26 2016, 16:34.
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
28a57de66572
·David Walend on Aug 26 2016, 16:32.

Historyfeature/i2b2-merge-to…b1fa113c4065be249220661…

Sep 15 2016

Sep 14 2016

Sep 13 2016

Sep 12 2016

Sep 9 2016

Sep 8 2016

Sep 7 2016

Sep 6 2016

Sep 2 2016

Sep 1 2016

Aug 31 2016

Aug 30 2016

Aug 29 2016

Aug 26 2016

History
feature/i2b2-merge-to…b1fa113c4065be249220661…