Skip to content

Commit

Permalink
Merge pull request #3371 from CachetHQ/js-deps
Browse files Browse the repository at this point in the history
Upgraded JS deps and rebuilt assets
  • Loading branch information
GrahamCampbell committed Dec 28, 2018
2 parents fc80a6f + 555edd8 commit bd413c1
Show file tree
Hide file tree
Showing 8 changed files with 1,851 additions and 2,096 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"jquery-serializeobject": "^1.0.0",
"jquery-sparkline": "^2.4.0",
"laravel-mix": "^2.1",
"laravel-mix-purgecss": "^2.2.0",
"laravel-mix-purgecss": "^3.0.0",
"livestamp": "git+https://github.com/mattbradley/livestampjs.git#develop",
"lodash": "^4.17.11",
"messenger": "git+https://github.com/HubSpot/messenger.git",
Expand Down
6 changes: 3 additions & 3 deletions public/dist/css/app.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/dist/css/dashboard/dashboard.css

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions public/dist/js/all.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/dist/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/dist/js/vendor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"/resources/assets/sass/plugins/_jquery.minicolors.scss": "/resources/assets/sass/plugins/_jquery.minicolors.scss",
"/resources/assets/sass/plugins/_github-markdown.scss": "/resources/assets/sass/plugins/_github-markdown.scss",
"/dist/js/all.js": "/dist/js/all.js"
}
}
3,871 changes: 1,813 additions & 2,058 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit bd413c1

Please sign in to comment.