vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/peon'

Browse source 
Conflicts:
	Dockerfile
This commit is contained in:
jakedt 2014-04-17 13:03:40 -04:00
commit 56a19aa24e
19 changed files with 170 additions and 28833 deletions
Download patch file Download diff file Expand all files Collapse all files

13
static/js/bootstrap.js vendored
View file

@ -1,13 +0,0 @@
$.ajax({
type: 'GET',
async: false,
url: '/api/discovery',
success: function(data) {
window.__endpoints = data.endpoints;
},
error: function() {
setTimeout(function() {
$('#couldnotloadModal').modal({});
}, 250);
}
});

2
static/js/graphing.js
View file

@ -1718,7 +1718,7 @@ LogUsageChart.prototype.draw = function(container, logData, startDate, endDate)
.duration(500)
.call(chart);
nv.utils.windoweResize(chart.update);
nv.utils.windowResize(chart.update);
chart.multibar.dispatch.on('elementClick', function(e) { that.handleElementClicked_(e); });
chart.dispatch.on('stateChange', function(e) { that.handleStateChange_(e); });