Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.10.4 #312

Merged
merged 22 commits into from
Oct 6, 2021
Merged

Release 0.10.4 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5706f88
bump snapshot version
Feb 19, 2021
5f10945
Updated dependencies
blootsvoets Mar 1, 2021
35b5a1e
Avoid translating to JSON multiple times
blootsvoets Mar 2, 2021
3f05780
Solved several warnings
blootsvoets Mar 2, 2021
061c1a9
Merge pull request #291 from OHDSI/avoidDuplicateStrings
blootsvoets May 10, 2021
81cd8b8
Merge pull request #289 from OHDSI/dependency-update
blootsvoets May 10, 2021
da07e25
add cdm v5.4, remove cdm v6 and general cdm version cleanup
Sep 28, 2021
940ae2a
update stem table and mappings
Sep 28, 2021
a72ba0d
re-add cdmv6 as beta target model
Sep 28, 2021
de8b62e
add measurement_time in stem table for 5.3 and 5.4
Sep 28, 2021
8d6cc53
add error message if loading custom target fails
Sep 28, 2021
aad2c98
align data type strings
Sep 28, 2021
0dbafba
reorder v5.4 stem fields to align with target domain fields
Sep 28, 2021
db893a7
Merge pull request #311 from thehyve/cdm-v5.4
Sep 28, 2021
058a05e
bump version
Sep 28, 2021
9f824b0
update redshift jdbc dependency to v4.2
Oct 5, 2021
0a52615
fix captilization of cdm model files
Oct 5, 2021
a7137d3
bump version in documentation
Oct 5, 2021
01a121a
update apache dependencies
Oct 5, 2021
133ca91
refactorings to remove deprecated code
Oct 5, 2021
05615a8
Merge branch 'master' into release-0.10.4
Oct 6, 2021
5ca9190
render html docs
Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ target/
tmp/*
Try*
/examples/
.DS_Store
.DS_Store
data/
113 changes: 37 additions & 76 deletions docs/RabbitInAHat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,28 @@

<title>Rabbit in a Hat</title>

<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
<script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
<script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
<script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
<style>h1 {font-size: 34px;}
h1.title {font-size: 38px;}
h2 {font-size: 30px;}
h3 {font-size: 24px;}
h4 {font-size: 18px;}
h5 {font-size: 16px;}
h6 {font-size: 12px;}
code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
pre:not([class]) { background-color: white }</style>
<script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
<link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
<script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
<script src="site_libs/navigation-1.1/tabsets.js"></script>
<link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
<script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
<link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />

<style type="text/css">
Expand All @@ -40,11 +47,6 @@
</style>

<style type="text/css">code{white-space: pre;}</style>
<style type="text/css">
pre:not([class]) {
background-color: white;
}
</style>
<script type="text/javascript">
if (window.hljs) {
hljs.configure({languages: []});
Expand All @@ -57,32 +59,7 @@



<style type="text/css">
h1 {
font-size: 34px;
}
h1.title {
font-size: 38px;
}
h2 {
font-size: 30px;
}
h3 {
font-size: 24px;
}
h4 {
font-size: 18px;
}
h5 {
font-size: 16px;
}
h6 {
font-size: 12px;
}
.table th:not([align]) {
text-align: left;
}
</style>


<link rel="stylesheet" href="style.css" type="text/css" />

Expand All @@ -94,10 +71,6 @@
margin-left: auto;
margin-right: auto;
}
code {
color: inherit;
background-color: rgba(0, 0, 0, 0.04);
}
img {
max-width:100%;
}
Expand All @@ -113,40 +86,13 @@
summary {
display: list-item;
}
pre code {
padding: 0;
}
</style>


<style type="text/css">
/* padding for bootstrap navbar */
body {
padding-top: 51px;
padding-bottom: 40px;
}
/* offset scroll position for anchor links (for fixed navbar) */
.section h1 {
padding-top: 56px;
margin-top: -56px;
}
.section h2 {
padding-top: 56px;
margin-top: -56px;
}
.section h3 {
padding-top: 56px;
margin-top: -56px;
}
.section h4 {
padding-top: 56px;
margin-top: -56px;
}
.section h5 {
padding-top: 56px;
margin-top: -56px;
}
.section h6 {
padding-top: 56px;
margin-top: -56px;
}
.dropdown-submenu {
position: relative;
}
Expand Down Expand Up @@ -174,7 +120,7 @@
margin-right: -10px;
}
.dropdown-submenu:hover>a:after {
border-left-color: #ffffff;
border-left-color: #adb5bd;
}
.dropdown-submenu.pull-left {
float: none;
Expand All @@ -186,7 +132,7 @@
}
</style>

<script>
<script type="text/javascript">
// manage active state of menu based on current page
$(document).ready(function () {
// active menu anchor
Expand All @@ -197,10 +143,23 @@
var menuAnchor = $('a[href="' + href + '"]');

// mark it active
menuAnchor.parent().addClass('active');
menuAnchor.tab('show');

// if it's got a parent navbar menu mark it active as well
menuAnchor.closest('li.dropdown').addClass('active');

// Navbar adjustments
var navHeight = $(".navbar").first().height() + 15;
var style = document.createElement('style');
var pt = "padding-top: " + navHeight + "px; ";
var mt = "margin-top: -" + navHeight + "px; ";
var css = "";
// offset scroll position for anchor links (for fixed navbar)
for (var i = 1; i <= 6; i++) {
css += ".section h" + i + "{ " + pt + mt + "}\n";
}
style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
document.head.appendChild(style);
});
</script>

Expand All @@ -212,7 +171,6 @@
max-height: 500px;
min-height: 44px;
overflow-y: auto;
background: white;
border: 1px solid #ddd;
border-radius: 4px;
}
Expand Down Expand Up @@ -338,7 +296,7 @@


<!-- setup 3col/9col grid for toc_float and main content -->
<div class="row-fluid">
<div class="row">
<div class="col-xs-12 col-sm-4 col-md-3">
<div id="TOC" class="tocify">
</div>
Expand Down Expand Up @@ -408,7 +366,7 @@
</div><!--/.container -->
</div><!--/.navbar -->

<div class="fluid-row" id="header">
<div id="header">



Expand Down Expand Up @@ -560,7 +518,7 @@ <h3>Generating a SQL Skeleton (<em>v0.9.0</em>)</h3>

$(document).ready(function () {
$('.tabset-dropdown > .nav-tabs > li').click(function () {
$(this).parent().toggleClass('nav-tabs-open')
$(this).parent().toggleClass('nav-tabs-open');
});
});
</script>
Expand All @@ -570,6 +528,9 @@ <h3>Generating a SQL Skeleton (<em>v0.9.0</em>)</h3>
<script>
$(document).ready(function () {

// temporarily add toc-ignore selector to headers for the consistency with Pandoc
$('.unlisted.unnumbered').addClass('toc-ignore')

// move toc-ignore selectors from section div to header
$('div.section.toc-ignore')
.removeClass('toc-ignore')
Expand Down
Loading