Skip to content

Commit e869670

Browse files
author
Pete
committed
Merge branch 'hotfix-1.3.8'
2 parents dcc4e51 + ac774f0 commit e869670

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

src/ServicePulse.Host/app/NoIE.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<p>We're sorry, but you are trying to access ServicePulse with a very old browser.</p>
2222
<p>Please request your system admins to update your ancient browser.</p>
2323
<br/>
24-
<p>If you are using IE9 or newer then this can be caused by Internet Explorer its compatibility settings which often happens with instranet sites. Change the compatibility view settings or open developer tools (F12) and change specific compatibility settings.</p>
24+
<p>If you are using IE9 or newer then this issue can be caused by Internet Explorer's compatibility settings. Change the compatibility view settings or open developer tools (F12) and change specific compatibility settings.</p>
2525
<br/>
2626
<p><b>ServicePulse needs as a minimum IE9+, Chrome 20+ or Firefox 20+.</b></p>
2727
</div>

src/ServicePulse.Host/app/css/app.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,3 +227,21 @@ ul.nav-tabs > li > a {
227227
-o-animation:0.5s flipInX ease;
228228
animation: 1s flipInX ease;
229229
}
230+
231+
232+
/* Sidebar version update colour*/
233+
234+
235+
.versionInfo {
236+
margin-top: 18px;
237+
margin-left: 16px;
238+
}
239+
240+
.newVersionLink {
241+
color: #646464;
242+
margin-bottom: 12px;
243+
}
244+
245+
.newVersionLink a {
246+
color: #ddd;
247+
}

src/ServicePulse.Host/app/css/style.css

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,17 +2301,3 @@ footer p {
23012301
.icon-red {
23022302
background-image: url("../img/glyphicons-halflings-red.png");
23032303
}
2304-
2305-
.versionInfo {
2306-
margin-top: 18px;
2307-
margin-left: 16px;
2308-
}
2309-
2310-
.newVersionLink {
2311-
color: #646464;
2312-
margin-bottom: 12px;
2313-
}
2314-
2315-
.newVersionLink a {
2316-
color: #ddd;
2317-
}

src/ServicePulse.Host/app/js/endpoints/endpoints.controller.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
if (item.hasOwnProperty('heartbeat_information') && item.heartbeat_information.reported_status === 'beating') {
5555
if (activeIndex === -1) {
5656
$scope.model.active.push(item);
57+
} else {
58+
var activeitem = $scope.model.active[activeIndex];
59+
activeitem.heartbeat_information.last_report_at = item.heartbeat_information.last_report_at;
5760
}
5861
if (inactiveIndex !== -1) {
5962
$scope.model.inactive.splice(inactiveIndex, 1);

0 commit comments

Comments
 (0)