Skip to content

Commit b948e83

Browse files
itsgoingditsgoingd
committed
Merge branch 'master' into v4
2 parents 5c13c70 + da01f31 commit b948e83

File tree

9 files changed

+24
-19
lines changed

9 files changed

+24
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
4.1.2
2+
3+
- fixed interaction when making HTTP requests in feature tests when collecting tests in Laravel
4+
- updated to Clockwork App 4.1.1
5+
16
4.1.1
27

38
- added ext-json to composer.json require section (idea by staabm, thanks!)

‎Clockwork/Clockwork.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Clockwork implements LoggerInterface
2121
/**
2222
* Clockwork version
2323
*/
24-
const VERSION = '4.1.1';
24+
const VERSION = '4.1.2';
2525

2626
/**
2727
* Array of data sources, these objects provide data to be stored in a request object

‎Clockwork/Web/public/css/app.74bdd08e.css‎

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

‎Clockwork/Web/public/css/app.af135e9c.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Clockwork/Web/public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="img/icons/favicon-32x32.png"><![endif]--><title>Clockwork</title><link href=css/app.af135e9c.css rel=preload as=style><link href=js/app.648811c2.js rel=preload as=script><link href=js/chunk-vendors.b6cbf595.js rel=preload as=script><link href=css/app.af135e9c.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=Clockwork><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><div id=app></div><script src=js/chunk-vendors.b6cbf595.js></script><script src=js/app.648811c2.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="img/icons/favicon-32x32.png"><![endif]--><title>Clockwork</title><link href=css/app.74bdd08e.css rel=preload as=style><link href=js/app.8b6f17a2.js rel=preload as=script><link href=js/chunk-vendors.b6cbf595.js rel=preload as=script><link href=css/app.74bdd08e.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=Clockwork><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><div id=app></div><script src=js/chunk-vendors.b6cbf595.js></script><script src=js/app.8b6f17a2.js></script></body></html>

‎Clockwork/Web/public/js/app.648811c2.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Clockwork/Web/public/js/app.8b6f17a2.js‎

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

Clockwork/Web/public/precache-manifest.7001230d47cfb6c10a9439330c17a5e2.js renamed to Clockwork/Web/public/precache-manifest.7c91852b035ace11e1a68f1b59b7dde5.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
self.__precacheManifest = [
22
{
3-
"revision": "5e3a02c36b4e5e2a9e38",
4-
"url": "css/app.af135e9c.css"
3+
"revision": "8bcdbc45e6fb054dda7d",
4+
"url": "css/app.74bdd08e.css"
55
},
66
{
7-
"revision": "5e3a02c36b4e5e2a9e38",
8-
"url": "js/app.648811c2.js"
7+
"revision": "8bcdbc45e6fb054dda7d",
8+
"url": "js/app.8b6f17a2.js"
99
},
1010
{
1111
"revision": "9b438ea0b3dc7b4a5be1",
1212
"url": "js/chunk-vendors.b6cbf595.js"
1313
},
1414
{
15-
"revision": "2fb83bc56cee691a7facbd3c80f3275f",
15+
"revision": "bc5a253ab4e19b9f15b8dbf35938be8e",
1616
"url": "index.html"
1717
},
18+
{
19+
"revision": "4a9a5b7dee3fc2c7d2a684e63c447b55",
20+
"url": "img/appearance-dark-icon.png"
21+
},
1822
{
1923
"revision": "611a8f3ac0aa856f4018f676d719c67f",
2024
"url": "img/appearance-auto-icon.png"
@@ -23,22 +27,18 @@ self.__precacheManifest = [
2327
"revision": "2439692fa652a49e5c3d820fd67cdc27",
2428
"url": "img/appearance-light-icon.png"
2529
},
26-
{
27-
"revision": "4a9a5b7dee3fc2c7d2a684e63c447b55",
28-
"url": "img/appearance-dark-icon.png"
29-
},
3030
{
3131
"revision": "cda1fba54a095fd43346d9f3fe06669a",
3232
"url": "img/whats-new/4.1/commands-profiling.png"
3333
},
34-
{
35-
"revision": "03d36de2be5c98c325c6d7b115f81ace",
36-
"url": "img/whats-new/4.1/extended-timeline.png"
37-
},
3834
{
3935
"revision": "bdb3d5c5df863ae277204f869eb12ed7",
4036
"url": "img/whats-new/4.1/queue-jobs-profiling.png"
4137
},
38+
{
39+
"revision": "03d36de2be5c98c325c6d7b115f81ace",
40+
"url": "img/whats-new/4.1/extended-timeline.png"
41+
},
4242
{
4343
"revision": "2ad52c54fbe33fd038d800d1f634bbaf",
4444
"url": "img/whats-new/4.1/new-settings-modal.png"

‎Clockwork/Web/public/service-worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
1515

1616
importScripts(
17-
"precache-manifest.7001230d47cfb6c10a9439330c17a5e2.js"
17+
"precache-manifest.7c91852b035ace11e1a68f1b59b7dde5.js"
1818
);
1919

2020
workbox.core.setCacheNameDetails({prefix: "Clockwork"});

0 commit comments

Comments
 (0)