Merge branch 'shrineintegration'
Description
Description
Details
Details
- Committed
mickmis Nov 28 2017, 15:27 - Pushed
mickmis Nov 28 2017, 15:28 - Parents
- R4444:edca12487b33: cleanup config tool
R4444:34456bf05508: added EULA license - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
edca12487b33 | mickmis | cleanup config tool | Nov 28 2017 | |||
a6e95f10a772 | mickmis | remove arguments from compose files | Nov 28 2017 | |||
b843cb51829a | mickmis | untrack some files | Nov 28 2017 | |||
f36a691f708e | mickmis | add the i2b2 example data for medco loading from i2b2 database | Nov 27 2017 | |||
0932fe9ba9e5 | mickmis | fix i2b2 original data loading | Nov 27 2017 | |||
1cce961a725d | mickmis | first attempt at i2b2 demo reintegration | Nov 21 2017 | |||
e220fcddb36a | mickmis | fix shrine log level srv1 - dev-3nodes-samehost | Nov 14 2017 | |||
0b9fcb82801a | mickmis | add env var to update script | Nov 14 2017 | |||
d042765689bb | mickmis | fix environment variables problem | Nov 13 2017 | |||
898c6c3fb0f6 | mickmis | fix user rights i2b2-web final | Nov 13 2017 | |||
ee867e368b85 | mickmis | fix user rights i2b2-web | Nov 13 2017 | |||
25a7ed315b58 | mickmis | fix user rights i2b2-web | Nov 13 2017 | |||
8d05508709cf | mickmis | fix env vars | Nov 10 2017 | |||
770bc34609f4 | mickmis | fix update script | Nov 10 2017 | |||
65a3ad40168b | mickmis | fix update script | Nov 10 2017 | |||
7583a405b1e2 | mickmis | shrine-server log level -> fine | Nov 10 2017 | |||
853774fdbf57 | mickmis | shrine-server log level -> debug | Nov 10 2017 | |||
66e6507a91cb | mickmis | update dev-3nodes-samehost configuration | Nov 10 2017 | |||
acebd5d9a356 | mickmis | update dev-3nodes-samehost configuration | Nov 10 2017 | |||
3403e6741b35 | mickmis | fix weird bug | Nov 10 2017 | |||
579a5c5993d3 | mickmis | fix weird bug | Nov 10 2017 | |||
452df62be68f | mickmis | fix i2b2-web + shrine-server | Nov 10 2017 | |||
97c9ae903d38 | mickmis | fix dockerfile i2b2-web | Nov 10 2017 | |||
d0575d73e3f9 | mickmis | add phpmyadmin | Nov 10 2017 | |||
dc2143052abb | mickmis | add phpmyadmin | Nov 10 2017 | |||
0ba229b9dd31 | mickmis | add phpmyadmin | Nov 10 2017 | |||
74abc4c0fdf1 | mickmis | fix dockerfile build errors | Nov 10 2017 | |||
e8b5c5d54bb1 | mickmis | fix dockerfile build errors | Nov 10 2017 | |||
379b2839d6b5 | mickmis | fix dockerfile build errors | Nov 10 2017 | |||
ba13f0a9d2e9 | mickmis | fix dockerfile build errors | Nov 10 2017 | |||
d8e885b9b156 | mickmis | fix i2b2-web permissions error | Nov 10 2017 | |||
42f9c6dac867 | mickmis | fix deployment dev-3nodes-samehost | Nov 10 2017 | |||
dbff328ae8b0 | mickmis | update setup script | Nov 10 2017 | |||
b7e146a618af | mickmis | move docker images to separate folder + some modifications in dockerfiles +… | Nov 10 2017 | |||
137824548cd2 | mickmis | ignore CA updates | Nov 10 2017 | |||
9736190ceee9 | mickmis | cleanup | Nov 10 2017 | |||
44414a3e20c0 | mickmis | rebuild webclient | Nov 7 2017 | |||
b4cd25b098c0 | mickmis | rebuild webclient | Nov 7 2017 | |||
352a395b4e80 | mickmis | updated keys | Nov 7 2017 | |||
61c4f7da6dd9 | mickmis | rebuild webclient | Nov 7 2017 | |||
347c6b33614c | mickmis | volume mounter into i2b2-web correctly | Nov 7 2017 | |||
341601333458 | mickmis | add genomic terms in ontology | Nov 7 2017 | |||
fb09a9641254 | mickmis | fix conf problem ssl lighttpd | Nov 7 2017 | |||
3e5bd6d87b07 | mickmis | ligghtpd ssl | Nov 7 2017 | |||
292a7c6f500b | mickmis | rebuild i2b2 web | Nov 7 2017 | |||
baddba55c3c1 | mickmis | rebuild i2b2 web | Nov 7 2017 | |||
9b3e7484a776 | mickmis | rebuild webclient + add links | Nov 6 2017 | |||
71f165ca2308 | mickmis | rebuild webclient | Nov 6 2017 | |||
74be4224e25d | mickmis | rebuild i2b2-web + fix docker-compose mistake | Nov 6 2017 | |||
ded569ccb639 | mickmis | fix config folder | Nov 6 2017 |