Merge branch 'master' into master

This commit is contained in:
Nathaniel van Diepen
2018-06-26 11:07:50 -06:00
committed by GitHub
3 changed files with 19 additions and 12 deletions

View File

@@ -75,3 +75,10 @@ There is a precommit hook that lints the code before commiting the changes.
3. Enable `Developer mode`
4. Click `Load unpacked extension...`
5. Select repository directory
### Troubleshooting
Check for errors by inspecting the extension.
![inspecting extension](./screenshots/wakatime-chrome-debug.gif)

View File

@@ -25,32 +25,32 @@
},
"private": true,
"devDependencies": {
"babel-jest": "^13.0.0",
"babel-jest": "^22.1.0",
"bower": "^1.7.9",
"chai": "^3.5.0",
"del": "^2.2.1",
"chai": "^4.1.2",
"del": "^3.0.0",
"gulp": "^3.9.1",
"jest-cli": "^13.0.0",
"jest-cli": "^22.1.4",
"jshint": "^2.9.2",
"jsxhint": "^0.15.1",
"laravel-elixir": "^5.0.0",
"mocha": "^2.5.3",
"mocha-sinon": "^1.1.5",
"laravel-elixir": "^6.0.0-17",
"mocha": "^5.0.0",
"mocha-sinon": "^2.0.0",
"mocha-traceur": "^2.1.0",
"precommit-hook": "^3.0.0",
"sinon": "^1.17.4",
"sinon": "^4.2.2",
"sinon-chai": "^2.8.0",
"sinon-chrome": "^1.1.2",
"sinon-chrome": "^2.2.4",
"traceur": "^0.0.111"
},
"dependencies": {
"bootstrap": "^3.3.6",
"bootstrap": "^4.0.0",
"classnames": "^2.2.5",
"jquery": "^3.0.0",
"moment": "^2.13.0",
"react": "^15.1.0",
"react": "^16.2.0",
"react-addons-css-transition-group": "^15.1.0",
"react-dom": "^15.1.0",
"react-dom": "^16.2.0",
"webextension-polyfill": "^0.2.1"
},
"jshintConfig": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB