Skip to content

Commit

Permalink
Merge branch 'release/5.0.2'
Browse files Browse the repository at this point in the history
* release/5.0.2:
  updated the changelog
  Update show.stub
  updated the readme
  added directions for enabling dark mode
  • Loading branch information
austintoddj committed Dec 13, 2019
2 parents c5b470b + 0718dbd commit 6d528d9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased](https://github.com/cnvs/canvas/compare/master...develop)

## [5.0.2](https://github.com/cnvs/canvas/compare/v5.0.1...v5.0.2) (December 13, 2019)

## Fixed
- Fixed a non-object error on the default template [fc65d52](https://github.com/cnvs/canvas/commit/fc65d520e722bb44cf376be698823fa5f92c236e)

## [5.0.1](https://github.com/cnvs/canvas/compare/v5.0.0...v5.0.1) (December 7, 2019)

## Fixed
Expand Down
4 changes: 3 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ If you'd rather have all of this run automatically with no extra work from you,

## Options

> **Note:** The following steps are optional configurations, you are not required to complete them.
> **Note:** The following components are optional features, you are not required to use them.
**Want to get started fast?** Just run `php artisan canvas:setup` after installing Canvas. A `--data` option may also be included in the command to generate demo data. Then, navigate your browser to `http://your-app.test/blog` or any other URL that is assigned to your application. This command scaffolds a default frontend for your entire blog!

Expand Down Expand Up @@ -233,6 +233,8 @@ Since the weekly digest runs on [Laravel's Scheduler](https://laravel.com/docs/m
* * * * * cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1
```

**Prefer working at night?** Simply un-comment the `Canvas::night()` method in the `CanvasServiceProvider` to switch off the lights.

## Updates

You may update your Canvas installation using composer:
Expand Down
2 changes: 1 addition & 1 deletion resources/stubs/views/blog/show.stub
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@endpush

@section('actions')
@if($data['post']->user_id == request()->user()->id)
@if($data['post']->user_id == optional(request()->user())->id)
<div class="dropdown">
<a href="#" aria-label="Settings" class="nav-link px-3" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" v-pre>
Expand Down

0 comments on commit 6d528d9

Please sign in to comment.