lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.4' of github.com:CachetHQ/Cachet into 2.4

Browse Source
This commit is contained in:
James Brooks
2019-07-12 13:37:59 +01:00
parent 87d4bc8cad ad0eda8ef5
commit e4a43a2b9d
7 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
composer.lock generated
View File

@@ -358,16 +358,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.106.1",
"version": "3.107.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c"
"reference": "cf0c0968f93748cbe35d6a78e7babc7b7460945f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c",
"reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cf0c0968f93748cbe35d6a78e7babc7b7460945f",
"reference": "cf0c0968f93748cbe35d6a78e7babc7b7460945f",
"shasum": ""
},
"require": {
@@ -437,7 +437,7 @@
"s3",
"sdk"
],
"time": "2019-07-10T18:29:49+00:00"
"time": "2019-07-11T15:05:32+00:00"
},
{
"name": "bacon/bacon-qr-code",

2
public/dist/css/dashboard/dashboard.css vendored
View File

File diff suppressed because one or more lines are too long

54
public/dist/js/all.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View File

@@ -1,8 +1,8 @@
{
"/dist/js/vendor.js": "/dist/js/vendor.js?id=313e4cd2cf600307cb5c",
"/dist/js/app.js": "/dist/js/app.js?id=7877550e52e1d4e8d66b",
"/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=0d9dfb3411fe9391898f",
"/dist/js/app.js": "/dist/js/app.js?id=be35dd18d92eef9dee9f",
"/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=654823be1de9b1245f17",
"/dist/css/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869",
"/dist/js/manifest.js": "/dist/js/manifest.js?id=40dcfff9d09d402daf38",
"/dist/js/all.js": "/dist/js/all.js?id=498db5622a6525cca7e2"
"/dist/js/all.js": "/dist/js/all.js?id=c77bbe3fb26a84b5347d"
}

1
resources/assets/sass/dashboard/partials/_sidebar.scss vendored
View File

@@ -21,6 +21,7 @@ body.dashboard {
margin: 0;
padding: 0;
list-style: none;
padding-bottom: 64px; /* Ensure the sidebar isn't being covered by the bottom links */
.profile {
text-align: center;

7
resources/views/partials/incidents.blade.php
View File

@@ -33,7 +33,8 @@
@if($incident->updates->isNotEmpty())
<div class="list-group">
@foreach($incident->updates as $update)
<a class="list-group-item incident-update-item" href="{{ $update->permalink }}">
<li class="list-group-item incident-update-item">
<i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i>
{!! $update->formatted_message !!}
<small>
@@ -42,9 +43,9 @@
data-timeago="{{ $update->timestamp_iso }}">
</abbr>
</small>
<span class="ion-ios-arrow-right pull-right"></span>
<a href="{{ $update->permalink }}" class="pull-right"><span class="ion-ios-arrow-right"></span></a>
</a>
</li>
@endforeach
</div>
@endif