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

Integration #137

Merged
merged 2 commits into from
Apr 2, 2020
Merged

Integration #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47ed5d4
fix population dropdown cut short
kvnjng Apr 2, 2020
7ec4672
Merge branch 'master' into integration
kvnjng Apr 2, 2020
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
0 LDlink/LDlink.css → LDlink/LDlink-4.0.3.css
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions LDlink/LDlink-4.0.2.js → LDlink/LDlink-4.0.3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $(document).ready(function() {
});

// Load news text from news.html to news-container div
$.get("news-4.0.2.html", function (data) {
$.get("news-4.0.3.html", function (data) {
let tmpData = data.split("<p>")
let i = 0;
var newsHTMLList = [];
Expand Down Expand Up @@ -1477,7 +1477,7 @@ function populateHeaderValues(event, numFiles, label) {
}

function loadHelp() {
$('#help-tab').load('help-4.0.2.html');
$('#help-tab').load('help-4.0.3.html');
}

function calculate(e) {
Expand Down Expand Up @@ -3965,7 +3965,7 @@ function buildPopulationDropdown(elementId) {
$('#' + elementId).multiselect({
enableClickableOptGroups : true,
buttonWidth : '180px',
maxHeight : 500,
maxHeight : 400,
buttonClass : 'btn btn-default btn-ldlink-multiselect',
includeSelectAllOption : true,
dropRight : false,
Expand Down
0 LDlink/help-4.0.2.html → LDlink/help-4.0.3.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions LDlink/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.8/css/jquery.dataTables.min.css">
<link rel="stylesheet" href="/common/css/style.css">
<link rel="stylesheet" href="/common/css/social.css">
<link rel="stylesheet" href="LDlink.css">
<link rel="stylesheet" href="LDlink-4.0.3.css">
</head>

<!-- <body class="d-flex flex-column vh-100" role="document"> -->
Expand Down Expand Up @@ -2518,7 +2518,7 @@ <h4 class="modal-title">Modal title</h4>
<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.1.0/knockout-min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/knockout.mapping/2.4.1/knockout.mapping.min.js"></script>
<script type="text/javascript" src="LDlink-4.0.2.js"></script>
<script type="text/javascript" src="LDlink-4.0.3.js"></script>
<script type="text/javascript" src="/common/js/purify.js"></script>
<script type="text/javascript" src="/common/js/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-browser/0.0.7/jquery.browser.min.js"></script>
Expand Down
5 changes: 5 additions & 0 deletions LDlink/news-4.0.2.html → LDlink/news-4.0.3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<p><b>LDlink 4.0.3 Release (04/06/2020)</b></p>
<ul>
<li>Fix population dropdown UI cut short by module container.</li>
</ul>
<br>
<p><b>LDlink 4.0.2 Release (03/20/2020)</b></p>
<ul>
<li>Fix P-value and 95% CI columns in LDtrait to reflect GWAS Catalog.</li>
Expand Down