Merge branch 'release/4.1.22'

* release/4.1.22: updated the changelog updated the changelog refactored the favicon to an .ico format updated the changelog
austintoddj · Apr 5, 2019 · d85415d · d85415d
2 parents a02a90a + ad66520
commit d85415d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,18 @@
 # Release Notes
 
+## [v4.1.22](https://github.com/cnvs/canvas/compare/v4.1.21...v4.1.22)
+
+### Changed
+- Updated the favicon to an .ico format ([08e8dc6](https://github.com/cnvs/canvas/commit/08e8dc6d6a6f52aeb0e4ae033caf7103761c32c1))
+
+## [v4.1.21](https://github.com/cnvs/canvas/compare/v4.1.20...v4.1.21)
+
+### Changed
+- Refactored the float parsing on stat view counts ([ea53999](https://github.com/cnvs/canvas/commit/ea539996fde96c5caedbcaa4ae10ac1a5b3b12fe))
+
+### Fixed
+- Included the post body in the stats index endpoint to not break the read times ([111291f](https://github.com/cnvs/canvas/commit/111291fa20ee910474467cc03aabc03a232b1a30))
+
 ## [v4.1.20](https://github.com/cnvs/canvas/compare/v4.1.19...v4.1.20)
 
 ### Added

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -3,5 +3,5 @@
     "/css/app.css": "/css/app.css?id=30702a620a23ba741c32",
     "/css/app-dark.css": "/css/app-dark.css?id=ceb9852370c32c15e835",
     "/js/app.js.map": "/js/app.js.map?id=d6ba47ca936cd965aed9",
-    "/favicon.png": "/favicon.png?id=d1ff042f5749eb7e2f66"
+    "/favicon.ico": "/favicon.ico?id=dbb0c05daa3432643753"
 }
diff --git a/resources/favicon.ico b/resources/favicon.ico
diff --git a/resources/favicon.png b/resources/favicon.png
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -4,12 +4,12 @@
 
 @push('meta')
     <!-- Icon -->
-    <link rel="icon" type="image/png" href="{{ mix('favicon.png', 'vendor/canvas') }}">
+    <link rel="shortcut icon" href="{{ mix('favicon.ico', 'vendor/canvas') }}">
 @endpush
 
 @section('body')
     @include('canvas::components.nav.navbar')
     <main class="py-4">
         @yield('content')
     </main>
-@endsection
+@endsection
diff --git a/webpack.mix.js b/webpack.mix.js
@@ -26,6 +26,6 @@ mix
     .js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css')
     .sass('resources/sass/app-dark.scss', 'public/css')
-    .copy('resources/favicon.png', 'public')
+    .copy('resources/favicon.ico', 'public')
     .sourceMaps()
-    .version();
+    .version();