Skip to content

Commit

Permalink
Merge branch 'release/v1.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
c7d5a6 committed Feb 10, 2020
2 parents 936a529 + fc34f57 commit 395a3be
Show file tree
Hide file tree
Showing 4 changed files with 1,245 additions and 1,032 deletions.
4 changes: 2 additions & 2 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
ga('send', 'pageview');
</script>
<script async src='https://www.google-analytics.com/analytics.js'></script>
<script src="https://kit.fontawesome.com/4f95a10a0e.js" crossorigin="anonymous"></script>
<!-- End Google Analytics -->
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-select.min.css">

<style>
Expand Down
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrollbear",
"version": "1.11.0",
"version": "1.11.1",
"description": "scrollbear site",
"main": "index.js",
"repository": "[email protected]:owlbeardm/scrollbear.git",
Expand All @@ -27,21 +27,21 @@
"e2e": "webdriver-manager start && protractor"
},
"dependencies": {
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.8.2",
"@babel/core": "^7.8.4",
"@babel/preset-env": "^7.8.4",
"angular": "^1.7.9",
"angular-mocks": "^1.7.9",
"angular-sanitize": "^1.7.9",
"angular-ui-bootstrap": "^2.5.6",
"angular-ui-router": "^1.0.24",
"angular-ui-router": "^1.0.25",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"favicons-webpack-plugin": "^2.1.0",
"favicons-webpack-plugin": "2.1.0",
"file-loader": "^5.0.2",
"fuzzy-search": "^3.0.2",
"fuzzy-search": "^3.1.0",
"html-loader": "^0.5.5",
"html-webpack-exclude-assets-plugin": "^0.0.7",
"html-webpack-plugin": "^3.2.0",
Expand All @@ -57,39 +57,40 @@
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "^4.0.2",
"mini-css-extract-plugin": "^0.9.0",
"node-html-parser": "^1.1.17",
"node-html-parser": "^1.2.4",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"properties-loader": "^0.0.1",
"puppeteer": "^2.0.0",
"sass-loader": "^8.0.1",
"puppeteer": "^2.1.1",
"sass-loader": "^8.0.2",
"showdown": "^1.9.1",
"style-loader": "^1.1.2",
"terser-webpack-plugin": "^2.3.0",
"style-loader": "^1.1.3",
"terser-webpack-plugin": "^2.3.4",
"turndown": "^5.0.3",
"turndown-plugin-gfm": "^1.0.2",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.1",
"webpack-dev-server": "^3.10.2",
"webpack-merge": "^4.2.2",
"webpack-pwa-manifest": "^4.1.1",
"webpack-version-file": "^0.1.5",
"workbox-webpack-plugin": "3.6.3"
"webpack-version-file": "^0.1.6",
"workbox-webpack-plugin": "5.0.0"
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-standard": "^14.1.0",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.17.0",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-standard": "^4.0.1",
"karma-phantomjs-launcher": "^1.0.4",
"markdown-loader": "^5.1.0",
"node-sass": "^4.13.0",
"protractor": "^5.4.2",
"node-sass": "^4.13.1",
"protractor": "^5.4.3",
"sw-offline-google-analytics": "^0.0.25",
"uglifyjs-webpack-plugin": "^2.2.0",
"webdriver-manager": "^12.1.7"
}
}
Loading

0 comments on commit 395a3be

Please sign in to comment.