Skip to content

Commit

Permalink
updated vunerable packages
Browse files Browse the repository at this point in the history
  • Loading branch information
johnWilshire committed Jun 29, 2018
1 parent 33de1ee commit e1e60c5
Show file tree
Hide file tree
Showing 12 changed files with 6,435 additions and 3,312 deletions.
9,667 changes: 6,373 additions & 3,294 deletions app/package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
},
"devDependencies": {
"autoprefixer": "^7.1.2",
"babel-core": "^6.22.1",
"babel-core": "^6.26.3",
"babel-eslint": "^7.1.1",
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^4.1.1",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-preset-env": "^1.6.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-2": "^6.22.0",
"babel-register": "^6.22.0",
"babel-register": "^6.26.0",
"chai": "^3.5.0",
"chalk": "^2.0.1",
"chromedriver": "^2.27.2",
"chromedriver": "^2.40.0",
"connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^4.0.1",
"cross-env": "^5.0.1",
Expand All @@ -58,41 +58,41 @@
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.14.1",
"express": "^4.16.3",
"extract-text-webpack-plugin": "^2.0.0",
"file-loader": "^0.11.1",
"friendly-errors-webpack-plugin": "^1.1.3",
"html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.3",
"http-proxy-middleware": "^0.18.0",
"inject-loader": "^3.0.0",
"karma": "^1.4.1",
"karma-coverage": "^1.1.1",
"karma": "^2.0.4",
"karma-coverage": "^1.1.2",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-phantomjs-shim": "^1.4.0",
"karma-sinon-chai": "^1.3.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.31",
"karma-webpack": "^2.0.2",
"karma-webpack": "^3.0.0",
"lolex": "^1.5.2",
"mocha": "^3.2.0",
"nightwatch": "^0.9.12",
"mocha": "^5.2.0",
"nightwatch": "^1.0.6",
"opn": "^5.1.0",
"optimize-css-assets-webpack-plugin": "^2.0.0",
"ora": "^1.2.0",
"phantomjs-prebuilt": "^2.1.14",
"phantomjs-prebuilt": "^2.1.16",
"rimraf": "^2.6.0",
"selenium-server": "^3.0.1",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"sinon": "^2.1.0",
"sinon-chai": "^2.8.0",
"url-loader": "^0.5.8",
"url-loader": "^1.0.1",
"vue-loader": "^12.1.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.3.3",
"webpack": "^2.6.1",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-bundle-analyzer": "^2.13.1",
"webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.18.0",
"webpack-merge": "^4.1.0"
Expand Down
8 changes: 5 additions & 3 deletions backend/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
WSGI_KEY = open('secrets/wsgi.txt').read().strip()
EE_ACCOUNT = open('secrets/ee_account.txt').read().strip()
EE_PRIVATE_KEY_FILE = 'secrets/gee_service_account_secrets.json'
OAUTH_FILE = 'secrets/client_secrets.json'
OAUTH_FILE = 'secrets/oauth_secret.json'

EE_CREDENTIALS = ee.ServiceAccountCredentials(EE_ACCOUNT, EE_PRIVATE_KEY_FILE)
ee.Initialize(EE_CREDENTIALS)
Expand All @@ -20,7 +20,9 @@
# area threshold in km^, the area of the region cannot exceed this
AREA_THRESHOLD = 100000

CITATION = 'Murray, N.J., Keith, D.A., Simpson, D., Wilshire, J.H. & Lucas, R.M. (2017) REMAP: An online remote sensing application for land cover classification and monitoring. bioRxiv. DOI: 10.1101/212464'
CITATION = 'Murray, N. J., Keith, D. A., Simpson, D. , Wilshire, J. H. and Lucas, R. M. (2018), Remap: An online remote sensing application for land cover classification and monitoring. Methods Ecol Evol. Accepted Author Manuscript. . doi:10.1111/2041-210X.13043'
# old citation:
# CITATION = 'Murray, N.J., Keith, D.A., Simpson, D., Wilshire, J.H. & Lucas, R.M. (2017) REMAP: An online remote sensing application for land cover classification and monitoring. bioRxiv. DOI: 10.1101/212464'
# flag to check if we are running in debug mode or not
DEBUG = os.environ.get('SERVER_SOFTWARE', '').startswith('Development')

Expand All @@ -41,7 +43,7 @@
'json': 'remap_training_chedubaMyanmar.json',
'csv': 'remap_points_chedubaMyanmar.csv'
},
{
{
'name': 'Dubai Coastal Reclamation Dataset (2003)',
'json': 'remap_training_Dubai_2003.json',
'csv': 'remap_points_Dubai_2003.csv'
Expand Down
2 changes: 1 addition & 1 deletion backend/dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><title>remap | A Remote Ecosystem Mapping and Assessment Pipeline</title><link rel=apple-touch-icon sizes=180x180 href=/static/favicons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/favicons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/favicons/favicon-16x16.png><link rel=manifest href=/static/favicons/manifest.json><link rel=mask-icon href=/static/favicons/safari-pinned-tab.svg color=#5bbad5><meta name=theme-color content=#ffffff><link href="https://fonts.googleapis.com/css?family=Roboto" rel=stylesheet type=text/css><link rel=stylesheet href="https://fonts.googleapis.com/icon?family=Material+Icons"><link href=/app-static/static/css/app.750a8af0a4d5b859a3b5573aa2e7547f.css rel=stylesheet></head><body><div id=app><div style="text-align: center; margin-top: 30%">This app requires javascript, please enable it for the app to work properly.</div></div><script type=text/javascript src=/app-static/static/js/manifest.7c33814a139ca27014ec.js></script><script type=text/javascript src=/app-static/static/js/vendor.15c2d5430a2db0fec105.js></script><script type=text/javascript src=/app-static/static/js/app.dabd04bb54c9d05fc949.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><title>remap | A Remote Ecosystem Mapping and Assessment Pipeline</title><link rel=apple-touch-icon sizes=180x180 href=/static/favicons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/favicons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/favicons/favicon-16x16.png><link rel=manifest href=/static/favicons/manifest.json><link rel=mask-icon href=/static/favicons/safari-pinned-tab.svg color=#5bbad5><meta name=theme-color content=#ffffff><link href="https://fonts.googleapis.com/css?family=Roboto" rel=stylesheet type=text/css><link rel=stylesheet href="https://fonts.googleapis.com/icon?family=Material+Icons"><link href=/app-static/static/css/app.66a85ee3d68fe1fdedd69d114506f268.css rel=stylesheet></head><body><div id=app><div style="text-align: center; margin-top: 30%">This app requires javascript, please enable it for the app to work properly.</div></div><script type=text/javascript src=/app-static/static/js/manifest.3baddefc5e03320cea18.js></script><script type=text/javascript src=/app-static/static/js/vendor.100e94904da11ff6f096.js></script><script type=text/javascript src=/app-static/static/js/app.d01868c28f9d0e561fd0.js></script></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions backend/dist/static/js/app.d01868c28f9d0e561fd0.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions backend/dist/static/js/app.d01868c28f9d0e561fd0.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions backend/dist/static/js/manifest.3baddefc5e03320cea18.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e1e60c5

Please sign in to comment.