Skip to content

Commit 35a88d8

Browse files
committed
feature(laravel5.7) : laravel 5.7 compatibility
- update composer to 5.7 packages - use null coalescing operator instead of 'or' operator in view blade file - update readme and changelog
1 parent 1ecaf00 commit 35a88d8

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
This project follows [Semantic Versioning](CONTRIBUTING.md).
44

55
---
6+
### v4.0.0 - 09/05/2018
7+
Release for Laravel 5.7
8+
9+
### v3.0.0 - 02/27/2018
10+
Release for Laravel 5.6
611

712
### v2.0.0 - 09/03/2017
8-
Initial stable release for Laravel 5.5
13+
Release for Laravel 5.5
914

1015
### v1.0.0 - 09/03/2017
1116
Initial stable release for Laravel 5.4

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,10 @@ php artisan schedule:list
172172

173173
Important versions listed below. Refer to the [Changelog](CHANGELOG.md) for a full history of the project.
174174

175-
- [1.0](CHANGELOG.md) - TBD
176-
177175
## Credits
178176

179177
- [Roshan Gautam](https://twitter.com/@roshangautam)
178+
- [OSS Contributors](https://github.com/codestudiohq/laravel-totem/graphs/contributors)
180179

181180
Bug reports, feature requests, and pull requests can be submitted by following our [Contribution Guide](CONTRIBUTING.md).
182181

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
],
1818
"require": {
1919
"php": ">=7.1",
20-
"illuminate/bus": "~5.6.0",
21-
"illuminate/console": "~5.6.0",
22-
"illuminate/contracts": "~5.6.0",
23-
"illuminate/database": "~5.6.0",
24-
"illuminate/events": "~5.6.0",
25-
"illuminate/notifications": "~5.6.0",
26-
"laravelcollective/html": "~5.6"
20+
"illuminate/bus": "~5.7.0",
21+
"illuminate/console": "~5.7.0",
22+
"illuminate/contracts": "~5.7.0",
23+
"illuminate/database": "~5.7.0",
24+
"illuminate/events": "~5.7.0",
25+
"illuminate/notifications": "~5.7.0",
26+
"laravelcollective/html": "~5.7"
2727
},
2828
"require-dev": {
2929
"mockery/mockery": "^1.0",
3030
"orchestra/database": "^3.0",
3131
"orchestra/testbench" : "^3.6",
32-
"phpunit/phpunit": ">=6.0"
32+
"phpunit/phpunit": ">=7.0"
3333
},
3434
"suggest": {
3535
"nexmo/client": "Required for sms notifications."

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/assets/js/tasks/components/StatusButton.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<transition mode="out-in">
33
<button v-if="task.activated" type="button" class="uk-button uk-button-small" :class="{ 'uk-button-primary': !hovering && !working, 'uk-button-danger': hovering && !working, 'uk-spinner uk-icon uk-button-secondary': working}" key="enabled" @mouseenter="hovering = true" @mouseleave="hovering = false" @click="deactivate" :disabled="working">
44
<span v-if="!working">{{ activeStatusText }}</span>
5-
<span uk-icon="icon: check; ratio: 1"></span>
65
<div v-if="working" uk-spinner="ratio: 1"></div>
76
</button>
87
<button v-if="existsAndIsInActive" type="button" class="uk-button uk-button-small" :class="{'uk-button-danger': !hovering && !working, 'uk-button-primary': hovering && !working, 'uk-spinner uk-icon uk-button-secondary': working}" key="disabled" @mouseenter="hovering = true" @mouseleave="hovering = false" @click="activate" :disabled="working">

resources/views/tasks/view.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</li>
2222
<li>
2323
<span class="uk-text-muted uk-float-right">Parameters</span>
24-
<span class="uk-float-left">{{$task->parameters or 'N/A'}}</span>
24+
<span class="uk-float-left">{{$task->parameters ?? "N/A"}}</span>
2525
</li>
2626
<li>
2727
<span class="uk-text-muted uk-float-right">Cron Expression</span>
@@ -43,15 +43,15 @@
4343
</li>
4444
<li>
4545
<span class="uk-text-muted uk-float-right">Email Notification</span>
46-
<span class="uk-float-left">{{$task->notification_email_address or 'N/A'}}</span>
46+
<span class="uk-float-left">{{$task->notification_email_address ?? 'N/A'}}</span>
4747
</li>
4848
<li>
4949
<span class="uk-text-muted uk-float-right">SMS Notification</span>
50-
<span class="uk-float-left">{{$task->notification_phone_number or 'N/A'}}</span>
50+
<span class="uk-float-left">{{$task->notification_phone_number ?? 'N/A'}}</span>
5151
</li>
5252
<li>
5353
<span class="uk-text-muted uk-float-right">Slack Notification</span>
54-
<span class="uk-float-left">{{$task->notification_slack_webhook or 'N/A'}}</span>
54+
<span class="uk-float-left">{{$task->notification_slack_webhook ?? 'N/A'}}</span>
5555
</li>
5656
<li>
5757
<span class="uk-text-muted uk-float-right">Average Run Time</span>

0 commit comments

Comments
 (0)