Skip to content

Commit

Permalink
Merge pull request #390 from raippl/newSecurity
Browse files Browse the repository at this point in the history
Merge Master into New security
  • Loading branch information
raippl authored Oct 15, 2018
2 parents 0b9184c + 8309029 commit b33befb
Show file tree
Hide file tree
Showing 136 changed files with 6,668 additions and 11,334 deletions.
1,618 changes: 675 additions & 943 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@
"private": true,
"dependencies": {
"@fortawesome/fontawesome": "^1.1.4",
"@fortawesome/fontawesome-free": "^5.3.1",
"@fortawesome/fontawesome-free-solid": "^5.0.8",
"@fortawesome/react-fontawesome": "0.0.17",
"avsc": "^5.0.4",
"babel-preset-es2015": "^6.24.1",
"base-64": "^0.1.0",
"bootstrap": "^3.3.7",
"brace": "^0.11.1",
"chart.js": "^1.1.1",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.2",
"downloadjs": "^1.4.7",
"draft-js": "^0.10.1",
"draftjs-to-html": "^0.7.5",
"extract-text-webpack-plugin": "^3.0.2",
"fusioncharts": "^3.13.1-sr.2",
"html-loader": "^0.5.5",
"html-to-draftjs": "0.1.0-beta14",
"immutable": "^3.8.1",
Expand All @@ -29,9 +32,10 @@
"rc-collapse": "^1.9.3",
"rc-steps": "^3.1.1",
"react": "^15.6.1",
"react-ace": "^6.2.0",
"react-autocomplete": "^1.7.2",
"react-autosize-textarea": "^0.4.8",
"react-autosuggest": "^9.3.1",
"react-autosuggest": "^9.4.2",
"react-chartjs": "^0.8.0",
"react-copy-to-clipboard": "^5.0.1",
"react-datepicker": "^1.2.2",
Expand All @@ -48,6 +52,7 @@
"react-dropzone": "^3.13.4",
"react-dropzone-component": "^2.0.0",
"react-event-timeline": "^1.3.3",
"react-fusioncharts": "^2.0.5",
"react-gif-player": "^0.2.2",
"react-helmet": "^5.2.0",
"react-infinite-scroll": "^0.1.5",
Expand All @@ -56,13 +61,16 @@
"react-modal": "^2.2.2",
"react-modal-bootstrap": "^1.1.1",
"react-overlay-loading": "^1.0.3",
"react-recaptcha": "^2.3.10",
"react-redux": "^5.0.5",
"react-redux-toastr": "^7.2.3",
"react-router": "^4.1.1",
"react-router-dom": "^4.1.1",
"react-select": "^1.0.0-rc.5",
"react-sortable-tree": "^2.2.0",
"react-star-rating-component": "^1.4.1",
"react-stepzilla": "^4.7.2",
"react-table": "^6.8.6",
"react-tag-input": "^4.7.2",
"react-through": "^1.1.0",
"react-timestamp": "^4.3.1",
Expand All @@ -78,6 +86,7 @@
"redux-thunk": "^2.2.0",
"serviceworker-webpack-plugin": "^0.2.3",
"set-default-browser": "^1.0.1",
"socket.io-client": "^2.1.1",
"superagent": "^3.8.3",
"superagent-mock": "^3.4.0",
"superagent-promise": "^1.1.0",
Expand All @@ -100,7 +109,7 @@
"react-scripts": "^1.1.4",
"uglifyjs-webpack-plugin": "^1.2.7",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.11.0",
"webpack-dev-server": "^2.11.3",
"webpack-merge": "^4.1.1"
},
"scripts": {
Expand Down
Loading

0 comments on commit b33befb

Please sign in to comment.