Homec4science

Merge branch 'shrineintegration'

Authored by mickmis on Nov 28 2017, 15:27.

Description

Merge branch 'shrineintegration'

Details

Committed
mickmisNov 28 2017, 15:27
Pushed
mickmisNov 28 2017, 15:28
Parents
R4444:edca12487b33: cleanup config tool
R4444:34456bf05508: added EULA license
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
edca12487b33mickmis
cleanup config tool 
Nov 28 2017
a6e95f10a772mickmis
remove arguments from compose files 
Nov 28 2017
b843cb51829amickmis
untrack some files 
Nov 28 2017
f36a691f708emickmis
add the i2b2 example data for medco loading from i2b2 database 
Nov 27 2017
0932fe9ba9e5mickmis
fix i2b2 original data loading 
Nov 27 2017
1cce961a725dmickmis
first attempt at i2b2 demo reintegration 
Nov 21 2017
e220fcddb36amickmis
fix shrine log level srv1 - dev-3nodes-samehost 
Nov 14 2017
0b9fcb82801amickmis
add env var to update script 
Nov 14 2017
d042765689bbmickmis
fix environment variables problem 
Nov 13 2017
898c6c3fb0f6mickmis
fix user rights i2b2-web final 
Nov 13 2017
ee867e368b85mickmis
fix user rights i2b2-web 
Nov 13 2017
25a7ed315b58mickmis
fix user rights i2b2-web 
Nov 13 2017
8d05508709cfmickmis
fix env vars 
Nov 10 2017
770bc34609f4mickmis
fix update script 
Nov 10 2017
65a3ad40168bmickmis
fix update script 
Nov 10 2017
7583a405b1e2mickmis
shrine-server log level -> fine 
Nov 10 2017
853774fdbf57mickmis
shrine-server log level -> debug 
Nov 10 2017
66e6507a91cbmickmis
update dev-3nodes-samehost configuration 
Nov 10 2017
acebd5d9a356mickmis
update dev-3nodes-samehost configuration 
Nov 10 2017
3403e6741b35mickmis
fix weird bug 
Nov 10 2017
579a5c5993d3mickmis
fix weird bug 
Nov 10 2017
452df62be68fmickmis
fix i2b2-web + shrine-server 
Nov 10 2017
97c9ae903d38mickmis
fix dockerfile i2b2-web 
Nov 10 2017
d0575d73e3f9mickmis
add phpmyadmin 
Nov 10 2017
dc2143052abbmickmis
add phpmyadmin 
Nov 10 2017
0ba229b9dd31mickmis
add phpmyadmin 
Nov 10 2017
74abc4c0fdf1mickmis
fix dockerfile build errors 
Nov 10 2017
e8b5c5d54bb1mickmis
fix dockerfile build errors 
Nov 10 2017
379b2839d6b5mickmis
fix dockerfile build errors 
Nov 10 2017
ba13f0a9d2e9mickmis
fix dockerfile build errors 
Nov 10 2017
d8e885b9b156mickmis
fix i2b2-web permissions error 
Nov 10 2017
42f9c6dac867mickmis
fix deployment dev-3nodes-samehost 
Nov 10 2017
dbff328ae8b0mickmis
update setup script 
Nov 10 2017
b7e146a618afmickmis
move docker images to separate folder + some modifications in dockerfiles +… 
Nov 10 2017
137824548cd2mickmis
ignore CA updates 
Nov 10 2017
9736190ceee9mickmis
cleanup 
Nov 10 2017
44414a3e20c0mickmis
rebuild webclient 
Nov 7 2017
b4cd25b098c0mickmis
rebuild webclient 
Nov 7 2017
352a395b4e80mickmis
updated keys 
Nov 7 2017
61c4f7da6dd9mickmis
rebuild webclient 
Nov 7 2017
347c6b33614cmickmis
volume mounter into i2b2-web correctly 
Nov 7 2017
341601333458mickmis
add genomic terms in ontology 
Nov 7 2017
fb09a9641254mickmis
fix conf problem ssl lighttpd 
Nov 7 2017
3e5bd6d87b07mickmis
ligghtpd ssl 
Nov 7 2017
292a7c6f500bmickmis
rebuild i2b2 web 
Nov 7 2017
baddba55c3c1mickmis
rebuild i2b2 web 
Nov 7 2017
9b3e7484a776mickmis
rebuild webclient + add links 
Nov 6 2017
71f165ca2308mickmis
rebuild webclient 
Nov 6 2017
74be4224e25dmickmis
rebuild i2b2-web + fix docker-compose mistake 
Nov 6 2017
ded569ccb639mickmis
fix config folder 
Nov 6 2017