diff --git a/.github/ISSUE_TEMPLATE/--bug-report.md b/.github/ISSUE_TEMPLATE/--bug-report.md index 45319eb87b5..b0d61217880 100644 --- a/.github/ISSUE_TEMPLATE/--bug-report.md +++ b/.github/ISSUE_TEMPLATE/--bug-report.md @@ -1,6 +1,7 @@ --- name: "\U0001F41BBug report" about: Create a report to help us improve things +label: bug --- diff --git a/.nvmrc b/.nvmrc index ed13033b848..c6b7980b681 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.11.x +8.x diff --git a/.travis.yml b/.travis.yml index d8ff4c865ff..421eae39990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: node_js -os: osx node_js: + - "10" - "8" +os: + - osx before_install: - - if [[ `npm --version` != "5.8.0" ]]; then npm install -g npm@latest; npm --version; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi # https://github.com/Homebrew/homebrew-core/issues/26358 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5be3a99d625..4e248b4f963 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,6 +11,11 @@ - [Comments and issues](#comments-and-issues) - [Co-ordination](#co-ordination) - [Other Dev Tips](#other-dev-tips) + - [List of Contributors](#list-of-contributors) + - [Core developers, contributing developers, coordinators and documentation writers](#core-developers-contributing-developers-coordinators-and-documentation-writers) + - [Plugin contributors](#plugin-contributors) + - [Translators](#translators) + - [List of all contributors](#list-of-all-contributors) @@ -36,23 +41,25 @@ [waffle]: https://waffle.io/nightscout/cgm-remote-monitor [progress-img]: https://badge.waffle.io/nightscout/cgm-remote-monitor.svg?label=in+progress&title=In+Progress -## Design +## Design & new features -Participate in the design process by creating an issue to discuss your -design. +If you intend to add a new feature, please allow the community to participate in the design process by creating an issue to discuss your design. For new features, the issue should describe what use cases the new feature intends to solve, or which existing use cases are being improved. + +Note Nighscout has a plugin architecture for adding new features. We expect most code for new features live inside a Plugin, so the code retains a clear separation of concerns. If the Plugin API doesn't implement all features you need to implement your feature, please discuss with us on adding those features to the API. Note new features should under almost no circumstances require changes to the existing plugins. ## Develop on `dev` -We develop on the `dev` branch. +We develop on the `dev` branch. All new pull requests should be targeted to `dev`. The `master` branch is only used for distributing the latest version of the tested sources. + You can get the dev branch checked out using `git checkout dev`. ## Style Guide -Some simple rules, that will make it easier to maintain our codebase: +Some simple rules that will make it easier to maintain our codebase: -* All indenting should use 2 space where possible (js, css, html, etc) -* A space before function parameters, such as: `function boom (name, callback) { }`, this makes searching for calls easier -* Name your callback functions, such as `boom('the name', function afterBoom ( result ) { }` +* All indenting should use 2 space where possible (js, css, html, etc). +* Include a space before function parameters, such as: `function boom (name, callback) { }`, this makes searching for function calls easier. +* Name your callback functions, such as `boom('the name', function afterBoom ( result ) { }`. * Don't include author names in the header of your files, if you need to give credit to someone else do it in the commit comment. * Use single quotes. * Use the comma first style, for example: @@ -65,58 +72,217 @@ Some simple rules, that will make it easier to maintain our codebase: }; ``` +If in doubt, format your code with `js-beautify --indent-size 2 --comma-first --keep-array-indentation` + ## Create a prototype +<<<<<<< HEAD Fork cgm-remote-monitor and create a branch. You can create a branch using `git checkout -b wip/add-my-widget`. This creates a new branch called `wip/add-my-widget`. The `wip` -stands for work in progress and is a common prefix so that when know +stands for work in progress and is a common prefix so that we know what to expect when reviewing many branches. +======= +Fork cgm-remote-monitor and create a branch. You can create a branch using `git checkout -b wip/add-my-widget`. This creates a new branch called `wip/add-my-widget`. The `wip` stands for work in progress and is a common prefix so that when know what to expect when reviewing many branches. +>>>>>>> master ## Submit a pull request -When you are done working with your prototype, it can be tempting to -post on popular channels such as Facebook. We encourage contributors -to submit their code for review, debate, and release before announcing -features on social media. +When you are done working with your prototype, it can be tempting to post on popular channels such as Facebook. We encourage contributors to submit their code for review, debate, and release before announcing features on social media. + +This can be done by checking your code `git commit -avm 'my improvements are here'`, the branch you created back to your own fork. This will probably look something like `git push -u origin wip/add-my-widget`. + +Now that the commits are available on github, you can click on the compare buttons on your fork to create a pull request. Make sure to select [Nightscout's `dev` branch](https://github.com/nightscout/cgm-remote-monitor/tree/dev). + +We assume all new Pull Requests are at least smoke tested by the author and all code in the PR actually works. +<<<<<<< HEAD + +Please include a description of what the features do and rationalize why the changes are needed. + +If you add any new NPM module dependencies, you have to rationalize why there are needed - we prefer pull requests that reduce dependencies, not add them. -This can be done by checking your code `git commit -avm 'my -improvements are here'`, the branch you created back to your own +When adding new features that add confugration options, please ensure the `README` document is amended with information on the new configuration. + +## Bug fixing + +If you've fixed a bug, please consider adding a unit test to the `/tests` folder that reproduces the original bug without the change. +Try to identify the root cause of the issue and fix the issue. Pull requests that simply add null checks to hide issues are unlikely to be accepted. + +This can be done by committing your code `git commit -avm 'my +improvements are here'`, and pushing it to the branch you created on your own fork. This will probably look something like `git push -u origin wip/add-my-widget`. +======= + +Please include a description of what the features do and rationalize why the changes are needed. + +If you add any new NPM module dependencies, you have to rationalize why there are needed - we prefer pull requests that reduce dependencies, not add them. + +When adding new features that add confugration options, please ensure the `README` document is amended with information on the new configuration. + +## Bug fixing + +If you've fixed a bug, please consider adding a unit test to the `/tests` folder that reproduces the original bug without the change. -Now that the commits are available on github, you can click on the -compare buttons on your fork to create a pull request. Make sure to -select [Nightscout's `dev` branch](https://github.com/nightscout/cgm-remote-monitor/tree/dev). +Try to identify the root cause of the issue and fix the issue. Pull requests that simply add null checks to hide issues are unlikely to be accepted. +>>>>>>> master + +Please include instructions how to test the changes. ## Comments and issues -We encourage liberal use of the comments, including images where -appropriate. +We encourage liberal use of the comments, including images where appropriate. ## Co-ordination -Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and -gitter. +Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and gitter. -We use git-flow, with `master` as our production, stable branch, and -`dev` is used to queue up for upcoming releases. Everything else is +<<<<<<< HEAD +We use [git-flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow), with `master` as our production, stable branch, and +`dev` is used to queue changes for upcoming releases. Everything else is done on branches, hopefully with names that indicate what to expect. Once `dev` has been reviewed and people feel it's time to release, we follow the git-flow release process, which creates a new tag and bumps -the version correctly. See sem-ver for versioning strategy. +the version correctly. See [sem-ver](https://semver.org/) for versioning strategy. -Every commit is tested by travis. We encourage adding tests to +Every commit is tested by Travis CI. We encourage adding tests to validate your design. We encourage discussing your use cases to help everyone get a better understanding of your design. +======= +We use git-flow, with `master` as our production, stable branch, and `dev` is used to queue up for upcoming releases. Everything else is done on branches, hopefully with names that indicate what to expect. + +Once `dev` has been reviewed and people feel it's time to release, we follow the git-flow release process, which creates a new tag and bumps the version correctly. See sem-ver for versioning strategy. + +Every commit is tested by travis. We encourage adding tests to validate your design. We encourage discussing your use cases to help everyone get a better understanding of your design. +>>>>>>> master ## Other Dev Tips * Join the [Gitter chat][gitter-url] -* Get a local dev environment setup if you haven't already -* Try breaking up big features/improvements into small parts. It's much easier to accept small PR's -* Create tests for your new code, and for the old code too. We are aiming for a full test coverage. -* If your going to be working in old code that needs lots of reformatting consider doing the clean as a separate PR. -* If you can find others to help test your PR is will help get them merged in sooner. +* Get a local dev environment setup if you haven't already. +* Try breaking up big features/improvements into small parts. It's much easier to accept small PR's. +* Create tests for your new code as well as the old code. We are aiming for a full test coverage. +* If you're going to be working in old code that needs lots of reformatting, consider doing it as a separate PR. +* If you can find others to help test your PR, it will help get them merged in sooner. +## List of Contributors + +We welcome new contributors. We do not only need core contributors. Regular or one time contributors are welcomed as well. +Also if you can't code, it's possible to contribute by improving the documentation or by translating Nightscout in your own language + +### Core developers, contributing developers, coordinators and documentation writers + +[@andrew-warrington]: https://github.com/andrew-warrington +[@apanasef]: https://github.com/apanasef +[@bewest]: https://github.com/bewest +[@danamlewis]: https://github.com/danamlewis +[@herzogmedia]: https://github.com/herzogmedia +[@jamieowendexcom ]: https://github.com/jamieowendexcom +[@jasoncalabrese]: https://github.com/jasoncalabrese +[@jizhongwen]: https://github.com/jizhongwen +[@jpcunningh]: https://github.com/jpcunningh +[@jweismann]: https://github.com/jweismann +[@komarserjio]: https://github.com/komarserjio +[@LuminaryXion]: https://github.com/LuminaryXion +[@mcdafydd]: https://github.com/mcdafydd +[@mdomox]: https://github.com/mdomox +[@MilosKozak]: https://github.com/MilosKozak +[@oteroos]: https://github.com/oteroos +[@PieterGit]: https://github.com/PieterGit +[@rarneson]: https://github.com/rarneson +[@rickfriele]: https://github.com/rickfriele +[@scottleibrand]: https://github.com/scottleibrand +[@sulkaharo]: https://github.com/sulkaharo +[@tynbendad]: https://github.com/tynbendad +[@unsoluble]: https://github.com/unsoluble +[@viderehh]: https://github.com/viderehh + +| Contribution area | List of contributors | +| ------------------------------------- | ---------------------------------- | +| Core developers: | [@jasoncalabrese] [@MilosKozak] [@PieterGit] [@sulkaharo] | +| Former Core developers: (not active): | [@bewest] | +| Contributing developers: | [@jpcunningh] [@scottleibrand] [@komarserjio] [@jweismann] | +| Release coordination 0.10.x: | [@PieterGit] [@sulkaharo] | +| Release coordination 0.11.x: | [@PieterGit] | +| Issue/Pull request coordination: | Please volunteer | +| Cleaning up git fork spam: | Please volunteer | +| Documentation writers: | [@andrew-warrington][@unsoluble] [@tynbendad] [@danamlewis] [@rarneson] | + +### Plugin contributors + +| Contribution area | List of developers | List of testers +| ------------------------------------- | -------------------- | -------------------- | +| [`alexa` (Amazon Alexa)](README.md#alexa-amazon-alexa)| Please volunteer | Please volunteer | +| [`ar2` (AR2 Forecasting)](README.md#ar2-ar2-forecasting)| Please volunteer | Please volunteer | +| [`basal` (Basal Profile)](README.md#basal-basal-profile)| Please volunteer | Please volunteer | +| [`boluscalc` (Bolus Wizard)](README.md#boluscalc-bolus-wizard)| Please volunteer | Please volunteer | +| [`bridge` (Share2Nightscout bridge)](README.md#bridge-share2nightscout-bridge)| Please volunteer | Please volunteer | +| [`bwp` (Bolus Wizard Preview)](README.md#bwp-bolus-wizard-preview)| Please volunteer | Please volunteer | +| [`cage` (Cannula Age)](README.md#cage-cannula-age)| [@jpcunningh] | Please volunteer | +| [`careportal` (Careportal)](README.md#careportal-careportal)| Please volunteer | Please volunteer | +| [`cob` (Carbs-on-Board)](README.md#cob-carbs-on-board)| Please volunteer | Please volunteer | +| [`cors` (CORS)](README.md#cors-cors)| Please volunteer | Please volunteer | +| [`delta` (BG Delta)](README.md#delta-bg-delta)| Please volunteer | Please volunteer | +| [`devicestatus` (Device Status)](README.md#devicestatus-device-status)| Please volunteer | Please volunteer | +| [`direction` (BG Direction)](README.md#direction-bg-direction)| Please volunteer | Please volunteer | +| [`errorcodes` (CGM Error Codes)](README.md#errorcodes-cgm-error-codes)| Please volunteer | Please volunteer | +| [`food` (Custom Foods)](README.md#food-custom-foods)| Please volunteer | Please volunteer | +| [`googlehome` (Google Home)](README.md#google-home) |[@mdomox] [@rickfriele] | [@mcdafydd] [@oteroos] [@jamieowendexcom] | +| [`iage` (Insulin Age)](README.md#iage-insulin-age)| Please volunteer | Please volunteer | +| [`iob` (Insulin-on-Board)](README.md#iob-insulin-on-board)| Please volunteer | Please volunteer | +| [`loop` (Loop)](README.md#loop-loop)| Please volunteer | Please volunteer | +| [`mmconnect` (MiniMed Connect bridge)](README.md#mmconnect-minimed-connect-bridge)| Please volunteer | Please volunteer | +| [`openaps` (OpenAPS)](README.md#openaps-openaps)| Please volunteer | Please volunteer | +| [`profile` (Treatment Profile)](README.md#profile-treatment-profile)| Please volunteer | Please volunteer | +| [`pump` (Pump Monitoring)](README.md#pump-pump-monitoring)| Please volunteer | Please volunteer | +| [`rawbg` (Raw BG)](README.md#rawbg-raw-bg)| [@jpcunningh] | Please volunteer | +| [`sage` (Sensor Age)](README.md#sage-sensor-age)| @jpcunningh | Please volunteer | +| [`simplealarms` (Simple BG Alarms)](README.md#simplealarms-simple-bg-alarms)| Please volunteer | Please volunteer | +| [`speech` (Speech)](README.md#speech-speech) | [@sulkaharo] | Please volunteer | +| [`timeago` (Time Ago)](README.md#timeago-time-ago)| Please volunteer | Please volunteer | +| [`treatmentnotify` (Treatment Notifications)](README.md#treatmentnotify-treatment-notifications)| Please volunteer | Please volunteer | +| [`upbat` (Uploader Battery)](README.md#upbat-uploader-battery)| [@jpcunningh] | Please volunteer | +| [`xdrip-js` (xDrip-js)](README.md#xdrip-js-xdrip-js)| [@jpcunningh] | Please volunteer | + +### Translators + +See `/translations` of your Nightscout, to view the current translation coverage and the missing items. +Languages with less than 90% coverage will be removed in a future Nightscout versions. + +| Language | List of translators | Status +| ------------- | -------------------- |-------------------- | +| Български (`bg`) |Please volunteer| OK | +| Čeština (`cs`) |Please volunteer|OK | +| Deutsch (`de`) |[@viderehh] [@herzogmedia] |OK | +| Dansk (`dk`) |Please volunteer|OK | +| Ελληνικά `(el`)|Please volunteer|Needs attention: 68.5%| +| English (`en`)|Please volunteer|OK| +| Español (`es`) |Please volunteer|OK| +| Suomi (`fi`)|[@sulkaharo] |OK| +| Français (`fr`)|Please volunteer|OK| +| עברית (`he`)|Please volunteer|OK| +| Hrvatski (`hr`)|Please volunteer|Needs attention: 47.8%| +| Italiano (`it`)|Please volunteer|OK| +| 日本語 (`ja`)|[@LuminaryXion]|Working on this| +| 한국어 (`ko`)|Please volunteer|Needs attention: 80.6%| +| Norsk (Bokmål) (`nb`)|Please volunteer|OK| +| Nederlands (`nl`)|[@PieterGit]|OK| +| Polski (`pl`)|Please volunteer|OK| +| Português (Brasil) (`pt`)|Please volunteer|OK| +| Română (`ro`)|Please volunteer|OK| +| Русский (`ru`)|[@apanasef]|OK| +| Slovenčina (`sk`)|Please volunteer|OK| +| Svenska (`sv`)|Please volunteer|OK| +| 中文（简体） (`zh_cn`) | [@jizhongwen]|OK| +| 中文（繁體） (`zh_tw`) | [@jizhongwen]|Needs attention: 25.0% +| 日本語 (`ja_jp`) | [@LuminaryXion]| + + +### List of all contributors +| Contribution area | List of contributors | +| ------------------------------------- | -------------------- | +| All active developers: | [@jasoncalabrese] [@jpcunningh] [@jweismann] [@komarserjio] [@mdomox] [@MilosKozak] [@PieterGit] [@rickfriele] [@sulkaharo] +| All active testers/documentors: | [@danamlewis] [@jamieowendexcom] [@mcdafydd] [@oteroos] [@rarneson] [@tynbendad] [@unsoluble] +| All active translators: | [@apanasef] [@jizhongwen] [@viderehh] [@herzogmedia] [@LuminaryXion] + diff --git a/Makefile b/Makefile index 7829258bd58..bf87aaed1c1 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,8 @@ MOCHA=./node_modules/mocha/bin/_mocha # Pinned from dependency list. ISTANBUL=./node_modules/.bin/istanbul ANALYZED=./coverage/lcov.info -export CODACY_REPO_TOKEN=e29ae5cf671f4f918912d9864316207c +# Following token deprecated +# export CODACY_REPO_TOKEN=e29ae5cf671f4f918912d9864316207c DOCKER_IMAGE=nightscout/cgm-remote-monitor-travis diff --git a/README.md b/README.md index 93dd92d17fd..2b39524b4b8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Nightscout Web Monitor (a.k.a. cgm-remote-monitor) [![Codacy Badge][codacy-img]][codacy-url] [![Gitter chat][gitter-img]][gitter-url] -[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://azuredeploy.net/) [![Deploy to Heroku][heroku-img]][heroku-url] +[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://azuredeploy.net/) [![Deploy to Heroku][heroku-img]][heroku-url] [![Update your site][update-img]][update-fork] This acts as a web-based CGM (Continuous Glucose Monitor) to allow multiple caregivers to remotely view a patient's glucose data in @@ -39,6 +39,8 @@ Community maintained fork of the [gitter-url]: https://gitter.im/nightscout/public [heroku-img]: https://www.herokucdn.com/deploy/button.png [heroku-url]: https://heroku.com/deploy +[update-img]: update.png +[update-fork]: http://nightscout.github.io/pages/update-fork/ [original]: https://github.com/rnpenguin/cgm-remote-monitor @@ -70,7 +72,7 @@ Community maintained fork of the - [`ar2` (AR2 Forecasting)](#ar2-ar2-forecasting) - [`simplealarms` (Simple BG Alarms)](#simplealarms-simple-bg-alarms) - [`profile` (Treatment Profile)](#profile-treatment-profile) - - [Advanced Plugins](#advanced-plugins) + - [Advanced Plugins:](#advanced-plugins) - [`careportal` (Careportal)](#careportal-careportal) - [`boluscalc` (Bolus Wizard)](#boluscalc-bolus-wizard) - [`food` (Custom Foods)](#food-custom-foods) @@ -81,6 +83,7 @@ Community maintained fork of the - [`cage` (Cannula Age)](#cage-cannula-age) - [`sage` (Sensor Age)](#sage-sensor-age) - [`iage` (Insulin Age)](#iage-insulin-age) + - [`bage` (Battery Age)](#bage-battery-age) - [`treatmentnotify` (Treatment Notifications)](#treatmentnotify-treatment-notifications) - [`basal` (Basal Profile)](#basal-basal-profile) - [`bridge` (Share2Nightscout bridge)](#bridge-share2nightscout-bridge) @@ -90,6 +93,7 @@ Community maintained fork of the - [`loop` (Loop)](#loop-loop) - [`xdrip-js` (xDrip-js)](#xdrip-js-xdrip-js) - [`alexa` (Amazon Alexa)](#alexa-amazon-alexa) + - [`speech` (Speech)](#speech-speech) - [`cors` (CORS)](#cors-cors) - [Extended Settings](#extended-settings) - [Pushover](#pushover) @@ -106,17 +110,28 @@ Community maintained fork of the Supported configurations: -If you plan to use Nightscout, we recommend using [Heroku](http://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/nightscout-setup.html#nightscout-setup-with-heroku), as Nightscout can reach the usage limits of the free Azure plan and cause it to shut down for hours or days. If you end up needing a paid tier, the $7/mo Heroku plan is also much cheaper than the first paid tier of Azure. Currently, the only added benefit to choosing the $7/mo Heroku plan vs the free Heroku plan is a section showing site use metrics for performance (such as response time). This has limited benefit to the average Nightscout user. In short, Heroku is the free and best option for Nightscout hosting. +If you plan to use Nightscout, we recommend using [Heroku](http://www.nightscout.info/wiki/welcome/set-up-nightscout-using-heroku), as Nightscout can reach the usage limits of the free Azure plan and cause it to shut down for hours or days. If you end up needing a paid tier, the $7/mo Heroku plan is also much cheaper than the first paid tier of Azure. Currently, the only added benefit to choosing the $7/mo Heroku plan vs the free Heroku plan is a section showing site use metrics for performance (such as response time). This has limited benefit to the average Nightscout user. In short, Heroku is the free and best option for Nightscout hosting. -- [Nightscout Setup with Heroku] (http://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/nightscout-setup.html#nightscout-setup-with-heroku) (recommended) -- [Nightscout Setup with Microsoft Azure] (http://www.nightscout.info/wiki/faqs-2/azure-2) (not recommended, please +- [Nightscout Setup with Heroku](http://www.nightscout.info/wiki/welcome/set-up-nightscout-using-heroku) (recommended) +- [Nightscout Setup with Microsoft Azure](http://www.nightscout.info/wiki/faqs-2/azure-2) (not recommended, please [switch from Azure to Heroku](http://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/nightscout-setup.html#switching-from-azure-to-heroku) ) - Linux based install (Debian, Ubuntu, Raspbian) install with own Node.JS and MongoDB install (see software requirements below) - Windows based install with own Node.JS and MongoDB install (see software requirements below) -Software requirements: +Minimum browser requirements for viewing the site: + +- Android 4 +- Chrome 68 +- Edge 15 +- Firefox 61 +- Internet Explorer: not supported, ie8 is known not to work +- iOS 9 +- Safari 11 +- Opera: 54 -- [Node.js](http://nodejs.org/) Latest Node 8 LTS (Node 8.11.3 or later). Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`) +Windows installation software requirements: + +- [Node.js](http://nodejs.org/) Latest Node 8 LTS (Node 8.15.0 or later) or Node 10 LTS (Node 10.15.1 or later; Node 10.14.1 works for Azure). Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`) - [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 3.x or later. MongoDB 2.4 is only supported for Raspberry Pi. As a non-root user clone this repo then install dependencies into the root of the project: @@ -125,16 +140,15 @@ As a non-root user clone this repo then install dependencies into the root of th $ npm install ``` -Installation notes for Microsoft Azure, Windows and Node 10: +Installation notes for Microsoft Azure, Windows: - If deploying the software to Microsoft Azure, you must set ** in the app settings for *WEBSITE_NODE_DEFAULT_VERSION* and *SCM_COMMAND_IDLE_TIMEOUT* **before** you deploy the latest Nightscout or the site deployment will likely fail. Other hosting environments do not require this setting. Please use: ``` -WEBSITE_NODE_DEFAULT_VERSION=8.11.1 +WEBSITE_NODE_DEFAULT_VERSION=10.14.1 SCM_COMMAND_IDLE_TIMEOUT=300 ``` - See [install MongoDB, Node.js, and Nightscouton a single Windows system](https://github.com/jaylagorio/Nightscout-on-Windows-Server). if you want to host your Nightscout outside of the cloud. Although the instructions are intended for Windows Server the procedure is compatible with client versions of Windows such as Windows 7 and Windows 10. -- If you deploy to Windows and want to develop or test you need to install [Cygwin] (https://www.cygwin.com/) (use [setup-x86_64.exe] (https://www.cygwin.com/setup-x86_64.exe) and make sure to install `build-essential` package. Test your configuration by executing `make` and check if all tests are ok. -- There may be some issues with Node 10.6.0 or later with Nightscout. Node 10 support will be in the 0.11 release. Please don't use Nightscout with (Node 9 or) Node 10 at this moment. +- If you deploy to Windows and want to develop or test you need to install [Cygwin](https://www.cygwin.com/) (use [setup-x86_64.exe](https://www.cygwin.com/setup-x86_64.exe) and make sure to install `build-essential` package. Test your configuration by executing `make` and check if all tests are ok. # Usage @@ -144,7 +158,6 @@ MongoDB server such as [mongolab][mongodb]. [mongodb]: https://mongolab.com [autoconfigure]: https://nightscout.github.io/pages/configure/ [mongostring]: https://nightscout.github.io/pages/mongostring/ -[update-fork]: http://nightscout.github.io/pages/update-fork/ ## Updating my version? The easiest way to update your version of cgm-remote-monitor to our latest @@ -238,9 +251,9 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * `MONGO_ACTIVITY_COLLECTION`(`activity`) - The collection used to store activity data * `PORT` (`1337`) - The port that the node.js application will listen on. * `HOSTNAME` - The hostname that the node.js application will listen on, null by default for any hostname for IPv6 you may need to use `::`. - * `SSL_KEY` - Path to your ssl key file, so that ssl(https) can be enabled directly in node.js - * `SSL_CERT` - Path to your ssl cert file, so that ssl(https) can be enabled directly in node.js - * `SSL_CA` - Path to your ssl ca file, so that ssl(https) can be enabled directly in node.js + * `SSL_KEY` - Path to your ssl key file, so that ssl(https) can be enabled directly in node.js. If using Let's Encrypt, make this variable the path to your privkey.pem file (private key). + * `SSL_CERT` - Path to your ssl cert file, so that ssl(https) can be enabled directly in node.js. If using Let's Encrypt, make this variable the path to fullchain.pem file (cert + ca). + * `SSL_CA` - Path to your ssl ca file, so that ssl(https) can be enabled directly in node.js. If using Let's Encrypt, make this variable the path to chain.pem file (chain). * `HEARTBEAT` (`60`) - Number of seconds to wait in between database checks * `DEBUG_MINIFY` (`true`) - Debug option, setting to `false` will disable bundle minification to help tracking down error and speed up development @@ -265,7 +278,14 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * The `log-dynamic` is similar to the default `log` options, but uses the same dynamic range and the `linear` scale. * `EDIT_MODE` (`on`) - possible values `on` or `off`. Enable or disable icon allowing enter treatments edit mode -### Views +### Predefined values for your server settings (optional) + * `INSECURE_USE_HTTP` (`false`) - Redirect http url's to https. Possible values `false`, or `true`. + * `SECURE_HSTS_HEADER` (`true`) - Add HTTP Strict Transport Security (HSTS) header. Possible values `false`, or `true`. + * `SECURE_HSTS_HEADER_INCLUDESUBDOMAINS` (`false`) - includeSubdomains options for HSTS. Possible values `false`, or `true`. + * `SECURE_HSTS_HEADER_PRELOAD` (`false`) - ask for preload in browsers for HSTS. Possible values `false`, or `true`. + * `SECURE_CSP` (`false`) - Add Content Security Policy headers. Possible values `false`, or `true`. Currently Nightscout is not yet compatible with CSP. + + ### Views There are a few alternate web views available that display a simplified BG stream. Append any of these to your Nightscout URL: * `/clock.html` - Shows current BG. Grey text on a black background. @@ -339,7 +359,11 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm An option plugin to enable adding foods from database in Bolus Wizard and enable . ##### `rawbg` (Raw BG) - Calculates BG using sensor and calibration records from and displays an alternate BG values and noise levels. + Calculates BG using sensor and calibration records from and displays an alternate BG values and noise levels. Defaults that can be adjusted with [extended setting](#extended-settings) + * `DISPLAY` (`unsmoothed`) - Allows the user to control which algorithm is used to calculate the displayed raw BG values using the most recent calibration record. + * `unfiltered` - Raw BG is calculated by applying the calibration to the glucose record's unfiltered value. + * `filtered` - Raw BG is calculated by applying the calibration to the glucose record's filtered value. The glucose record's filtered values are generally produced by the CGM by a running average of the unfiltered values to produce a smoothed value when the sensor noise is high. + * `unsmoothed` - Raw BG is calculated by first finding the ratio of the calculated filtered value (the same value calculated by the `filtered` setting) to the reported glucose value. The displayed raw BG value is calculated by dividing the calculated unfiltered value (the same value calculated by the `unfiltered` setting) by the ratio. The effect is to exagerate changes in trend direction so the trend changes are more noticeable to the user. This is the legacy raw BG calculation algorithm. ##### `iob` (Insulin-on-Board) Adds the IOB pill visualization in the client and calculates values that used by other plugins. Uses treatments with insulin doses and the `dia` and `sens` fields from the [treatment profile](#treatment-profile). @@ -376,6 +400,14 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * `IAGE_WARN` (`48`) - If time since last `Insulin Change` matches `IAGE_WARN`, user will be alarmed to to change the insulin reservoir * `IAGE_URGENT` (`72`) - If time since last `Insulin Change` matches `IAGE_URGENT`, user will be issued a persistent warning of overdue change. +##### `bage` (Battery Age) + Calculates the number of days and hours since the last `Pump Battery Change` treatment that was recorded. + * `BAGE_ENABLE_ALERTS` (`false`) - Set to `true` to enable notifications to remind you of upcoming pump battery change. + * `BAGE_DISPLAY` (`days`) - Set to `hours` to display time since last `Pump Battery Change` in hours only. + * `BAGE_INFO` (`312`) - If time since last `Pump Battery Change` matches `BAGE_INFO` hours, user will be warned of upcoming pump battery change (default of 312 hours is 13 days). + * `BAGE_WARN` (`336`) - If time since last `Pump Battery Change` matches `BAGE_WARN` hours, user will be alarmed to to change the pump battery (default of 336 hours is 14 days). + * `BAGE_URGENT` (`360`) - If time since last `Pump Battery Change` matches `BAGE_URGENT` hours, user will be issued a persistent warning of overdue change (default of 360 hours is 15 days). + ##### `treatmentnotify` (Treatment Notifications) Generates notifications when a treatment has been entered and snoozes alarms minutes after a treatment. Default snooze is 10 minutes, and can be set using the `TREATMENTNOTIFY_SNOOZE_MINS` [extended setting](#extended-settings). @@ -459,7 +491,7 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm Some plugins support additional configuration using extra environment variables. These are prefixed with the name of the plugin and a `_`. For example setting `MYPLUGIN_EXAMPLE_VALUE=1234` would make `extendedSettings.exampleValue` available to the `MYPLUGIN` plugin. Plugins only have access to their own extended settings, all the extended settings of client plugins will be sent to the browser. - + * `DEVICESTATUS_ADVANCED` (`true`) - Defaults to true. Users who only have a single device uploading data to Nightscout can set this to false to reduce the data use of the site. #### Pushover @@ -480,29 +512,28 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * `PUSHOVER_ANNOUNCEMENT_KEY` - An optional Pushover user/group key, will be used for system wide user generated announcements. If not defined this will fallback to `PUSHOVER_USER_KEY` or `PUSHOVER_ALARM_KEY`. This also support a space delimited list of keys. To disable Announcement pushes set this to `off`. * `BASE_URL` - Used for pushover callbacks, usually the URL of your Nightscout site, use https when possible. * `API_SECRET` - Used for signing the pushover callback request for acknowledgments. - + If you never want to get info level notifications (treatments) use `PUSHOVER_USER_KEY="off"` If you never want to get an alarm via pushover use `PUSHOVER_ALARM_KEY="off"` If you never want to get an announcement via pushover use `PUSHOVER_ANNOUNCEMENT_KEY="off"` - + If only `PUSHOVER_USER_KEY` is set it will be used for all info notifications, alarms, and announcements - + For testing/development try [localtunnel](http://localtunnel.me/). #### IFTTT Maker - In addition to the normal web based alarms, and pushover, there is also integration for [IFTTT Maker](https://ifttt.com/maker). + In addition to the normal web based alarms, and pushover, there is also integration for [IFTTT Webhooks](https://ifttt.com/maker_webhooks). - With Maker you are able to integrate with all the other [IFTTT Channels](https://ifttt.com/channels). For example you can send a tweet when there is an alarm, change the color of hue light, send an email, send and sms, and so much more. + With Maker you are able to integrate with all the other [IFTTT Services](https://ifttt.com/services). For example you can send a tweet when there is an alarm, change the color of hue light, send an email, send and sms, and so much more. 1. Setup IFTTT account: [login](https://ifttt.com/login) or [create an account](https://ifttt.com/join) - 2. Find your secret key on the [maker page](https://ifttt.com/maker) - 3. Configure Nightscout by setting these environment variables: - * `ENABLE` - `maker` should be added to the list of plugin, for example: `ENABLE="maker"`. - * `MAKER_KEY` - Set this to your secret key that you located in step 2, for example: `MAKER_KEY="abcMyExampleabc123defjt1DeNSiftttmak-XQb69p"` This also support a space delimited list of keys. - * `MAKER_ANNOUNCEMENT_KEY` - An optional Maker key, will be used for system wide user generated announcements. If not defined this will fallback to `MAKER_KEY`. A possible use for this is sending important messages and alarms to a CWD that you don't want to send all notification too. This also support a space delimited list of keys. - 4. [Create a recipe](https://ifttt.com/myrecipes/personal/new) or see [more detailed instructions](lib/plugins/maker-setup.md#create-a-recipe) - - Plugins can create custom events, but all events sent to maker will be prefixed with `ns-`. The core events are: + 2. Follow the [Detailed IFTTT setup Instructions](docs/plugins/maker-setup.md) + 3. Configure Nightscout by setting these webpage environment variables: + * `ENABLE` - `maker` should be added to the list of plugins, for example: `ENABLE="maker"`. + * `MAKER_KEY` - Set this to your secret key (see [[Detailed Instructions](docs/plugins/maker-setup.md) ) `MAKER_KEY="abcMyExampleabc123defjt1DeNSiftttmak-XQb69p"` This also supports a space delimited list of keys. + * `MAKER_ANNOUNCEMENT_KEY` - An optional Maker key, will be used for system wide user generated announcements. If not defined this will fallback to `MAKER_KEY`. A possible use for this is sending important messages and alarms to another device that you don't want to send all notification too. This also support a space delimited list of keys. + + Plugins can create custom events, but all events sent to IFTTT webhooks will be prefixed with `ns-`. The core events are: * `ns-event` - This event is sent to the maker service for all alarms and notifications. This is good catch all event for general logging. * `ns-allclear` - This event is sent to the maker service when an alarm has been ack'd or when the server starts up without triggering any alarms. For example, you could use this event to turn a light to green. * `ns-info` - Plugins that generate notifications at the info level will cause this event to also be triggered. It will be sent in addition to `ns-event`. @@ -577,16 +608,16 @@ License Copyright (C) 2017 Nightscout contributors. See the COPYRIGHT file at the root directory of this distribution and at https://github.com/nightscout/cgm-remote-monitor/blob/master/COPYRIGHT - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . diff --git a/app.js b/app.js index 5fd5f85f254..f6143f1834b 100644 --- a/app.js +++ b/app.js @@ -14,6 +14,39 @@ function create(env, ctx) { var appInfo = env.name + ' ' + env.version; app.set('title', appInfo); app.enable('trust proxy'); // Allows req.secure test on heroku https connections. + var insecureUseHttp = env.insecureUseHttp; + var secureHstsHeader = env.secureHstsHeader; + console.info('Security settings: INSECURE_USE_HTTP=',insecureUseHttp,', SECURE_HSTS_HEADER=',secureHstsHeader); + if (!insecureUseHttp) { + app.use((req, res, next) => { + if (req.header('x-forwarded-proto') !== 'https') + res.redirect(`https://${req.header('host')}${req.url}`); + else + next() + }) + if (secureHstsHeader) { // Add HSTS (HTTP Strict Transport Security) header + const helmet = require('helmet'); + var includeSubDomainsValue = env.secureHstsHeaderIncludeSubdomains; + var preloadValue = env.secureHstsHeaderPreload; + app.use(helmet({ + hsts: { + maxAge: 31536000, + includeSubDomains: includeSubDomainsValue, + preload: preloadValue + } + })) + if (env.secureCsp) { + app.use(helmet.contentSecurityPolicy({ //TODO make NS work without 'unsafe-inline' + directives: { + defaultSrc: ["'self'"], + styleSrc: ["'self'", 'https://fonts.googleapis.com/',"'unsafe-inline'"], + scriptSrc: ["'self'", "'unsafe-inline'"], + fontSrc: [ "'self'", 'https://fonts.gstatic.com/'] + } + })); + } + } + } app.set('view engine', 'ejs'); // this allows you to render .html files as templates in addition to .ejs @@ -84,7 +117,7 @@ function create(env, ctx) { }); }); - app.get("/nightscout.appcache", (req, res) => { + app.get("/appcache/*", (req, res) => { res.render("nightscout.appcache", { locals: app.locals }); @@ -141,7 +174,8 @@ function create(env, ctx) { // serve the static content app.use(staticFiles); - var swaggerFiles = express.static(env.swagger_files, { + const swaggerUiAssetPath = require("swagger-ui-dist").getAbsoluteFSPath(); + var swaggerFiles = express.static(swaggerUiAssetPath, { maxAge: maxAge }); @@ -160,7 +194,6 @@ function create(env, ctx) { console.log('Production environment detected, enabling Minify'); var minify = require('express-minify'); - var myUglifyJS = require('uglify-js'); var myCssmin = require('cssmin'); app.use(minify({ @@ -171,7 +204,6 @@ function create(env, ctx) { stylus_match: /stylus/, coffee_match: /coffeescript/, json_match: /json/, - uglifyJS: myUglifyJS, cssmin: myCssmin, cache: __dirname + '/tmp', onerror: undefined, @@ -208,4 +240,4 @@ function create(env, ctx) { //} return app; } -module.exports = create; \ No newline at end of file +module.exports = create; diff --git a/app.json b/app.json index 17909419c54..4ee2e183495 100644 --- a/app.json +++ b/app.json @@ -2,155 +2,150 @@ "name": "CGM Remote Monitor", "repository": "https://github.com/nightscout/cgm-remote-monitor", "env": { - "MONGO_COLLECTION": { - "description": "REQUIRED: The mongo collection used for CGM data. Default value is 'entries'. Most users should use the default.", - "value": "entries", - "required": true + "ALARM_HIGH": { + "description": "Default setting for new browser views, for the High alarm (triggered when BG crosses BG_TARGET_TOP). ('on' or 'off')", + "value": "on", + "required": false }, - "API_SECRET": { - "description": "REQUIRED: A secret passphrase that must be at least 12 characters long, required to enable POST and PUT; also required for the Care Portal.", - "value": "", - "required": true + "ALARM_LOW": { + "description": "Default setting for new browser views, for the Low alarm (triggered when BG crosses BG_TARGET_BOTTOM). ('on' or 'off')", + "value": "on", + "required": false }, - "DISPLAY_UNITS": { - "description": "Choices: mg/dl and mmol. Setting to mmol puts the entire server into mmol mode by default, no further settings needed.", - "value": "", + "ALARM_TIMEAGO_URGENT": { + "description": "Default setting for new browser views, for an urgent alarm when CGM data hasn't been received in the number of minutes set in ALARM_TIMEAGO_URGENT_MINS. ('on' or 'off')", + "value": "on", "required": false }, - "ENABLE": { - "description": "Used to enable optional features, expects a space delimited list, such as: careportal rawbg iob, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info.", - "value": "", + "ALARM_TIMEAGO_URGENT_MINS": { + "description": "Default setting for new browser views, for the number of minutes since the last CGM reading to trigger an ALARM_TIMEAGO_URGENT alarm.", + "value": "30", "required": false }, - "DISABLE": { - "description": "Used to disable default features, expects a space delimited list, such as: direction upbat, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info.", - "value": "", + "ALARM_TIMEAGO_WARN": { + "description": "Default setting for new browser views, for a warning alarm when CGM data hasn't been received in the number of minutes set in ALARM_TIMEAGO_WARN_MINS. ('on' or 'off')", + "value": "on", + "required": false + }, + "ALARM_TIMEAGO_WARN_MINS": { + "description": "Default setting for new browser views, for the number of minutes since the last CGM reading to trigger an ALARM_TIMEAGO_WARN alarm.", + "value": "15", "required": false }, "ALARM_TYPES": { - "description": "Alarm behavior currently 2 alarm types are supported simple and predict, and can be used independently or combined. The simple alarm type only compares the current BG to BG_ thresholds above, the predict alarm type uses highly tuned formula that forecasts where the BG is going based on it's trend. predict DOES NOT currently use any of the BG_* ENV's", - "value": "", + "description": "'simple' and/or 'predict'. Simple alarms trigger when BG crosses the various thresholds set below. Predict alarms use a formula that forecasts where the BG is going based on its trend. You will *not* get warnings when crossing the BG thresholds set below when using the predict type.", + "value": "simple", "required": false }, - "BG_HIGH": { - "description": "Urgent high BG alarm. Default null value implies 260. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", - "value": "", + "ALARM_URGENT_HIGH": { + "description": "Default setting for new browser views, for the Urgent High alarm (triggered when BG crosses BG_HIGH). ('on' or 'off')", + "value": "on", + "required": false + }, + "ALARM_URGENT_LOW": { + "description": "Default setting for new browser views, for the Urgent Low alarm (triggered when BG crosses BG_LOW). ('on' or 'off')", + "value": "on", "required": false }, - "BG_TARGET_TOP": { - "description": "Non-urgent high BG alarm, the top of your target range. Default null value implies 180. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", + "API_SECRET": { + "description": "A passphrase that must be at least 12 characters long. Avoid 'special' characters, which can cause problems in some cases.", "value": "", + "required": true + }, + "BG_HIGH": { + "description": "Urgent High BG threshold, triggers the ALARM_URGENT_HIGH alarm. Must be set in mg/dL, even if you use mmol/L (multiply a mmol/L value by 18 to change it to mg/dl).", + "value": "260", + "required": false + }, + "BG_LOW": { + "description": "Urgent Low BG threshold, triggers the ALARM_URGENT_LOW alarm. Must be set in mg/dL, even if you use mmol/L (multiply a mmol/L value by 18 to change it to mg/dl).", + "value": "55", "required": false }, "BG_TARGET_BOTTOM": { - "description": "Non urgent low BG alarm, the bottom of your target range. Default null value implies 80. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", - "value": "", + "description": "Low BG threshold, triggers the ALARM_LOW alarm. Must be set in mg/dL, even if you use mmol/L (multiply a mmol/L value by 18 to change it to mg/dl).", + "value": "80", "required": false }, - "BG_LOW": { - "description": "Urgent Low BG alarm. Default null value implies 55. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", - "value": "", + "BG_TARGET_TOP": { + "description": "High BG threshold, triggers the ALARM_HIGH alarm. Must be set in mg/dL, even if you use mmol/L (multiply a mmol/L value by 18 to change it to mg/dl).", + "value": "180", "required": false }, - "PUSHOVER_API_TOKEN": { - "description": "Pushover API token, required for Pushover notifications. Leave blank if not using Pushover.", + "BRIDGE_PASSWORD": { + "description": "Your Dexcom account password, to receive CGM data from the Dexcom Share service. Also make sure to include 'bridge' in your ENABLE line.", "value": "", "required": false }, - "PUSHOVER_USER_KEY": { - "description": "Pushover user key, required for Pushover notifications. Leave blank if not using Pushover.", - "value": "", + "BRIDGE_SERVER": { + "description": "If you are bridging from the Dexcom Share service, and are anywhere *outside* the US, change this to EU. ('US' or 'EU')", + "value": "US", "required": false }, - "PUSHOVER_ANNOUNCEMENT_KEY": { - "description": "An optional Pushover user/group key, will be used for system wide user generated announcements. If not defined this will fallback to `PUSHOVER_USER_KEY`. A possible use for this is sending important messages and alarms to a CWD that you don't want to send all notification too. This also support a space delimited list of keys. Leave blank if not using Pushover", + "BRIDGE_USER_NAME": { + "description": "Your Dexcom account username, to receive CGM data from the Dexcom Share service. Also make sure to include 'bridge' in your ENABLE line.", "value": "", "required": false }, "CUSTOM_TITLE": { - "description": "Customize the name of the website, usually the name of T1.", + "description": "The display name for the Nightscout site. Appears in the upper left of the main view. Often set to the name of the CGM wearer.", "value": "", "required": false }, - "BRIDGE_USER_NAME": { - "description": "Share bridge - Your user name for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge.", + "DISPLAY_UNITS": { + "description": "Preferred BG units for the site:'mg/dl' or 'mmol'. (Note that it is *not* 'mmol/L')", + "value": "mg/dl", + "required": false + }, + "ENABLE": { + "description": "Plugins to enable for your site. Must be a space-delimited, lower-case list. Include the word 'bridge' here if you are receiving data from the Dexcom Share service. Include 'mmconnect' if you are bridging from the MiniMed CareLink service.", + "value": "careportal basal", + "required": false + }, + "MMCONNECT_USER_NAME": { + "description": "Your CareLink account username, to receive CGM data from the CareLink service. Also make sure to include 'mmconnect' in your ENABLE line.", "value": "", "required": false }, - "BRIDGE_PASSWORD": { - "description": "Share bridge - Your password for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge.", + "MMCONNECT_PASSWORD": { + "description": "Your CareLink account password, to receive CGM data from the CareLink service. Also make sure to include 'mmconnect' in your ENABLE line.", "value": "", "required": false }, - "TIME_FORMAT": { - "description": "Browser default time mode. Valid settings are 12 or 24", - "value": "12", - "required": false + "MMCONNECT_SERVER": { + "description": "If you are bridging from the CareLink service, and are anywhere *outside* the US, change this to EU. ('US' or 'EU')", + "value": "US", + "required": false + }, + "MONGO_COLLECTION": { + "description": "The Mongo collection where CGM data is stored.", + "value": "entries", + "required": true }, "NIGHT_MODE": { - "description": "Browser defaults to night mode. Valid settings are on or off", + "description": "Default setting for new browser views, for whether Night Mode should be enabled. ('on' or 'off')", "value": "off", "required": false }, + "SHOW_PLUGINS": { + "description": "Default setting for whether or not these plugins are checked (active) by default, not merely enabled. Include plugins here as in the ENABLE line; space-separated and lower-case.", + "value": "careportal", + "required": false + }, "SHOW_RAWBG": { - "description": "Browser default raw display mode. Valid settings are always, never, or noise", + "description": "Default setting for new browser views, for the display of raw CGM data (if available). ('always', 'never', or 'noise')", "value": "never", "required": false }, "THEME": { - "description": "Browser default theme setting. Valid settings are default, colors, or colorblindfriendly", - "value": "default", + "description": "Default setting for new browser views, for the color theme of the CGM graph. ('default', 'colors', or 'colorblindfriendly')", + "value": "colors", "required": false }, - "ALARM_URGENT_HIGH": { - "description": "Browser default urgent high alarm enabled. Valid settings are on or off", - "value": "on", + "TIME_FORMAT": { + "description": "Default setting for new browser views, for the time mode. ('12' or '24')", + "value": "12", "required": false - }, - "ALARM_HIGH": { - "description": "Browser default high alarm enabled. Valid settings are on or off", - "value": "on", - "required": false - }, - "ALARM_LOW": { - "description": "Browser default low alarm enabled. Valid settings are on or off", - "value": "on", - "required": false - }, - "ALARM_URGENT_LOW": { - "description": "Browser default urgent low alarm enabled. Valid settings are on or off", - "value": "on", - "required": false - }, - "ALARM_TIMEAGO_WARN": { - "description": "Browser default warn after time of last data exceeds ALARM_TIMEAGO_WARN_MINS alarm enabled. Valid settings are on or off", - "value": "on", - "required": false - }, - "ALARM_TIMEAGO_WARN_MINS": { - "description": "Browser default minutes since the last reading to trigger a warning.", - "value": "15", - "required": false - }, - "ALARM_TIMEAGO_URGENT": { - "description": "Browser default urgent warning after time of last data exceeds ALARM_TIMEAGO_URGENT_MINS alarm enabled. Valid settings are on or off", - "value": "on", - "required": false - }, - "ALARM_TIMEAGO_URGENT_MINS": { - "description": "Browser default minutes since last reading to trigger an urgent alarm.", - "value": "30", - "required": false - }, - "MAKER_KEY": { - "description": "Maker Key - Set this to your secret key Note for additional info see https://github.com/nightscout/cgm-remote-monitor/blob/dev/README.md#ifttt-maker , maker should be added to enable if you want to use maker, Leave blank if not using maker", - "value": "", - "required": false - }, - "MAKER_ANNOUNCEMENT_KEY": { - "description": "Maker Announcement Key - Set this to your secret key for announcements Note for additional info see https://github.com/nightscout/cgm-remote-monitor/blob/dev/README.md#ifttt-maker , maker should be added to enable if you want to use maker Leave blank if not using maker", - "value": "", - "required": false } }, "addons": [ diff --git a/bundle/index.js b/bundle/index.js deleted file mode 100644 index 2b37869c95b..00000000000 --- a/bundle/index.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -var browserify_express = require('browserify-express'); - -function bundle(env) { - return browserify_express({ - entry: __dirname + '/bundle.source.js', - watch: __dirname + '/../lib/', - mount: '/public/js/bundle.js', - verbose: true, - minify: env.debug.minify, - bundle_opts: { debug: true }, // enable inline sourcemap on js files - write_file: __dirname + '/bundle.out.js' - }); -} - -module.exports = bundle; diff --git a/lib/plugins/alexa-plugin.md b/docs/plugins/alexa-plugin.md similarity index 90% rename from lib/plugins/alexa-plugin.md rename to docs/plugins/alexa-plugin.md index ab2c897c66e..a5dcb886e9c 100644 --- a/lib/plugins/alexa-plugin.md +++ b/docs/plugins/alexa-plugin.md @@ -1,3 +1,24 @@ + + +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [Nightscout Alexa Plugin](#nightscout-alexa-plugin) + - [Overview](#overview) + - [Activate the Nightscout Alexa Plugin](#activate-the-nightscout-alexa-plugin) + - [Create Your Alexa Skill](#create-your-alexa-skill) + - [Get an Amazon Developer account](#get-an-amazon-developer-account) + - [Create a new Alexa skill](#create-a-new-alexa-skill) + - [Define the interaction model](#define-the-interaction-model) + - [Point your skill at your site](#point-your-skill-at-your-site) + - [Test your skill out with the test tool](#test-your-skill-out-with-the-test-tool) + - [What questions can you ask it?](#what-questions-can-you-ask-it) + - [Activate the skill on your Echo or other device](#activate-the-skill-on-your-echo-or-other-device) + - [Adding Alexa support to a plugin](#adding-alexa-support-to-a-plugin) + - [Intent Handlers](#intent-handlers) + - [Rollup handlers](#rollup-handlers) + + + Nightscout Alexa Plugin ====================================== @@ -14,6 +35,7 @@ To add Alexa support for a plugin, [check this out](#adding-alexa-support-to-a-p 1. Your Nightscout site needs to be new enough that it supports the `alexa` plugin. It needs to be [version 0.9.1 (Grilled Cheese)](https://github.com/nightscout/cgm-remote-monitor/releases/tag/0.9.1) or later. See [updating my version](https://github.com/nightscout/cgm-remote-monitor#updating-my-version) if you need a newer version. 1. Add `alexa` to the list of plugins in your `ENABLE` setting. ([Environment variables](https://github.com/nightscout/cgm-remote-monitor#environment) are set in the configuration section for your monitor. Typically Azure, Heroku, etc.) +1. The Alexa plugin pulls its units preferences from your site's defaults. If you don't have a `DISPLAY_UNITS` entry, it will default to `mg/dl`. If you want it to use mmol/L, make sure you have a `DISPLAY_UNITS` line, and set it to `mmol` (*not* `mmol/l`). ## Create Your Alexa Skill diff --git a/docs/plugins/maker-setup-images/action_search.jpg b/docs/plugins/maker-setup-images/action_search.jpg new file mode 100644 index 00000000000..b3b85b0b7c1 Binary files /dev/null and b/docs/plugins/maker-setup-images/action_search.jpg differ diff --git a/docs/plugins/maker-setup-images/blue_that.jpg b/docs/plugins/maker-setup-images/blue_that.jpg new file mode 100644 index 00000000000..6a52475bcb1 Binary files /dev/null and b/docs/plugins/maker-setup-images/blue_that.jpg differ diff --git a/docs/plugins/maker-setup-images/config_vars_enable.jpg b/docs/plugins/maker-setup-images/config_vars_enable.jpg new file mode 100644 index 00000000000..508464f156c Binary files /dev/null and b/docs/plugins/maker-setup-images/config_vars_enable.jpg differ diff --git a/docs/plugins/maker-setup-images/config_vars_maker.jpg b/docs/plugins/maker-setup-images/config_vars_maker.jpg new file mode 100644 index 00000000000..fdb8765f836 Binary files /dev/null and b/docs/plugins/maker-setup-images/config_vars_maker.jpg differ diff --git a/docs/plugins/maker-setup-images/maker_key.jpg b/docs/plugins/maker-setup-images/maker_key.jpg new file mode 100644 index 00000000000..8e570032762 Binary files /dev/null and b/docs/plugins/maker-setup-images/maker_key.jpg differ diff --git a/docs/plugins/maker-setup-images/notification_message.jpg b/docs/plugins/maker-setup-images/notification_message.jpg new file mode 100644 index 00000000000..3db0278bc69 Binary files /dev/null and b/docs/plugins/maker-setup-images/notification_message.jpg differ diff --git a/docs/plugins/maker-setup-images/service_search.jpg b/docs/plugins/maker-setup-images/service_search.jpg new file mode 100644 index 00000000000..49910be5e06 Binary files /dev/null and b/docs/plugins/maker-setup-images/service_search.jpg differ diff --git a/docs/plugins/maker-setup-images/service_settings_search.jpg b/docs/plugins/maker-setup-images/service_settings_search.jpg new file mode 100644 index 00000000000..2db00726482 Binary files /dev/null and b/docs/plugins/maker-setup-images/service_settings_search.jpg differ diff --git a/docs/plugins/maker-setup-images/set_trigger.jpg b/docs/plugins/maker-setup-images/set_trigger.jpg new file mode 100644 index 00000000000..27884f8ac04 Binary files /dev/null and b/docs/plugins/maker-setup-images/set_trigger.jpg differ diff --git a/docs/plugins/maker-setup-images/webhooks_settings.jpg b/docs/plugins/maker-setup-images/webhooks_settings.jpg new file mode 100644 index 00000000000..e94f4485c43 Binary files /dev/null and b/docs/plugins/maker-setup-images/webhooks_settings.jpg differ diff --git a/docs/plugins/maker-setup.md b/docs/plugins/maker-setup.md new file mode 100644 index 00000000000..831e9e05c4d --- /dev/null +++ b/docs/plugins/maker-setup.md @@ -0,0 +1,107 @@ +**Table of Contents** + +- [Nightscout/IFTTT Maker](#nightscoutifttt-maker) + - [Overview](#overview) + - [Events](#events) + - [Creating an Applet](#creating-an-applet) + - [1. Choose a Service](#1.-Choose-a-Service) + - [2. Choose a Trigger](#2.-Choose-a-Trigger) + - [3. Complete the Trigger field](#3.-Complete-the-Trigger-field) + - [4. Create an Action](#4.-Create-an-Action) + - [5. Complete Action Fields](#5.-Complete-Action-Fields) + - [6. Review and Finish](#6.-Review-and-Finish) + - [7. Get your Maker Key](#7.-Get-your-Maker-Key) + - [8. Configure your Nightscout site](#8.-Configure-your-Nightscout-site) + - [9. Configure the IFTTT mobile app](#9.-Configure-the-IFTTT-mobile-app) + +Nightscout/IFTTT Maker +====================================== + +## Overview + +In addition to Nightscout's web-based alarms, your site can also trigger push notifications (or other actions) through the [IFTTT Maker](https://ifttt.com/maker) service. With Maker you are able to integrate with all the other [IFTTT Services](https://ifttt.com/channels). For example, you can send a tweet when there is an alarm, change the color of a smart light, send an email, send a text, and much more. + +#### Note: There have been some recent reports of the IFTTT service delaying Nightscout alarms. Be sure to test your implementation before relying solely on its alerts. [Pushover](https://github.com/nightscout/cgm-remote-monitor/blob/dev/README.md#pushover) is an alternate push notification service that might be worth considering as well. + +## Events + + Plugins can create custom events, but all events sent to Maker will be prefixed with `ns-`. The core events are: + + * `ns-event` - This event is sent on *all* alarms and notifications. This is good catch-all event for general logging. + * `ns-allclear` - This event is sent when an alarm has been acknowledged or when the server starts up without triggering any alarms. (For example, you could use this event to turn a light to green.) + * `ns-info` - All notifications at the `info` level will cause this event to be triggered. + * `ns-warning` - All notifications at the `warning` level will cause this event to be triggered. + * `ns-urgent` - All notifications at the `urgent` level will cause this event to be triggered. + * `ns-warning-high` - This event is triggered when crossing the `BG_TARGET_TOP` threshold. + * `ns-urgent-high` - This event is triggered when crossing the `BG_HIGH` threshold. + * `ns-warning-low` - This event is triggered when crossing the `BG_TARGET_BOTTOM` threshold. + * `ns-urgent-low` - This event is triggered when crossing the `BG_LOW` threshold. + * `ns-info-treatmentnotify` - This event is triggered when a treatment is entered into the `careportal`. + * `ns-warning-bwp` - This event is triggered when the `bwp` plugin generates a warning alarm. + * `ns-urgent-bwp` - This event is triggered when the `bwp` plugin generates an urgent alarm. + +## Creating an Applet +Set up an [IFTTT](https://ifttt.com/) account, and log into it. + +### 1. Choose a Service +On the "My Applets" page, click "New Applet", then click the blue `+this`. Search for "webhooks" among the services, and click it. + +![service_search](./maker-setup-images/service_search.jpg) + +### 2. Choose a Trigger +Click on the "Receive a web request" box. + +### 3. Complete the Trigger field +Enter one of the Nightscout events listed above (like `ns-urgent-low`), and click "Create Trigger". + +![set_trigger](./maker-setup-images/set_trigger.jpg) + +### 4. Create an Action +Click on the blue `+that`. + +![blue_that](./maker-setup-images/blue_that.jpg) + +Search for the action you'd like this event to trigger. In this example, we'll choose the `Notifications` action to send a push notification. + +![action_search](./maker-setup-images/action_search.jpg) + +Choose the "Send a notification from the IFTTT app" action type for a basic push alert. You can experiment with the "rich" notifications later. + +### 5. Complete Action Fields +Enter the message that will display in this push notification. In this example, it was triggered on an `ns-urgent-low`, so we'll write something like "Urgent Low!". We can also display the current BG by including the `Value2` ingredient (via the "Add ingredient" button). + +Click the "Create action" button when you're done. + +![notification_message](./maker-setup-images/notification_message.jpg) + +### 6. Review and Finish +Click the "Finish" button if your applet looks good. + +### 7. Get your Maker Key + +Click on "My Applets" in the main menu, then click the "Services" tab, then search for "Webhooks" and select it. + +![service_settings_search](./maker-setup-images/service_settings_search.jpg) + +Go to the `Settings` for this service, in the upper right. + +![webhooks_settings](./maker-setup-images/webhooks_settings.jpg) + +The string of characters at the end of the URL here is your `MAKER_KEY`. Copy it from there, so we can paste it into your Config Vars. + +![maker_key](./maker-setup-images/maker_key.jpg) + +### 8. Configure your Nightscout site +From your [Heroku dashboard](https://dashboard.heroku.com), go to your app's Settings page, then click the "Reveal Config Vars" button. Find the `MAKER_KEY` entry, and edit its value, pasting in your Maker Key. If you don't already have a `MAKER_KEY` line, add it to the bottom of the list. + +![config_vars_maker](./maker-setup-images/config_vars_maker.jpg) + +Find your `ENABLE` line, and add `maker` to the list of enabled plugins. + +![config_vars_enable](./maker-setup-images/config_vars_enable.jpg) + +### 9. Configure the IFTTT mobile app +That's all of the services complete. In order to receive push notifications on a mobile device, you'll need to have the IFTTT app installed and logged into the same account you set up the actions in. + +To add more alerts for different events, just create a new applet for each trigger. + diff --git a/env.js b/env.js index d6d1f89d0cd..808b18fd9ff 100644 --- a/env.js +++ b/env.js @@ -25,7 +25,6 @@ function config ( ) { env.HOSTNAME = readENV('HOSTNAME', null); env.IMPORT_CONFIG = readENV('IMPORT_CONFIG', null); env.static_files = readENV('NIGHTSCOUT_STATIC_FILES', __dirname + '/static/'); - env.swagger_files = readENV('NIGHTSCOUT_SWAGGER_FILES', __dirname + '/node_modules/swagger-ui-dist/'); env.debug = { minify: readENVTruthy('DEBUG_MINIFY', true) }; @@ -56,6 +55,13 @@ function setSSL() { env.ca = fs.readFileSync(env.SSL_CA); } } + + env.insecureUseHttp = readENVTruthy("INSECURE_USE_HTTP", false); + env.secureHstsHeader = readENVTruthy("SECURE_HSTS_HEADER", true); + env.secureHstsHeaderIncludeSubdomains = readENVTruthy("SECURE_HSTS_HEADER_INCLUDESUBDOMAINS", false); + env.secureHstsHeaderPreload= readENVTruthy("SECURE_HSTS_HEADER_PRELOAD", false); + env.secureCsp = readENVTruthy("SECURE_CSP", false); + } // A little ugly, but we don't want to read the secret into a var @@ -92,20 +98,6 @@ function setVersion() { function setStorage() { env.storageURI = readENV('STORAGE_URI') || readENV('MONGO_CONNECTION') || readENV('MONGO') || readENV('MONGOLAB_URI') || readENV('MONGODB_URI'); env.entries_collection = readENV('ENTRIES_COLLECTION') || readENV('MONGO_COLLECTION', 'entries'); - env.MQTT_MONITOR = readENV('MQTT_MONITOR', null); - if (env.MQTT_MONITOR) { - var hostDbCollection = [env.storageURI.split('mongodb://').pop().split('@').pop(), env.entries_collection].join('/'); - var mongoHash = crypto.createHash('sha1'); - mongoHash.update(hostDbCollection); - //some MQTT servers only allow the client id to be 23 chars - env.mqtt_client_id = mongoHash.digest('base64').substring(0, 23); - console.info('Using Mongo host/db/collection to create the default MQTT client_id', hostDbCollection); - if (env.MQTT_MONITOR.indexOf('?clientId=') === -1) { - console.info('Set MQTT client_id to: ', env.mqtt_client_id); - } else { - console.info('MQTT configured to use a custom client id, it will override the default: ', env.mqtt_client_id); - } - } env.authentication_collections_prefix = readENV('MONGO_AUTHENTICATION_COLLECTIONS_PREFIX', 'auth_'); env.treatments_collection = readENV('MONGO_TREATMENTS_COLLECTION', 'treatments'); env.profile_collection = readENV('MONGO_PROFILE_COLLECTION', 'profile'); @@ -159,7 +151,8 @@ function readENV(varName, defaultValue) { function readENVTruthy(varName, defaultValue) { var value = readENV(varName, defaultValue); if (typeof value === 'string' && (value.toLowerCase() === 'on' || value.toLowerCase() === 'true')) { value = true; } - if (typeof value === 'string' && (value.toLowerCase() === 'off' || value.toLowerCase() === 'false')) { value = false; } + else if (typeof value === 'string' && (value.toLowerCase() === 'off' || value.toLowerCase() === 'false')) { value = false; } + else { value=defaultValue } return value; } @@ -193,6 +186,6 @@ function findExtendedSettings (envs) { } }); return extended; -} + } module.exports = config; diff --git a/lib/admin_plugins/cleanentriesdb.js b/lib/admin_plugins/cleanentriesdb.js new file mode 100644 index 00000000000..3793eef8ffd --- /dev/null +++ b/lib/admin_plugins/cleanentriesdb.js @@ -0,0 +1,80 @@ +'use strict'; + +var moment = require('moment'); + +var cleanentriesdb = { + name: 'cleanentriesdb' + , label: 'Clean Mongo entries (glucose entries) database' + , pluginType: 'admin' +}; + +function init() { + return cleanentriesdb; +} + +module.exports = init; + +cleanentriesdb.actions = [ + { + name: 'Delete all documents from entries collection older than 180 days' + , description: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + , buttonLabel: 'Delete old documents' + , confirmText: 'Delete old documents from entries collection?' + , preventClose: true + } + ]; + +cleanentriesdb.actions[0].init = function init(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleanentriesdb.name + '_0_status'); + + $status.hide(); + + var numDays = '
' + + ''; + + $('#admin_' + cleanentriesdb.name + '_0_html').html(numDays); + + if (callback) { callback(); } +}; + +cleanentriesdb.actions[0].code = function deleteOldRecords(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleanentriesdb.name + '_0_status'); + var numDays = Number($('#admin_entries_days').val()); + + if (isNaN(numDays) || (numDays < 3)) { + alert(translate('%1 is not a valid number - must be more than 2', { params: [$('#admin_entries_days').val()] })); + if (callback) { callback(); } + return; + } + var endDate = moment().subtract(numDays, 'days'); + + if (!client.hashauth.isAuthenticated()) { + alert(translate('Your device is not authenticated yet')); + if (callback) { + callback(); + } + return; + } + + $status.hide().text(translate('Deleting records ...')).fadeIn('slow'); + $.ajax('/api/v1/entries/?find[date][$lte]=' + endDate.valueOf(), { + method: 'DELETE' + , headers: client.headers() + , success: function (retVal) { + $status.hide().text(translate('%1 records deleted',{ params: [retVal.n] })).fadeIn('slow'); + } + , error: function () { + $status.hide().text(translate('Error')).fadeIn('slow'); + } + }).done(function success () { + if (callback) { callback(); } + }).fail(function fail() { + if (callback) { callback(); } + }); + +}; diff --git a/lib/admin_plugins/cleanstatusdb.js b/lib/admin_plugins/cleanstatusdb.js index 4769a724789..b3e3032c8fe 100644 --- a/lib/admin_plugins/cleanstatusdb.js +++ b/lib/admin_plugins/cleanstatusdb.js @@ -1,5 +1,7 @@ 'use strict'; +var moment = require('moment'); + var cleanstatusdb = { name: 'cleanstatusdb' , label: 'Clean Mongo status database' @@ -19,6 +21,13 @@ cleanstatusdb.actions = [ , buttonLabel: 'Delete all documents' , confirmText: 'Delete all documents from devicestatus collection?' } + , { + name: 'Delete all documents from devicestatus collection older than 30 days' + , description: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + , buttonLabel: 'Delete old documents' + , confirmText: 'Delete old documents from devicestatus collection?' + , preventClose: true + } ]; cleanstatusdb.actions[0].init = function init(client, callback) { @@ -67,3 +76,58 @@ cleanstatusdb.actions[0].code = function deleteRecords(client, callback) { } }); }; + +cleanstatusdb.actions[1].init = function init(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleanstatusdb.name + '_1_status'); + + $status.hide(); + + var numDays = '
' + + ''; + + $('#admin_' + cleanstatusdb.name + '_1_html').html(numDays); + + if (callback) { callback(); } +}; + +cleanstatusdb.actions[1].code = function deleteOldRecords(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleanstatusdb.name + '_1_status'); + var numDays = Number($('#admin_devicestatus_days').val()); + + if (isNaN(numDays) || (numDays < 1)) { + alert(translate('%1 is not a valid number', { params: [$('#admin_devicestatus_days').val()] })); + if (callback) { callback(); } + return; + } + var endDate = moment().subtract(numDays, 'days'); + var dateStr = endDate.format('YYYY-MM-DD'); + + if (!client.hashauth.isAuthenticated()) { + alert(translate('Your device is not authenticated yet')); + if (callback) { + callback(); + } + return; + } + + $status.hide().text(translate('Deleting records ...')).fadeIn('slow'); + $.ajax('/api/v1/devicestatus/?find[created_at][$lte]=' + dateStr, { + method: 'DELETE' + , headers: client.headers() + , success: function (retVal) { + $status.text(translate('%1 records deleted',{ params: [retVal.n] })); + } + , error: function () { + $status.hide().text(translate('Error')).fadeIn('slow'); + } + }).done(function success () { + if (callback) { callback(); } + }).fail(function fail() { + if (callback) { callback(); } + }); +}; diff --git a/lib/admin_plugins/cleantreatmentsdb.js b/lib/admin_plugins/cleantreatmentsdb.js new file mode 100644 index 00000000000..a8cc725fd82 --- /dev/null +++ b/lib/admin_plugins/cleantreatmentsdb.js @@ -0,0 +1,81 @@ +'use strict'; + +var moment = require('moment'); + +var cleantreatmentsdb = { + name: 'cleantreatmentsdb' + , label: 'Clean Mongo treatments database' + , pluginType: 'admin' +}; + +function init() { + return cleantreatmentsdb; +} + +module.exports = init; + +cleantreatmentsdb.actions = [ + { + name: 'Delete all documents from treatments collection older than 180 days' + , description: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + , buttonLabel: 'Delete old documents' + , confirmText: 'Delete old documents from treatments collection?' + , preventClose: true + } + ]; + +cleantreatmentsdb.actions[0].init = function init(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleantreatmentsdb.name + '_0_status'); + + $status.hide(); + + var numDays = '
' + + ''; + + $('#admin_' + cleantreatmentsdb.name + '_0_html').html(numDays); + + if (callback) { callback(); } +}; + +cleantreatmentsdb.actions[0].code = function deleteOldRecords(client, callback) { + var translate = client.translate; + var $status = $('#admin_' + cleantreatmentsdb.name + '_0_status'); + var numDays = Number($('#admin_treatments_days').val()); + + if (isNaN(numDays) || (numDays < 3)) { + alert(translate('%1 is not a valid number - must be more than 2', { params: [$('#admin_treatments_days').val()] })); + if (callback) { callback(); } + return; + } + var endDate = moment().subtract(numDays, 'days'); + var dateStr = endDate.format('YYYY-MM-DD'); + + if (!client.hashauth.isAuthenticated()) { + alert(translate('Your device is not authenticated yet')); + if (callback) { + callback(); + } + return; + } + + $status.hide().text(translate('Deleting records ...')).fadeIn('slow'); + $.ajax('/api/v1/treatments/?find[created_at][$lte]=' + dateStr, { + method: 'DELETE' + , headers: client.headers() + , success: function (retVal) { + $status.hide().text(translate('%1 records deleted',{ params: [retVal.n] })).fadeIn('slow'); + } + , error: function () { + $status.hide().text(translate('Error')).fadeIn('slow'); + } + }).done(function success () { + if (callback) { callback(); } + }).fail(function fail() { + if (callback) { callback(); } + }); + +}; diff --git a/lib/admin_plugins/index.js b/lib/admin_plugins/index.js index c6463ecca8e..224054538d1 100644 --- a/lib/admin_plugins/index.js +++ b/lib/admin_plugins/index.js @@ -8,6 +8,8 @@ function init() { require('./subjects')() , require('./roles')() , require('./cleanstatusdb')() + , require('./cleantreatmentsdb')() + , require('./cleanentriesdb')() , require('./futureitems')() ]; @@ -84,4 +86,4 @@ function init() { } -module.exports = init; \ No newline at end of file +module.exports = init; diff --git a/lib/api/devicestatus/index.js b/lib/api/devicestatus/index.js index 9d6fc1bfce7..5c665b1ffc5 100644 --- a/lib/api/devicestatus/index.js +++ b/lib/api/devicestatus/index.js @@ -43,17 +43,52 @@ function configure (app, wares, ctx) { api.post('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:create'), doPost); - // delete record - api.delete('/devicestatus/:_id', ctx.authorization.isPermitted('api:devicestatus:delete'), function(req, res) { - ctx.devicestatus.remove(req.params._id, function (err, removed) { + /** + * @function delete_records + * Delete devicestatus. The query logic works the same way as find/list. This + * endpoint uses same search logic to remove records from the database. + */ + function delete_records(req, res, next) { + var query = req.query; + if (!query.count) { + query.count = 10 + } + + console.log('Delete records with query: ', query); + + // remove using the query + ctx.devicestatus.remove(query, function(err, stat) { if (err) { - res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err); - } else { - res.json(removed); + console.log('devicestatus delete error: ', err); + return next(err); } + // yield some information about success of operation + res.json(stat); + + console.log('devicestatus records deleted'); + + return next(); }); - }); + } + + api.delete('/devicestatus/:id', ctx.authorization.isPermitted('api:devicestatus:delete'), function(req, res, next) { + if (!req.query.find) { + req.query.find = { + _id: req.params.id + }; + } else { + req.query.find._id = req.params.id; + } + + if (req.query.find._id === '*') { + // match any record id + delete req.query.find._id; + } + next(); + }, delete_records); + // delete record that match query + api.delete('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:delete'), delete_records); } if (app.enabled('api') || true /*TODO: auth disabled for quick UI testing...*/) { diff --git a/lib/api/entries/index.js b/lib/api/entries/index.js index 691cba7ecc0..6c1e873da7f 100644 --- a/lib/api/entries/index.js +++ b/lib/api/entries/index.js @@ -7,14 +7,13 @@ var _includes = require('lodash/includes'); var consts = require('../../constants'); var es = require('event-stream'); -var sgvdata = require('sgvdata'); var expand = require('expand-braces'); var ID_PATTERN = /^[a-f\d]{24}$/; function isId(value) { - //TODO: why did we need tht length check? - return value && ID_PATTERN.test(value) && value.length === 24; + //TODO: why did we need tht length check? + return value && ID_PATTERN.test(value) && value.length === 24; } /** @@ -32,481 +31,490 @@ function isId(value) { * configured. */ function configure(app, wares, ctx) { - // default storage biased towards entries. - var entries = ctx.entries; - var express = require('express'), - api = express.Router(); - - // invoke common middleware - api.use(wares.sendJSONStatus); - // text body types get handled as raw buffer stream - api.use(wares.bodyParser.raw()); - // json body types get handled as parsed json - api.use(wares.bodyParser.json()); - // shortcut to use extension to specify output content-type - api.use(wares.extensions([ + // default storage biased towards entries. + var entries = ctx.entries; + var express = require('express') + , api = express.Router(); + + // invoke common middleware + api.use(wares.sendJSONStatus); + // text body types get handled as raw buffer stream + api.use(wares.bodyParser.raw()); + // json body types get handled as parsed json + api.use(wares.bodyParser.json()); + // shortcut to use extension to specify output content-type + api.use(wares.extensions([ 'json', 'svg', 'csv', 'txt', 'png', 'html', 'tsv' ])); - // also support url-encoded content-type - api.use(wares.bodyParser.urlencoded({ - extended: true - })); - - api.use(ctx.authorization.isPermitted('api:entries:read')); + // also support url-encoded content-type + api.use(wares.bodyParser.urlencoded({ + extended: true + })); + + api.use(ctx.authorization.isPermitted('api:entries:read')); + /** + * @method force_typed_data + * @returns {Stream} Creates a through stream which validates that all + * elements on the stream have a `type` field. + * Generate a stream that ensures elements have a `type` field. + */ + function force_typed_data(opts) { /** - * @method force_typed_data - * @returns {Stream} Creates a through stream which validates that all - * elements on the stream have a `type` field. - * Generate a stream that ensures elements have a `type` field. + * @function sync + * Iterate over every element in the stream, enforcing some data type. */ - function force_typed_data(opts) { - /** - * @function sync - * Iterate over every element in the stream, enforcing some data type. - */ - function sync(data, next) { - // if element has no data type, but we know what the type should be - if (!data.type && opts.type) { - // bless absence with known type - data.type = opts.type; - } - // continue control flow to next element in the stream - next(null, data); - } - // return configured stream - return es.map(sync); + function sync(data, next) { + // if element has no data type, but we know what the type should be + if (!data.type && opts.type) { + // bless absence with known type + data.type = opts.type; + } + // continue control flow to next element in the stream + next(null, data); } + // return configured stream + return es.map(sync); + } - // check for last modified from in-memory data - - function ifModifiedSinceCTX(req, res, next) { + // check for last modified from in-memory data - var lastEntry = _last(ctx.ddata.sgvs); - var lastEntryDate = null; - - if (!_isNil(lastEntry)) { - lastEntryDate = new Date(_last(ctx.ddata.sgvs).mills); - res.setHeader('Last-Modified', lastEntryDate.toUTCString()); - } + function ifModifiedSinceCTX(req, res, next) { - var ifModifiedSince = req.get('If-Modified-Since'); - if (!ifModifiedSince) { - return next(); - } - - console.log("CGM Entry request with If-Modified-Since: ", ifModifiedSince); - - if (lastEntryDate.getTime() <= new Date(ifModifiedSince).getTime()) { - res.status(304).send({ - status: 304, - message: 'Not modified', - type: 'internal' - }); - return; - } + var lastEntry = _last(ctx.ddata.sgvs); + var lastEntryDate = null; - return next(); + if (!_isNil(lastEntry)) { + lastEntryDate = new Date(_last(ctx.ddata.sgvs).mills); + res.setHeader('Last-Modified', lastEntryDate.toUTCString()); } - /** - * @method format_entries - * A final middleware to send payloads assembled by previous middlewares - * out to the http client. - * We expect a payload to be attached to `res.entries`. - // Middleware to format any response involving entries. - */ - function format_entries(req, res) { - // deduce what type of records we might expect - var type_params = { - type: (req.query && req.query.find && req.query.find.type && - req.query.find.type !== req.params.model) ? - req.query.find.type : req.params.model - }; - // prepare a stream of elements from some prepared payload - var output = es.readArray(res.entries || []); - // on other hand, if there's been some error, report that - if (res.entries_err) { - return res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', res.entries_err); - } - - // IF-Modified-Since support - - function compare(a, b) { - var a_field = a.mills ? a.mills : a.date; - var b_field = b.mills ? b.mills : b.date; - - if (a_field > b_field) - return -1; - if (a_field < b_field) - return 1; - return 0; - } - - res.entries.sort(compare); + var ifModifiedSince = req.get('If-Modified-Since'); + if (!ifModifiedSince) { + return next(); + } - var lastEntry = _first(res.entries); - var lastEntryDate = null; + console.log('CGM Entry request with If-Modified-Since: ', ifModifiedSince); - if (!_isNil(lastEntry)) { - if (lastEntry.mills) lastEntryDate = new Date(lastEntry.mills); - if (!lastEntry.mills && lastEntry.date) lastEntryDate = new Date(lastEntry.date); - res.setHeader('Last-Modified', lastEntryDate.toUTCString()); - } + if (lastEntryDate.getTime() <= new Date(ifModifiedSince).getTime()) { + console.log('Sending Not Modified'); + res.status(304).send({ + status: 304 + , message: 'Not modified' + , type: 'internal' + }); + return; + } - var ifModifiedSince = req.get('If-Modified-Since'); + return next(); + } + + /** + * @method format_entries + * A final middleware to send payloads assembled by previous middlewares + * out to the http client. + * We expect a payload to be attached to `res.entries`. + // Middleware to format any response involving entries. + */ + function format_entries(req, res) { + // deduce what type of records we might expect + var type_params = { + type: (req.query && req.query.find && req.query.find.type && + req.query.find.type !== req.params.model) ? + req.query.find.type : req.params.model + }; + // prepare a stream of elements from some prepared payload + var output = es.readArray(res.entries || []); + // on other hand, if there's been some error, report that + if (res.entries_err) { + return res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', res.entries_err); + } - console.log('If-Modified-Since: ' + new Date(ifModifiedSince) + ' Last-Modified', lastEntryDate); + // IF-Modified-Since support - if (lastEntryDate !== null && ifModifiedSince !== null && lastEntryDate.getTime() <= new Date(ifModifiedSince).getTime()) { - res.status(304).send({ - status: 304, - message: 'Not modified', - type: 'internal' - }); - return; - } + function compare(a, b) { + var a_field = a.mills ? a.mills : a.date; + var b_field = b.mills ? b.mills : b.date; - // if no error, format the payload - // The general pattern here is to create an output stream that reformats - // the data correctly into the desired representation. - // The stream logic allows some streams to ensure that some basic rules, - // such as enforcing a type property to exist, are followed. - return res.format({ - text: function() { - res.set('Content-Type', 'text/plain'); - // sgvdata knows how to format sgv entries as text - es.pipeline(output, sgvdata.format(), es.writeArray(function(err, out) { - res.send(out.join('')); - })); - }, - csv: function() { - // sgvdata knows how to format sgv entries as text - res.set('Content-Type', 'text/plain'); - var csvpipe = require('sgvdata/lib/text')({ - format: ',', - parse: /[\t,]/ - }); - es.pipeline( - output, sgvdata.mapper(csvpipe.format), es.join('\n'), es.writeArray(function(err, out) { - res.send(out.join('')); - }) - ); - }, - json: function() { - // so long as every element has a `type` field, and some kind of - // date, we'll consider it valid - es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { - res.json(out); - })); - } - }); + if (a_field > b_field) + return -1; + if (a_field < b_field) + return 1; + return 0; } - /** - * @method insert_entries - * middleware to process "uploads" of sgv data - * This inspects the http requests's incoming payload. This creates a - * validating stream for the appropriate type of payload, which is piped - * into the configured storage layer, saving the results in mongodb. - */ - // middleware to process "uploads" of sgv data - function insert_entries(req, res, next) { - // list of incoming records - var incoming = []; - // Potentially a single json encoded body. - // This can happen from either an url-encoded or json content-type. - if ('date' in req.body) { - // add it to the incoming list - incoming.push(req.body); - } - // potentially a list of json entries - if (req.body.length) { - // add them to the list - incoming = incoming.concat(req.body); - } + res.entries.sort(compare); - /** - * @function inputs - * @returns {ReadableStream} Readable stream with all incoming elements - * in the stream. - * in node, pipe is the most interoperable interface - * inputs returns a readable stream representing all the potential - * records from the HTTP body. - * Most content-types are handled by express middeware. - * However, text/* types are given to us as a raw buffer, this - * function switches between these two variants to find the - * correct input stream. - * stream, so use svgdata to handle those. - * The inputs stream always emits sgv json objects. - */ - function inputs() { - var input; - // handle all text types - if (req.is('text/*')) { - // re-use the svgdata parsing stream - input = es.pipeline(req, sgvdata.parse()); - return input; - } - // use established list - return es.readArray(incoming); - } + var lastEntry = _first(res.entries); + var lastEntryDate = null; - /** - * @function persist - * @returns {WritableStream} a writable persistent storage stream - * Sends stream elements into storage layer. - * Configures the storage layer stream. - */ - function persist(fn) { - if (req.persist_entries) { - // store everything - return entries.persist(fn); - } - // support a preview mode, just lint everything - return es.pipeline(entries.map(), es.writeArray(fn)); - } + if (!_isNil(lastEntry)) { + if (lastEntry.mills) lastEntryDate = new Date(lastEntry.mills); + if (!lastEntry.mills && lastEntry.date) lastEntryDate = new Date(lastEntry.date); + res.setHeader('Last-Modified', lastEntryDate.toUTCString()); + } - /** - * @function done - * Final callback store results on `res.entries`, after all I/O is done. - * store results and move to the next middleware - */ - function done(err, result) { - // assign payload - res.entries = result; - res.entries_err = err; - return next(); - } + var ifModifiedSince = req.get('If-Modified-Since'); - // pipe everything to persistent storage - // when finished, pass to the next piece of middleware - es.pipeline(inputs(), persist(done)); + if (lastEntryDate !== null && ifModifiedSince !== null && lastEntryDate.getTime() <= new Date(ifModifiedSince).getTime()) { + console.log('If-Modified-Since: ' + new Date(ifModifiedSince) + ' Last-Modified', lastEntryDate); + res.status(304).send({ + status: 304 + , message: 'Not modified' + , type: 'internal' + }); + return; } - /** - * @function prepReqModel - * @param {Request} req The request to inspect - * @param {String} model The name of the model to use if not found. - * Sets `req.query.find.type` to your chosen model. - */ - function prepReqModel(req, model) { - var type = model || 'sgv'; - if (!req.query.find) { - req.query.find = { - type: type - }; - } else { - req.query.find.type = type; - } + function formatWithSeparator(data, separator) { + if (data === null || data.constructor !== Array || data.length == 0) return ""; + + var outputdata = []; + data.forEach(function(e) { + var entry = { + "dateString": e.dateString + , "date": e.date + , "sgv": e.sgv + , "direction": e.direction + , "device": e.device + }; + outputdata.push(entry); + }); + + var fields = Object.keys(outputdata[0]); + var replacer = function(key, value) { + return value === null ? '' : value + } + var csv = outputdata.map(function(row) { + return fields.map(function(fieldName) { + return JSON.stringify(row[fieldName], replacer) + }).join(separator) + }); + return csv.join('\r\n'); } - /** - * @param model - * Prepare model based on explicit choice in route/path parameter. - */ - api.param('model', function(req, res, next, model) { - prepReqModel(req, model); - next(); + // console.log(JSON.stringify(req.headers)); + + // if no error, format the payload + // The general pattern here is to create an output stream that reformats + // the data correctly into the desired representation. + // The stream logic allows some streams to ensure that some basic rules, + // such as enforcing a type property to exist, are followed. + return res.format({ + 'text/plain': function() { + es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { + var output = formatWithSeparator(out, "\t"); + res.send(output); + })); + } + , 'text/tab-separated-values': function() { + es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { + var output = formatWithSeparator(out, '\t'); + res.send(output); + })); + } + , 'text/csv': function() { + es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { + var output = formatWithSeparator(out, ','); + res.send(output); + })); + } + , 'application/json': function() { + // so long as every element has a `type` field, and some kind of + // date, we'll consider it valid + es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { + res.json(out); + })); + } + , 'default': function() { + // Default to JSON output + // so long as every element has a `type` field, and some kind of + // date, we'll consider it valid + es.pipeline(output, force_typed_data(type_params), es.writeArray(function(err, out) { + res.json(out); + })); + } }); + } + + /** + * @method insert_entries + * middleware to process "uploads" of sgv data + * This inspects the http requests's incoming payload. This creates a + * validating stream for the appropriate type of payload, which is piped + * into the configured storage layer, saving the results in mongodb. + */ + // middleware to process "uploads" of sgv data + function insert_entries(req, res, next) { + // list of incoming records + var incoming = []; + // Potentially a single json encoded body. + // This can happen from either an url-encoded or json content-type. + if ('date' in req.body) { + // add it to the incoming list + incoming.push(req.body); + } + // potentially a list of json entries + if (req.body.length) { + // add them to the list + incoming = incoming.concat(req.body); + } /** - * @module get#/entries/current - * @route - * Get last entry. - * @response /definitions/Entries - */ - api.get('/entries/current', function(req, res, next) { - //assume sgv - req.params.model = 'sgv'; - entries.list({ - count: 1 - }, function(err, records) { - res.entries = records; - res.entries_err = err; - return next(); - }); - }, format_entries); - - /** - * @module get#/entries/:spec - * @route - * Fetch one entry by id - * @response /definitions/Entries - * @param String spec :spec is either the id of a record or model name to - * search. If it is an id, only the record with that id will be in the - * response. If the string is a model name, like `sgv`, `mbg`, et al, the - * usual query logic is performed biased towards that model type. - * Useful for filtering by type. - */ - api.get('/entries/:spec', function(req, res, next) { - if (isId(req.params.spec)) { - entries.getEntry(req.params.spec, function(err, entry) { - if (err) { - return next(err); - } - res.entries = [entry]; - res.entries_err = err; - req.query.find = req.query.find || {}; - if (entry) { - req.query.find.type = entry.type; - } else { - res.entries_err = 'No such id: \'' + req.params.spec + '\''; - } - next(); - }); - } else { - req.params.model = req.params.spec; - prepReqModel(req, req.params.model); - query_models(req, res, next); - } - }, format_entries); - - - /** - * @module get#/entries - * @route - * @response /definitions/Entries - * Use the `find` parameter to generate mongo queries. - * Default is `count=10`, for only 10 latest entries, reverse sorted by - * `find[date]`. - * - */ - api.get('/entries', ifModifiedSinceCTX, query_models, format_entries); - - /** - * @function echo_query - * Output the generated query object itself, instead of the query results. - * Useful for understanding how REST api parameters translate into mongodb - * queries. + * @function persist + * @returns {WritableStream} a writable persistent storage stream + * Sends stream elements into storage layer. + * Configures the storage layer stream. */ - function echo_query(req, res) { - var query = req.query; - // make a depth-wise copy of the original raw input - var input = JSON.parse(JSON.stringify(query)); - - // If "?count=" is present, use that number to decided how many to return. - if (!query.count) { - query.count = 10; - } - // bias towards entries, but allow expressing preference of storage layer - var storage = req.params.echo || 'entries'; - - // send payload with information about query itself - res.json({ - query: ctx[storage].query_for(query), - input: input, - params: req.params, - storage: storage - }); + function persist(fn) { + if (req.persist_entries) { + // store everything + return entries.persist(fn); + } + // support a preview mode, just lint everything + return es.pipeline(entries.map(), es.writeArray(fn)); } /** - * @function query_models - * Perform the standard query logic, translating API parameters into mongo - * db queries in a fairly regimented manner. - * This middleware executes the query, assigning the payload to results on - * `res.entries`. + * @function done + * Final callback store results on `res.entries`, after all I/O is done. + * store results and move to the next middleware */ - function query_models(req, res, next) { - var query = req.query; - - // If "?count=" is present, use that number to decided how many to return. - if (!query.count) { - query.count = 10; - } - - // bias to entries, but allow expressing a preference - var storage = req.storage || ctx.entries; - // perform the query - storage.list(query, function payload(err, entries) { - // assign payload - res.entries = entries; - res.entries_err = err; - return next(); - }); - } - - function count_records(req, res, next) { - var query = req.query; - var storage = req.storage || ctx.entries; - storage.aggregate(query, function payload(err, entries) { - // assign payload - res.entries = entries; - res.entries_err = err; - return next(err); - }); + function done(err, result) { + // assign payload + res.entries = result; + res.entries_err = err; + return next(); } - function format_results(req, res, next) { - res.json(res.entries); - next(); + // pipe everything to persistent storage + // when finished, pass to the next piece of middleware + es.pipeline(es.readArray(incoming), persist(done)); + } + + /** + * @function prepReqModel + * @param {Request} req The request to inspect + * @param {String} model The name of the model to use if not found. + * Sets `req.query.find.type` to your chosen model. + */ + function prepReqModel(req, model) { + var type = model || 'sgv'; + if (!req.query.find) { + req.query.find = { + type: type + }; + } else { + req.query.find.type = type; } - - /** - * @function delete_records - * Delete entries. The query logic works the same way as find/list. This - * endpoint uses same search logic to remove records from the database. - */ - function delete_records(req, res, next) { - // bias towards model, but allow expressing a preference - if (!req.model) { - req.model = ctx.entries; - } - var query = req.query; - if (!query.count) { - query.count = 10 + } + + /** + * @param model + * Prepare model based on explicit choice in route/path parameter. + */ + api.param('model', function(req, res, next, model) { + prepReqModel(req, model); + next(); + }); + + /** + * @module get#/entries/current + * @route + * Get last entry. + * @response /definitions/Entries + */ + api.get('/entries/current', function(req, res, next) { + //assume sgv + req.params.model = 'sgv'; + entries.list({ + count: 1 + }, function(err, records) { + res.entries = records; + res.entries_err = err; + return next(); + }); + }, format_entries); + + /** + * @module get#/entries/:spec + * @route + * Fetch one entry by id + * @response /definitions/Entries + * @param String spec :spec is either the id of a record or model name to + * search. If it is an id, only the record with that id will be in the + * response. If the string is a model name, like `sgv`, `mbg`, et al, the + * usual query logic is performed biased towards that model type. + * Useful for filtering by type. + */ + api.get('/entries/:spec', function(req, res, next) { + if (isId(req.params.spec)) { + entries.getEntry(req.params.spec, function(err, entry) { + if (err) { + return next(err); } - // remove using the query - req.model.remove(query, function(err, stat) { - if (err) { - return next(err); - } - // yield some information about success of operation - res.json(stat); - return next(); - }); - } - - /** - * @param spec - * Middleware that prepares the :spec parameter in the routed path. - */ - api.param('spec', function(req, res, next, spec) { - if (isId(spec)) { - prepReqModel(req, req.params.model); - req.query = { - find: { - _id: req.params.spec - } - }; + res.entries = [entry]; + res.entries_err = err; + req.query.find = req.query.find || {}; + if (entry) { + req.query.find.type = entry.type; } else { - prepReqModel(req, req.params.model); + res.entries_err = 'No such id: \'' + req.params.spec + '\''; } next(); + }); + } else { + req.params.model = req.params.spec; + prepReqModel(req, req.params.model); + query_models(req, res, next); + } + }, format_entries); + + + /** + * @module get#/entries + * @route + * @response /definitions/Entries + * Use the `find` parameter to generate mongo queries. + * Default is `count=10`, for only 10 latest entries, reverse sorted by + * `find[date]`. + * + */ + api.get('/entries', ifModifiedSinceCTX, query_models, format_entries); + + /** + * @function echo_query + * Output the generated query object itself, instead of the query results. + * Useful for understanding how REST api parameters translate into mongodb + * queries. + */ + function echo_query(req, res) { + var query = req.query; + // make a depth-wise copy of the original raw input + var input = JSON.parse(JSON.stringify(query)); + + // If "?count=" is present, use that number to decided how many to return. + if (!query.count) { + query.count = 10; + } + // bias towards entries, but allow expressing preference of storage layer + var storage = req.params.echo || 'entries'; + + // send payload with information about query itself + res.json({ + query: ctx[storage].query_for(query) + , input: input + , params: req.params + , storage: storage }); + } + + /** + * @function query_models + * Perform the standard query logic, translating API parameters into mongo + * db queries in a fairly regimented manner. + * This middleware executes the query, assigning the payload to results on + * `res.entries`. + */ + function query_models(req, res, next) { + var query = req.query; + + // If "?count=" is present, use that number to decided how many to return. + if (!query.count) { + query.count = 10; + } - /** - * @param echo - * The echo parameter in the path routing parameters allows the echo - * endpoints to customize the storage layer. - */ - api.param('echo', function(req, res, next, echo) { - console.log('echo', echo); - if (!echo) { - req.params.echo = 'entries'; - } - next(); + // bias to entries, but allow expressing a preference + var storage = req.storage || ctx.entries; + // perform the query + storage.list(query, function payload(err, entries) { + // assign payload + res.entries = entries; + res.entries_err = err; + return next(); }); - - /** - * @module get#/echo/:echo/:model/:spec - * @routed - * Echo information about model/spec queries. - * Useful in understanding how REST API prepares queries against mongo. - */ - api.get('/echo/:echo/:model?/:spec?', echo_query); - - /** + } + + function count_records(req, res, next) { + var query = req.query; + var storage = req.storage || ctx.entries; + storage.aggregate(query, function payload(err, entries) { + // assign payload + res.entries = entries; + res.entries_err = err; + return next(err); + }); + } + + function format_results(req, res, next) { + res.json(res.entries); + next(); + } + + /** + * @function delete_records + * Delete entries. The query logic works the same way as find/list. This + * endpoint uses same search logic to remove records from the database. + */ + function delete_records(req, res, next) { + // bias towards model, but allow expressing a preference + if (!req.model) { + req.model = ctx.entries; + } + var query = req.query; + if (!query.count) { + query.count = 10 + } + // remove using the query + req.model.remove(query, function(err, stat) { + if (err) { + return next(err); + } + // yield some information about success of operation + res.json(stat); + return next(); + }); + } + + /** + * @param spec + * Middleware that prepares the :spec parameter in the routed path. + */ + api.param('spec', function(req, res, next, spec) { + if (isId(spec)) { + prepReqModel(req, req.params.model); + req.query = { + find: { + _id: req.params.spec + } + }; + } else { + prepReqModel(req, req.params.model); + } + next(); + }); + + /** + * @param echo + * The echo parameter in the path routing parameters allows the echo + * endpoints to customize the storage layer. + */ + api.param('echo', function(req, res, next, echo) { + console.log('echo', echo); + if (!echo) { + req.params.echo = 'entries'; + } + next(); + }); + + /** + * @module get#/echo/:echo/:model/:spec + * @routed + * Echo information about model/spec queries. + * Useful in understanding how REST API prepares queries against mongo. + */ + api.get('/echo/:echo/:model?/:spec?', echo_query); + + /** * Prepare regexp patterns based on `prefix`, and `regex` parameters. * Translates `/:prefix/:regex` strings into fancy mongo queries. * @method prep_patterns @@ -522,140 +530,140 @@ curl -s -g 'http://localhost:1337/api/v1/times/20{14..15}/T{13..18}:{00..15}'.js ``` */ - function prep_patterns(req, res, next) { - // initialize empty pattern list. - var pattern = []; - // initialize a basic prefix - // also perform bash brace/glob-style expansion - var prefix = expand(req.params.prefix || '.*'); - - // if expansion leads to more than one prefix - if (prefix.length > 1) { - // pre-pend the prefix to the pattern list and wait to expand it as - // part of the full pattern - pattern.push('^' + req.params.prefix); - } - // append any regex parameters - if (req.params.regex) { - // prepend "match any" rule to their rule - pattern.push('.*' + req.params.regex); - } - // create a single pattern with all inputs considered - // expand the pattern using bash/glob style brace expansion to generate - // an array of patterns. - pattern = expand(pattern.join('')); - - /** - * Factory function to customize creation of RegExp patterns. - * @method iter_regex - * @param String prefix Default null - * @param String suffix Default null - * @returns function(pat) which turns the given pattern into a new - * RegExp with the prefix and suffix prepended, and appended, - * respectively. - */ - function iter_regex(prefix, suffix) { - /** - * @function make - * @returns RegExp Make a RegExp with configured prefix and suffix - */ - function make(pat) { - // concat the prefix, pattern, and suffix. - pat = (prefix ? prefix : '') + pat + (suffix ? suffix : ''); - // return RegExp. - return new RegExp(pat); - } - // return functor - return make; - } - - // save pattern for other middlewares, eg echo, query, etc. - req.pattern = pattern; - var matches = pattern.map(iter_regex()); - // prepare the query against a configurable field name. - var field = req.patternField; - var query = {}; - query[field] = { - // $regex: prefix, - // configure query to perform regex against list of potential regexp - $in: matches - }; - if (prefix.length === 1) { - // If there is a single prefix pattern, mongo can optimize this against - // an indexed field - query[field].$regex = prefix.map(iter_regex('^')).pop(); - } - - // Merge into existing query structure. - if (req.query.find) { - if (req.query.find[field]) { - req.query.find[field].$in = query[field].$in; - } else { - req.query.find[field] = query[field]; - } - } else { - req.query.find = query; - } - // Also assist in querying for the requested type. - if (req.params.type) { - req.query.find.type = req.params.type; - } - next(); + function prep_patterns(req, res, next) { + // initialize empty pattern list. + var pattern = []; + // initialize a basic prefix + // also perform bash brace/glob-style expansion + var prefix = expand(req.params.prefix || '.*'); + + // if expansion leads to more than one prefix + if (prefix.length > 1) { + // pre-pend the prefix to the pattern list and wait to expand it as + // part of the full pattern + pattern.push('^' + req.params.prefix); } + // append any regex parameters + if (req.params.regex) { + // prepend "match any" rule to their rule + pattern.push('.*' + req.params.regex); + } + // create a single pattern with all inputs considered + // expand the pattern using bash/glob style brace expansion to generate + // an array of patterns. + pattern = expand(pattern.join('')); /** - * @method prep_pattern_field - * Ensure that `req.patternField` is set to assist other middleware in - * deciding which field to generate queries against. - * Default is `dateString`, because that's the iso8601 field for sgv - * entries. + * Factory function to customize creation of RegExp patterns. + * @method iter_regex + * @param String prefix Default null + * @param String suffix Default null + * @returns function(pat) which turns the given pattern into a new + * RegExp with the prefix and suffix prepended, and appended, + * respectively. */ - function prep_pattern_field(req, res, next) { - // If req.params.field from routed path parameter is available use it. - if (req.params.field) { - req.patternField = req.params.field; - } else { - // Default is `dateString`. - req.patternField = 'dateString'; - } - next(); + function iter_regex(prefix, suffix) { + /** + * @function make + * @returns RegExp Make a RegExp with configured prefix and suffix + */ + function make(pat) { + // concat the prefix, pattern, and suffix. + pat = (prefix ? prefix : '') + pat + (suffix ? suffix : ''); + // return RegExp. + return new RegExp(pat); + } + // return functor + return make; } - /** - * @method prep_storage - * Prep storage layer for other middleware by setting `req.storage`. - * Some routed paths have a `storage` parameter available, when this is - * set, `req.storage will be set to that value. The default otherwise is - * the entries storage layer, because that's where sgv records are stored - * by default. - */ - function prep_storage(req, res, next) { - if (req.params.storage && _includes(['entries', 'treatments', 'devicestatus'], req.params.storage)) { - req.storage = ctx[req.params.storage]; - } else { - req.storage = ctx.entries; - } - next(); + // save pattern for other middlewares, eg echo, query, etc. + req.pattern = pattern; + var matches = pattern.map(iter_regex()); + // prepare the query against a configurable field name. + var field = req.patternField; + var query = {}; + query[field] = { + // $regex: prefix, + // configure query to perform regex against list of potential regexp + $in: matches + }; + if (prefix.length === 1) { + // If there is a single prefix pattern, mongo can optimize this against + // an indexed field + query[field].$regex = prefix.map(iter_regex('^')).pop(); } - /** - * @module get#/times/echo/:prefix/:regex - * Echo interface for the regex pattern generator. - * @routed - * Useful for understanding how the `/:prefix/:regex` route generates - * mongodb queries. - */ - api.get('/times/echo/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, function(req, res) { - res.json({ - req: { - params: req.params, - query: req.query - }, - pattern: req.pattern - }); + // Merge into existing query structure. + if (req.query.find) { + if (req.query.find[field]) { + req.query.find[field].$in = query[field].$in; + } else { + req.query.find[field] = query[field]; + } + } else { + req.query.find = query; + } + // Also assist in querying for the requested type. + if (req.params.type) { + req.query.find.type = req.params.type; + } + next(); + } + + /** + * @method prep_pattern_field + * Ensure that `req.patternField` is set to assist other middleware in + * deciding which field to generate queries against. + * Default is `dateString`, because that's the iso8601 field for sgv + * entries. + */ + function prep_pattern_field(req, res, next) { + // If req.params.field from routed path parameter is available use it. + if (req.params.field) { + req.patternField = req.params.field; + } else { + // Default is `dateString`. + req.patternField = 'dateString'; + } + next(); + } + + /** + * @method prep_storage + * Prep storage layer for other middleware by setting `req.storage`. + * Some routed paths have a `storage` parameter available, when this is + * set, `req.storage will be set to that value. The default otherwise is + * the entries storage layer, because that's where sgv records are stored + * by default. + */ + function prep_storage(req, res, next) { + if (req.params.storage && _includes(['entries', 'treatments', 'devicestatus'], req.params.storage)) { + req.storage = ctx[req.params.storage]; + } else { + req.storage = ctx.entries; + } + next(); + } + + /** + * @module get#/times/echo/:prefix/:regex + * Echo interface for the regex pattern generator. + * @routed + * Useful for understanding how the `/:prefix/:regex` route generates + * mongodb queries. + */ + api.get('/times/echo/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, function(req, res) { + res.json({ + req: { + params: req.params + , query: req.query + } + , pattern: req.pattern }); + }); - /** + /** * @module get#/times/:prefix/:regex * Allows searching for modal times of day across days and months. ``` @@ -666,11 +674,11 @@ curl -s -g 'http://localhost:1337/api/v1/times/20{14..15}/T{13..18}:{00..15}'.js * @routed * @response 200 /definitions/Entries */ - api.get('/times/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, query_models, format_entries); + api.get('/times/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, query_models, format_entries); - api.get('/count/:storage/where', prep_storage, count_records, format_results); + api.get('/count/:storage/where', prep_storage, count_records, format_results); - /** + /** * @module get#/slice/:storage/:field/:type/:prefix/:regex * @routed * @response 200 /definitions/Entries @@ -681,65 +689,66 @@ curl -s -g 'http://localhost:1337/api/v1/times/20{14..15}/T{13..18}:{00..15}'.js /api/v1/slice/entries/dateString/mbg/2015.json ``` */ - api.get('/slice/:storage/:field/:type?/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, query_models, format_entries); - + api.get('/slice/:storage/:field/:type?/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, query_models, format_entries); + + /** + * @module post#/entries/preview + * Allow previewing your post content, just echos everything you + * posted back out. + * Similar to the echo api, useful to lint/debug upload problems. + */ + api.post('/entries/preview', ctx.authorization.isPermitted('api:entries:create'), function(req, res, next) { + // setting this flag tells insert_entries to not actually store the results + req.persist_entries = false; + next(); + }, insert_entries, format_entries); + + // Protect endpoints with authenticated api. + if (app.enabled('api')) { + // Create and store new sgv entries /** - * @module post#/entries/preview - * Allow previewing your post content, just echos everything you - * posted back out. - * Similar to the echo api, useful to lint/debug upload problems. + * @module post#/entries + * Allow posting content to store. + * Stores incoming payload that follows basic rules about having a + * `type` field in `entries` storage layer. */ - api.post('/entries/preview', ctx.authorization.isPermitted('api:entries:create'), function(req, res, next) { - // setting this flag tells insert_entries to not actually store the results - req.persist_entries = false; - next(); + api.post('/entries/', ctx.authorization.isPermitted('api:entries:create'), function(req, res, next) { + // setting this flag tells insert_entries to store the results + req.persist_entries = true; + next(); }, insert_entries, format_entries); - // Protect endpoints with authenticated api. - if (app.enabled('api')) { - // Create and store new sgv entries - /** - * @module post#/entries - * Allow posting content to store. - * Stores incoming payload that follows basic rules about having a - * `type` field in `entries` storage layer. - */ - api.post('/entries/', ctx.authorization.isPermitted('api:entries:create'), function(req, res, next) { - // setting this flag tells insert_entries to store the results - req.persist_entries = true; - next(); - }, insert_entries, format_entries); - - /** - * @module delete#/entries/:spec - * @route - * Delete entries. The query logic works the same way as find/list. This - * endpoint uses same search logic to remove records from the database. - */ - api.delete('/entries/:spec', ctx.authorization.isPermitted('api:entries:delete'), function(req, res, next) { - // if ID, prepare to query for one record - if (isId(req.params.spec)) { - prepReqModel(req, req.params.model); - req.query = { - find: { - _id: req.params.spec - } - }; - } else { - req.params.model = req.params.spec; - prepReqModel(req, req.params.model); - if (req.query.find.type === '*') { - delete req.query.find.type; - } - } - next(); - }, delete_records); - + /** + * @module delete#/entries/:spec + * @route + * Delete entries. The query logic works the same way as find/list. This + * endpoint uses same search logic to remove records from the database. + */ + api.delete('/entries/:spec', ctx.authorization.isPermitted('api:entries:delete'), function(req, res, next) { + // if ID, prepare to query for one record + if (isId(req.params.spec)) { + prepReqModel(req, req.params.model); + req.query = { + find: { + _id: req.params.spec + } + }; + } else { + req.params.model = req.params.spec; + prepReqModel(req, req.params.model); + if (req.query.find.type === '*') { + delete req.query.find.type; + } + } + next(); + }, delete_records); - } + // delete record that match query + api.delete('/entries/', ctx.authorization.isPermitted('api:entries:delete'), delete_records); + } - return api; + return api; } // expose module -module.exports = configure; \ No newline at end of file +module.exports = configure; diff --git a/lib/api/profile/index.js b/lib/api/profile/index.js index 07c6e1dc65a..30f8fe240ca 100644 --- a/lib/api/profile/index.js +++ b/lib/api/profile/index.js @@ -44,7 +44,6 @@ function configure (app, wares, ctx) { res.json(created.ops); console.log('Profile created', created); } - }); }); diff --git a/lib/api/treatments/index.js b/lib/api/treatments/index.js index 3fff4ceb331..0362829fc7b 100644 --- a/lib/api/treatments/index.js +++ b/lib/api/treatments/index.js @@ -99,11 +99,52 @@ function configure(app, wares, ctx) { limit: 1048576 * 50 }), ctx.authorization.isPermitted('api:treatments:create'), post_response); - api.delete('/treatments/:_id', ctx.authorization.isPermitted('api:treatments:delete'), function(req, res) { - ctx.treatments.remove(req.params._id, function() { - res.json({}); - }); - }); + /** + * @function delete_records + * Delete treatments. The query logic works the same way as find/list. This + * endpoint uses same search logic to remove records from the database. + */ + function delete_records(req, res, next) { + var query = req.query; + if (!query.count) { + query.count = 10 + } + + console.log('Delete records with query: ', query); + + // remove using the query + ctx.treatments.remove(query, function(err, stat) { + if (err) { + console.log('treatments delete error: ', err); + return next(err); + } + // yield some information about success of operation + res.json(stat); + + console.log('treatments records deleted'); + + return next(); + }); + } + + api.delete('/treatments/:id', ctx.authorization.isPermitted('api:treatments:delete'), function(req, res, next) { + if (!req.query.find) { + req.query.find = { + _id: req.params.id + }; + } else { + req.query.find._id = req.params.id; + } + + if (req.query.find._id === '*') { + // match any record id + delete req.query.find._id; + } + next(); + }, delete_records); + + // delete record that match query + api.delete('/treatments/', ctx.authorization.isPermitted('api:treatments:delete'), delete_records); // update record api.put('/treatments/', ctx.authorization.isPermitted('api:treatments:update'), function(req, res) { diff --git a/lib/authorization/storage.js b/lib/authorization/storage.js index 41969be150f..9999b9f3178 100644 --- a/lib/authorization/storage.js +++ b/lib/authorization/storage.js @@ -28,6 +28,11 @@ function init (env, ctx) { obj.created_at = (new Date()).toISOString(); } collection.insert(obj, function (err, doc) { + if (err != null && err.message) { + console.log('Data insertion error', err.message); + fn(err.message, null); + return; + } storage.reload(function loaded() { fn(null, doc.ops); }); diff --git a/lib/client/index.js b/lib/client/index.js index 7a305148677..354901bc899 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -1076,9 +1076,11 @@ client.load = function load(serverSettings, callback) { function prepareEntries ( ) { // Post processing after data is in var temp1 = [ ]; - if (client.ddata.cal && client.rawbg.isEnabled(client.sbx)) { + var sbx = client.sbx.withExtendedSettings(client.rawbg); + + if (client.ddata.cal && client.rawbg.isEnabled(sbx)) { temp1 = client.ddata.sgvs.map(function (entry) { - var rawbgValue = client.rawbg.showRawBGs(entry.mgdl, entry.noise, client.ddata.cal, client.sbx) ? client.rawbg.calc(entry, client.ddata.cal, client.sbx) : 0; + var rawbgValue = client.rawbg.showRawBGs(entry.mgdl, entry.noise, client.ddata.cal, sbx) ? client.rawbg.calc(entry, client.ddata.cal, sbx) : 0; if (rawbgValue > 0) { return { mills: entry.mills - 2000, mgdl: rawbgValue, color: 'white', type: 'rawbg' }; } else { @@ -1152,10 +1154,9 @@ client.load = function load(serverSettings, callback) { } else if (!inRetroMode()) { chart.update(false); client.plugins.updateVisualisations(client.nowSBX); + brushed(); } - } - }; module.exports = client; diff --git a/lib/client/renderer.js b/lib/client/renderer.js index 6dc0f68fcb3..bcb605e3bc1 100644 --- a/lib/client/renderer.js +++ b/lib/client/renderer.js @@ -137,10 +137,11 @@ function init (client, d3) { function getRawbgInfo ( ) { var info = { }; + var sbx = client.sbx.withExtendedSettings(client.rawbg); if (d.type === 'sgv') { info.noise = client.rawbg.noiseCodeToDisplay(d.mgdl, d.noise); - if (client.rawbg.showRawBGs(d.mgdl, d.noise, client.ddata.cal, client.sbx)) { - info.value = utils.scaleMgdl(client.rawbg.calc(d, client.ddata.cal, client.sbx)); + if (client.rawbg.showRawBGs(d.mgdl, d.noise, client.ddata.cal, sbx)) { + info.value = utils.scaleMgdl(client.rawbg.calc(d, client.ddata.cal, sbx)); } } return info; diff --git a/lib/data/dataloader.js b/lib/data/dataloader.js index ee6308d9846..cc303da1d72 100644 --- a/lib/data/dataloader.js +++ b/lib/data/dataloader.js @@ -259,11 +259,13 @@ function loadProfileSwitchTreatments(ddata, ctx, callback) { var tq = { find: { eventType: 'Profile Switch', - created_at: dateRange + created_at: dateRange, + duration: 0 }, sort: { created_at: -1 - } + }, + count: 1 }; ctx.treatments.list(tq, function(err, results) { diff --git a/lib/hashauth.js b/lib/hashauth.js index e4956860c59..d39060a2e2b 100644 --- a/lib/hashauth.js +++ b/lib/hashauth.js @@ -79,7 +79,7 @@ hashauth.init = function init(client, $) { var translate = client.translate; hashauth.injectHtml(); $( '#requestauthenticationdialog' ).dialog({ - width: 500 + width: 350 , height: 240 , buttons: [ { diff --git a/lib/language.js b/lib/language.js index e5e879c0929..875582c6298 100644 --- a/lib/language.js +++ b/lib/language.js @@ -24,6 +24,7 @@ function init() { , { code: 'he', language: 'עברית', speechCode: 'he-IL' } , { code: 'hr', language: 'Hrvatski', speechCode: 'hr-HR' } , { code: 'it', language: 'Italiano', speechCode: 'it-IT' } + , { code: 'ja', language: '日本語', speechCode: 'ja-JP' } , { code: 'ko', language: '한국어', speechCode: 'ko-KR' } , { code: 'nb', language: 'Norsk (Bokmål)', speechCode: 'no-NO' } , { code: 'nl', language: 'Nederlands', speechCode: 'nl-NL' } @@ -33,6 +34,7 @@ function init() { , { code: 'ru', language: 'Русский', speechCode: 'ru-RU' } , { code: 'sk', language: 'Slovenčina', speechCode: 'sk-SK' } , { code: 'sv', language: 'Svenska', speechCode: 'sv-SE' } + , { code: 'tr', language: 'Türkçe', speechCode: 'tr-TR' } , { code: 'zh_cn', language: '中文（简体）', speechCode: 'cmn-Hans-CN' } , { code: 'zh_tw', language: '中文（繁體）', speechCode: 'cmn-Hant-TW' } ]; @@ -51,6 +53,7 @@ function init() { ,bg: 'Активиране на порта' ,hr: 'Slušanje na portu' ,it: 'Porta in ascolto' + ,ja: '接続可能' ,fi: 'Kuuntelen porttia' ,nb: 'Lytter på port' ,he: 'מקשיב על פתחה' @@ -60,6 +63,7 @@ function init() { ,de: 'Lauscht auf Port' ,nl: 'Luistert op poort' ,ko: '포트에서 수신' + ,tr: 'Port dinleniyor' ,zh_cn: '正在监听端口' } // Client @@ -75,6 +79,7 @@ function init() { ,bg: 'Пон' ,hr: 'Pon' ,it: 'Lun' + ,ja: '月' ,dk: 'Man' ,fi: 'Ma' ,nb: 'Man' @@ -84,6 +89,7 @@ function init() { ,sk: 'Po' ,nl: 'Ma' ,ko: '월' + ,tr: 'Pzt' ,zh_cn: '一' } ,'Tu' : { @@ -98,6 +104,7 @@ function init() { ,bg: 'Вт' ,hr: 'Ut' ,it: 'Mar' + ,ja: '火' ,dk: 'Tir' ,fi: 'Ti' ,nb: 'Tir' @@ -107,6 +114,7 @@ function init() { ,sk: 'Ut' ,nl: 'Di' ,ko: '화' + ,tr: 'Sal' ,zh_cn: '二' } ,'We' : { @@ -121,6 +129,7 @@ function init() { ,bg: 'Ср' ,hr: 'Sri' ,it: 'Mer' + ,ja: '水' ,dk: 'Ons' ,fi: 'Ke' ,nb: 'Ons' @@ -130,6 +139,7 @@ function init() { ,sk: 'St' ,nl: 'Wo' ,ko: '수' + ,tr: 'Çar' ,zh_cn: '三' } ,'Th' : { @@ -144,6 +154,7 @@ function init() { ,bg: 'Четв' ,hr: 'Čet' ,it: 'Gio' + ,ja: '木' ,dk: 'Tor' ,fi: 'To' ,nb: 'Tor' @@ -153,6 +164,7 @@ function init() { ,sk: 'Št' ,nl: 'Do' ,ko: '목' + ,tr: 'Per' ,zh_cn: '四' } ,'Fr' : { @@ -167,6 +179,7 @@ function init() { ,bg: 'Пет' ,hr: 'Pet' ,it: 'Ven' + ,ja: '金' ,dk: 'Fre' ,fi: 'Pe' ,nb: 'Fre' @@ -176,6 +189,7 @@ function init() { ,sk: 'Pi' ,nl: 'Vr' ,ko: '금' + ,tr: 'Cum' ,zh_cn: '五' } ,'Sa' : { @@ -190,6 +204,7 @@ function init() { ,bg: 'Съб' ,hr: 'Sub' ,it: 'Sab' + ,ja: '土' ,dk: 'Lør' ,fi: 'La' ,nb: 'Lør' @@ -199,6 +214,7 @@ function init() { ,sk: 'So' ,nl: 'Za' ,ko: '토' + ,tr: 'Cmt' ,zh_cn: '六' } ,'Su' : { @@ -213,6 +229,7 @@ function init() { ,bg: 'Нед' ,hr: 'Ned' ,it: 'Dom' + ,ja: '日' ,dk: 'Søn' ,fi: 'Su' ,nb: 'Søn' @@ -222,6 +239,7 @@ function init() { ,sk: 'Ne' ,nl: 'Zo' ,ko: '일' + ,tr: 'Paz' ,zh_cn: '日' } ,'Monday' : { @@ -236,6 +254,7 @@ function init() { ,bg: 'Понеделник' ,hr: 'Ponedjeljak' ,it: 'Lunedì' + ,ja: '月曜日' ,dk: 'Mandag' ,fi: 'Maanantai' ,nb: 'Mandag' @@ -245,6 +264,7 @@ function init() { ,sk: 'Pondelok' ,nl: 'Maandag' ,ko: '월요일' + ,tr: 'Pazartesi' ,zh_cn: '星期一' } ,'Tuesday' : { @@ -259,6 +279,7 @@ function init() { ,hr: 'Utorak' ,sv: 'Tisdag' ,it: 'Martedì' + ,ja: '火曜日' ,dk: 'Tirsdag' ,fi: 'Tiistai' ,nb: 'Tirsdag' @@ -268,6 +289,7 @@ function init() { ,sk: 'Utorok' ,nl: 'Dinsdag' ,ko: '화요일' + ,tr: 'Salı' ,zh_cn: '星期二' } ,'Wednesday' : { @@ -282,6 +304,7 @@ function init() { ,bg: 'Сряда' ,hr: 'Srijeda' ,it: 'Mercoledì' + ,ja: '水曜日' ,dk: 'Onsdag' ,fi: 'Keskiviikko' ,nb: 'Onsdag' @@ -291,6 +314,7 @@ function init() { ,sk: 'Streda' ,nl: 'Woensdag' ,ko: '수요일' + ,tr: 'Çarşamba' ,zh_cn: '星期三' } ,'Thursday' : { @@ -305,6 +329,7 @@ function init() { ,bg: 'Четвъртък' ,hr: 'Četvrtak' ,it: 'Giovedì' + ,ja: '木曜日' ,dk: 'Torsdag' ,fi: 'Torstai' ,nb: 'Torsdag' @@ -314,6 +339,7 @@ function init() { ,sk: 'Štvrtok' ,nl: 'Donderdag' ,ko: '목요일' + ,tr: 'Perşembe' ,zh_cn: '星期四' } ,'Friday' : { @@ -328,6 +354,7 @@ function init() { ,bg: 'Петък' ,hr: 'Petak' ,it: 'Venerdì' + ,ja: '金曜日' ,dk: 'Fredag' ,fi: 'Perjantai' ,nb: 'Fredag' @@ -337,6 +364,7 @@ function init() { ,sk: 'Piatok' ,nl: 'Vrijdag' ,ko: '금요일' + ,tr: 'Cuma' ,zh_cn: '星期五' } ,'Saturday' : { @@ -351,6 +379,7 @@ function init() { ,hr: 'Subota' ,sv: 'Lördag' ,it: 'Sabato' + ,ja: '土曜日' ,dk: 'Lørdag' ,fi: 'Lauantai' ,nb: 'Lørdag' @@ -360,6 +389,7 @@ function init() { ,sk: 'Sobota' ,nl: 'Zaterdag' ,ko: '토요일' + ,tr: 'Cumartesi' ,zh_cn: '星期六' } ,'Sunday' : { @@ -374,6 +404,7 @@ function init() { ,hr: 'Nedjelja' ,sv: 'Söndag' ,it: 'Domenica' + ,ja: '日曜日' ,dk: 'Søndag' ,fi: 'Sunnuntai' ,nb: 'Søndag' @@ -383,6 +414,7 @@ function init() { ,sk: 'Nedeľa' ,nl: 'Zondag' ,ko: '일요일' + ,tr: 'Pazar' ,zh_cn: '星期日' } ,'Category' : { @@ -397,6 +429,7 @@ function init() { ,bg: 'Категория' ,hr: 'Kategorija' ,it:'Categoria' + ,ja: 'カテゴリー' ,dk: 'Kategori' ,fi: 'Luokka' ,nb: 'Kategori' @@ -406,6 +439,7 @@ function init() { ,sk: 'Kategória' ,nl: 'Categorie' ,ko: '분류' + ,tr: 'Kategori' ,zh_cn: '类别' } ,'Subcategory' : { @@ -420,6 +454,7 @@ function init() { ,bg: 'Подкатегория' ,hr: 'Podkategorija' ,it: 'Sottocategoria' + ,ja: 'サブカテゴリー' ,dk: 'Underkategori' ,fi: 'Alaluokka' ,nb: 'Underkategori' @@ -429,6 +464,7 @@ function init() { ,sk: 'Podkategória' ,nl: 'Subcategorie' ,ko: '세부 분류' + ,tr: 'Altkategori' ,zh_cn: '子类别' } ,'Name' : { @@ -443,6 +479,7 @@ function init() { ,bg: 'Име' ,hr: 'Ime' ,it: 'Nome' + ,ja: '名前' ,dk: 'Navn' ,fi: 'Nimi' ,nb: 'Navn' @@ -452,6 +489,7 @@ function init() { ,sk: 'Meno' ,nl: 'Naam' ,ko: '이름' + ,tr: 'İsim' ,zh_cn: '名称' } ,'Today' : { @@ -466,6 +504,7 @@ function init() { ,hr: 'Danas' ,sv: 'Idag' ,it: 'Oggi' + ,ja: '今日' ,dk: 'I dag' ,fi: 'Tänään' ,nb: 'Idag' @@ -475,6 +514,7 @@ function init() { ,sk: 'Dnes' ,nl: 'Vandaag' ,ko: '오늘' + ,tr: 'Bugün' ,zh_cn: '今天' } ,'Last 2 days' : { @@ -489,6 +529,7 @@ function init() { ,hr: 'Posljednja 2 dana' ,sv: 'Senaste 2 dagarna' ,it: 'Ultimi 2 giorni' + ,ja: '直近の2日間' ,dk: 'Sidste 2 dage' ,fi: 'Edelliset 2 päivää' ,nb: 'Siste 2 dager' @@ -498,6 +539,7 @@ function init() { ,sk: 'Posledné 2 dni' ,nl: 'Afgelopen 2 dagen' ,ko: '지난 2일' + ,tr: 'Son 2 gün' ,zh_cn: '过去2天' } ,'Last 3 days' : { @@ -512,6 +554,7 @@ function init() { ,bg: 'Последните 3 дни' ,hr: 'Posljednja 3 dana' ,it: 'Ultimi 3 giorni' + ,ja: '直近の3日間' ,dk: 'Sidste 3 dage' ,fi: 'Edelliset 3 päivää' ,nb: 'Siste 3 dager' @@ -521,6 +564,7 @@ function init() { ,sk: 'Posledné 3 dni' ,nl: 'Afgelopen 3 dagen' ,ko: '지난 3일' + ,tr: 'Son 3 gün' ,zh_cn: '过去3天' } ,'Last week' : { @@ -535,6 +579,7 @@ function init() { ,hr: 'Protekli tjedan' ,sv: 'Senaste veckan' ,it: 'Settimana scorsa' + ,ja: '直近の1週間' ,dk: 'Sidste uge' ,fi: 'Viime viikko' ,nb: 'Siste uke' @@ -544,6 +589,7 @@ function init() { ,sk: 'Posledný týždeň' ,nl: 'Afgelopen week' ,ko: '지난주' + ,tr: 'Geçen Hafta' ,zh_cn: '上周' } ,'Last 2 weeks' : { @@ -558,6 +604,7 @@ function init() { ,hr: 'Protekla 2 tjedna' ,sv: 'Senaste 2 veckorna' ,it: 'Ultime 2 settimane' + ,ja: '直近の2週間' ,dk: 'Sidste 2 uger' ,fi: 'Viimeiset 2 viikkoa' ,nb: 'Siste 2 uker' @@ -567,6 +614,7 @@ function init() { ,sk: 'Posledné 2 týždne' ,nl: 'Afgelopen 2 weken' ,ko: '지난 2주' + ,tr: 'Son 2 hafta' ,zh_cn: '过去2周' } ,'Last month' : { @@ -581,6 +629,7 @@ function init() { ,hr: 'Protekli mjesec' ,sv: 'Senaste månaden' ,it: 'Mese scorso' + ,ja: '直近の1ヶ月' ,dk: 'Sidste måned' ,fi: 'Viime kuu' ,nb: 'Siste måned' @@ -590,6 +639,7 @@ function init() { ,sk: 'Posledný mesiac' ,nl: 'Afgelopen maand' ,ko: '지난달' + ,tr: 'Geçen Ay' ,zh_cn: '上个月' } ,'Last 3 months' : { @@ -604,6 +654,7 @@ function init() { ,hr: 'Protekla 3 mjeseca' ,sv: 'Senaste 3 månaderna' ,it: 'Ultimi 3 mesi' + ,ja: '直近の3ヶ月' ,dk: 'Sidste 3 måneder' ,fi: 'Viimeiset 3 kuukautta' ,nb: 'Siste 3 måneder' @@ -613,6 +664,7 @@ function init() { ,sk: 'Posledné 3 mesiace' ,nl: 'Afgelopen 3 maanden' ,ko: '지난 3달' + ,tr: 'Son 3 ay' ,zh_cn: '过去3个月' } ,'From' : { @@ -627,6 +679,7 @@ function init() { ,bg: 'От' ,hr: 'Od' ,it: 'Da' + ,ja: '開始日' ,dk: 'Fra' ,fi: 'Alkaen' ,nb: 'Fra' @@ -636,6 +689,7 @@ function init() { ,sk: 'Od' ,nl: 'Van' ,ko: '시작일' + ,tr: 'Başlangıç' ,zh_cn: '从' } ,'To' : { @@ -650,6 +704,7 @@ function init() { ,hr: 'Do' ,sv: 'Till' ,it: 'A' + ,ja: '終了日' ,dk: 'Til' ,fi: 'Asti' ,nb: 'Til' @@ -659,6 +714,7 @@ function init() { ,sk: 'Do' ,nl: 'Tot' ,ko: '종료일' + ,tr: 'Bitiş' ,zh_cn: '到' } ,'Notes' : { @@ -673,6 +729,7 @@ function init() { ,bg: 'Бележки' ,hr: 'Bilješke' ,it: 'Note' + ,ja: 'メモ' ,dk: 'Noter' ,fi: 'Merkinnät' ,nb: 'Notater' @@ -682,6 +739,7 @@ function init() { ,sk: 'Poznámky' ,nl: 'Notities' ,ko: '메모' + ,tr: 'Not' ,zh_cn: '记录' } ,'Food' : { @@ -696,6 +754,7 @@ function init() { ,bg: 'Храна' ,hr: 'Hrana' ,it: 'Cibo' + ,ja: '食事' ,dk: 'Mad' ,fi: 'Ruoka' ,nb: 'Mat' @@ -705,6 +764,7 @@ function init() { ,sk: 'Jedlo' ,nl: 'Voeding' ,ko: '음식' + ,tr: 'Gıda' ,zh_cn: '食物' } ,'Insulin' : { @@ -719,6 +779,7 @@ function init() { ,hr: 'Inzulin' ,sv: 'Insulin' ,it: 'Insulina' + ,ja: 'インスリン' ,dk: 'Insulin' ,fi: 'Insuliini' ,nb: 'Insulin' @@ -728,6 +789,7 @@ function init() { ,sk: 'Inzulín' ,nl: 'Insuline' ,ko: '인슐린' + ,tr: 'İnsülin' ,zh_cn: '胰岛素' } ,'Carbs' : { @@ -742,6 +804,7 @@ function init() { ,hr: 'Ugljikohidrati' ,sv: 'Kolhydrater' ,it: 'Carboidrati' + ,ja: '炭水化物' ,dk: 'Kulhydrater' ,fi: 'Hiilihydraatit' ,nb: 'Karbohydrater' @@ -751,6 +814,7 @@ function init() { ,sk: 'Sacharidy' ,nl: 'Koolhydraten' ,ko: '탄수화물' + ,tr: 'Karbonhidrat' ,zh_cn: '碳水化合物' } ,'Notes contain' : { @@ -766,6 +830,7 @@ function init() { ,hr: 'Sadržaj bilješki' ,sv: 'Notering innehåller' ,it: 'Contiene note' + ,ja: 'メモ内容' ,dk: 'Noter indeholder' ,fi: 'Merkinnät sisältävät' ,nb: 'Notater inneholder' @@ -775,6 +840,7 @@ function init() { ,sk: 'Poznámky obsahujú' ,nl: 'Inhoud aantekening' ,ko: '메모 포함' + ,tr: 'Notlar içerir' ,zh_cn: '记录包括' } ,'Target bg range bottom' : { @@ -789,6 +855,7 @@ function init() { ,hr: 'Ciljna donja granica GUK-a' ,sv: 'Gräns för nedre blodsockervärde' ,it: 'Limite inferiore della glicemia' + ,ja: '目標血糖値　下限' ,dk: 'Nedre grænse for blodsukkerværdier' ,fi: 'Tavoitealueen alaraja' ,nb: 'Nedre grense for blodsukkerverdier' @@ -798,6 +865,7 @@ function init() { ,sk: 'Cieľová glykémia spodná' ,nl: 'Ondergrens doelbereik glucose' ,ko: '최저 목표 혈당 범위' + ,tr: 'Hedef KŞ aralığı düşük' ,zh_cn: '目标血糖范围 下限' } ,'top' : { @@ -812,6 +880,7 @@ function init() { ,hr: 'Gornja' ,sv: 'Toppen' ,it: 'Superiore' + ,ja: '上限' ,dk: 'Top' ,fi: 'yläraja' ,nb: 'Topp' @@ -821,6 +890,7 @@ function init() { ,sk: 'horná' ,nl: 'Top' ,ko: '최고치' + ,tr: 'Üstü' ,zh_cn: '上限' } ,'Show' : { @@ -835,6 +905,7 @@ function init() { ,bg: 'Покажи' ,hr: 'Prikaži' ,it: 'Mostra' + ,ja: '作成' ,dk: 'Vis' ,fi: 'Näytä' ,nb: 'Vis' @@ -844,6 +915,7 @@ function init() { ,sk: 'Ukáž' ,nl: 'Laat zien' ,ko: '보여 주세요~' + ,tr: 'Göster' ,zh_cn: '生成' } ,'Display' : { @@ -858,6 +930,7 @@ function init() { ,hr: 'Prikaži' ,sv: 'Visa' ,it: 'Schermo' + ,ja: '表示' ,dk: 'Vis' ,fi: 'Näyttö' ,nb: 'Vis' @@ -867,6 +940,7 @@ function init() { ,sk: 'Zobraz' ,nl: 'Weergeven' ,ko: '출력' + ,tr: 'Görüntüle' ,zh_cn: '显示' } ,'Loading' : { @@ -881,6 +955,7 @@ function init() { ,hr: 'Učitavanje' ,sv: 'Laddar' ,it: 'Carico' + ,ja: 'ロード中' ,dk: 'Indlæser' ,fi: 'Lataan' ,nb: 'Laster' @@ -890,6 +965,7 @@ function init() { ,sk: 'Nahrávam' ,nl: 'Laden' ,ko: '로딩' + ,tr: 'Yükleniyor' ,zh_cn: '载入中' } ,'Loading profile' : { @@ -904,6 +980,7 @@ function init() { ,bg: 'Зареждане на профил' ,hr: 'Učitavanje profila' ,it: 'Carico il profilo' + ,ja: 'プロフィールロード中' ,dk: 'Indlæser profil' ,fi: 'Lataan profiilia' ,nb: 'Leser profil' @@ -913,6 +990,7 @@ function init() { ,sk: 'Nahrávam profil' ,nl: 'Profiel laden' ,ko: '프로파일 로딩' + ,tr: 'Profil yükleniyor' ,zh_cn: '载入配置文件' } ,'Loading status' : { @@ -927,6 +1005,7 @@ function init() { ,bg: 'Зареждане на статус' ,hr: 'Učitavanje statusa' ,it: 'Stato di caricamento' + ,ja: 'ステータスロード中' ,dk: 'Indlæsnings status' ,fi: 'Lataan tilaa' ,nb: 'Leser status' @@ -936,6 +1015,7 @@ function init() { ,sk: 'Nahrávam status' ,nl: 'Laadstatus' ,ko: '상태 로딩' + ,tr: 'Durum Yükleniyor' ,zh_cn: '载入状态' } ,'Loading food database' : { @@ -950,6 +1030,7 @@ function init() { ,bg: 'Зареждане на данни с храни' ,hr: 'Učitavanje baze podataka o hrani' ,it: 'Carico database alimenti' + ,ja: '食事データベースロード中' ,dk: 'Indlæser mad database' ,fi: 'Lataan ruokatietokantaa' ,nb: 'Leser matdatabase' @@ -959,6 +1040,7 @@ function init() { ,sk: 'Nahrávam databázu jedál' ,nl: 'Voeding database laden' ,ko: '음식 데이터 베이스 로딩' + ,tr: 'Gıda veritabanı yükleniyor' ,zh_cn: '载入食物数据库' } ,'not displayed' : { @@ -973,6 +1055,7 @@ function init() { ,hr: 'Ne prikazuje se' ,sv: 'Visas ej' ,it: 'Non visualizzato' + ,ja: '表示できません' ,dk: 'Vises ikke' ,fi: 'ei näytetä' ,nb: 'Vises ikke' @@ -982,6 +1065,7 @@ function init() { ,sk: 'Nie je zobrazené' ,nl: 'Niet weergegeven' ,ko: '출력되지 않음' + ,tr: 'görüntülenmedi' ,zh_cn: '未显示' } ,'Loading CGM data of' : { @@ -996,6 +1080,7 @@ function init() { ,bg: 'Зареждане на CGM данни от' ,hr: 'Učitavanja podataka CGM-a' ,it: 'Carico dati CGM' + ,ja: 'CGMデータロード中' ,dk: 'Indlæser CGM-data for' ,fi: 'Lataan sensoritietoja: ' ,nb: 'Leser CGM-data for' @@ -1005,6 +1090,7 @@ function init() { ,sk: 'Nahrávam CGM dáta' ,nl: 'CGM data laden van' ,ko: 'CGM 데이터 로딩' + ,tr: 'den CGM veriler yükleniyor' ,zh_cn: '载入CGM（连续血糖监测）数据从' } ,'Loading treatments data of' : { @@ -1019,6 +1105,7 @@ function init() { ,bg: 'Зареждане на въведените лечения от' ,hr: 'Učitavanje podataka o tretmanu' ,it: 'Carico dati dei trattamenti' + ,ja: '治療データロード中' ,dk: 'Indlæser behandlingsdata for' ,fi: 'Lataan toimenpidetietoja: ' ,nb: 'Leser behandlingsdata for' @@ -1028,6 +1115,7 @@ function init() { ,sk: 'Nahrávam dáta ošetrenia' ,nl: 'Behandel gegevens laden van' ,ko: '처리 데이터 로딩' + ,tr: 'dan Tedavi verilerini yükle' ,zh_cn: '载入操作数据从' } ,'Processing data of' : { @@ -1042,6 +1130,7 @@ function init() { ,bg: 'Зареждане на данни от' ,hr: 'Obrada podataka' ,it: 'Elaborazione dei dati' + ,ja: 'データ処理中の日付：' ,dk: 'Behandler data for' ,fi: 'Käsittelen tietoja: ' ,nb: 'Behandler data for' @@ -1051,6 +1140,7 @@ function init() { ,sk: 'Spracovávam dáta' ,nl: 'Gegevens verwerken van' ,ko: '데이터 처리 중' + ,tr: 'dan Veri işleme' ,zh_cn: '处理数据从' } ,'Portion' : { @@ -1065,6 +1155,7 @@ function init() { ,hr: 'Dio' ,sv: 'Portion' ,it: 'Porzione' + ,ja: '一食分' ,dk: 'Portion' ,fi: 'Annos' ,nb: 'Porsjon' @@ -1074,6 +1165,7 @@ function init() { ,sk: 'Porcia' ,nl: 'Portie' ,ko: '부분' + ,tr: 'Porsiyon' ,zh_cn: '部分' } ,'Size' : { @@ -1088,6 +1180,7 @@ function init() { ,bg: 'Големина' ,hr: 'Veličina' ,it: 'Formato' + ,ja: '量' ,dk: 'Størrelse' ,fi: 'Koko' ,nb: 'Størrelse' @@ -1097,6 +1190,7 @@ function init() { ,sk: 'Veľkosť' ,nl: 'Grootte' ,ko: '크기' + ,tr: 'Boyut' ,zh_cn: '大小' } ,'(none)' : { @@ -1111,6 +1205,7 @@ function init() { ,bg: '(няма)' ,hr: '(Prazno)' ,it: '(Nessuno)' + ,ja: '(データなし)' ,dk: '(ingen)' ,fi: '(tyhjä)' ,nb: '(ingen)' @@ -1120,6 +1215,7 @@ function init() { ,sk: '(žiadny)' ,nl: '(geen)' ,ko: '(없음)' + ,tr: '(hiç)' ,zh_cn: '(无)' ,zh_tw: '(無)' } @@ -1135,6 +1231,7 @@ function init() { ,bg: 'няма' ,hr: 'Prazno' ,it: 'Nessuno' + ,ja: 'データなし' ,dk: 'Ingen' ,fi: 'tyhjä' ,nb: 'ingen' @@ -1144,6 +1241,7 @@ function init() { ,sk: 'Žiadny' ,nl: 'geen' ,ko: '없음' + ,tr: 'Hiç' ,zh_cn: '无' ,zh_tw: '無' } @@ -1159,6 +1257,7 @@ function init() { ,bg: '<няма>' ,hr: '' ,it: '' + ,ja: '<データなし>' ,dk: '' ,fi: '' ,nb: '' @@ -1168,6 +1267,7 @@ function init() { ,sk: '<žiadny>' ,nl: '' ,ko: '<없음>' + ,tr: '' ,zh_cn: '<无>' } ,'Result is empty' : { @@ -1182,6 +1282,7 @@ function init() { ,bg: 'Няма резултат' ,hr: 'Prazan rezultat' ,it: 'Risultato vuoto' + ,ja: '結果がありません' ,dk: 'Tomt resultat' ,fi: 'Ei tuloksia' ,nb: 'Tomt resultat' @@ -1191,6 +1292,7 @@ function init() { ,sk: 'Prázdny výsledok' ,nl: 'Geen resultaat' ,ko: '결과 없음' + ,tr: 'Sonuç boş' ,zh_cn: '结果为空' } ,'Day to day' : { @@ -1205,6 +1307,7 @@ function init() { ,bg: 'Ден за ден' ,hr: 'Svakodnevno' ,it: 'Giorno per giorno' + ,ja: '日差' ,dk: 'Dag til dag' ,fi: 'Päivittäinen' ,nb: 'Dag til dag' @@ -1214,8 +1317,32 @@ function init() { ,sk: 'Deň po dni' ,nl: 'Dag tot Dag' ,ko: '날짜' + ,tr: 'Günden Güne' ,zh_cn: '日到日' } + ,'Week to week' : { + cs: 'Week to week' + ,de: 'Week to week' + ,es: 'Week to week' + ,fr: 'Week to week' + ,el: 'Week to week' + ,pt: 'Week to week' + ,sv: 'Week to week' + ,ro: 'Week to week' + ,bg: 'Week to week' + ,hr: 'Week to week' + ,it: 'Week to week' + ,dk: 'Week to week' + ,fi: 'Week to week' + ,nb: 'Week to week' + ,he: 'Week to week' + ,pl: 'Week to week' + ,ru: 'Week to week' + ,sk: 'Week to week' + ,nl: 'Week to week' + ,ko: 'Week to week' + ,zh_cn: 'Week to week' + } ,'Daily Stats' : { cs: 'Denní statistiky' ,de: 'Tägliche Statistik' @@ -1228,6 +1355,7 @@ function init() { ,bg: 'Дневна статистика' ,hr: 'Dnevna statistika' ,it: 'Statistiche giornaliere' + ,ja: '１日統計' ,dk: 'Daglig statistik' ,fi: 'Päivittäiset tilastot' ,nb: 'Daglig statistikk' @@ -1237,6 +1365,7 @@ function init() { ,sk: 'Denné štatistiky' ,nl: 'Dagelijkse statistiek' ,ko: '날짜 통계' + ,tr: 'Günlük İstatistikler' ,zh_cn: '每日状态' } ,'Percentile Chart' : { @@ -1251,6 +1380,7 @@ function init() { ,hr: 'Tablica u postotcima' ,sv: 'Procentgraf' ,it: 'Grafico percentile' + ,ja: 'パーセント図' ,dk: 'Procentgraf' ,fi: 'Suhteellinen kuvaaja' ,nb: 'Prosentgraf' @@ -1260,6 +1390,7 @@ function init() { ,sk: 'Percentil' ,nl: 'Procentuele grafiek' ,ko: '백분위 그래프' + ,tr: 'Yüzdelik Grafiği' ,zh_cn: '百分位图形' } ,'Distribution' : { @@ -1274,6 +1405,7 @@ function init() { ,hr: 'Distribucija' ,sv: 'Distribution' ,it: 'Distribuzione' + ,ja: '配分' ,dk: 'Distribution' ,fi: 'Jakauma' ,nb: 'Distribusjon' @@ -1283,6 +1415,7 @@ function init() { ,sk: 'Distribúcia' ,nl: 'Verdeling' ,ko: '분포' + ,tr: 'Dağılım' ,zh_cn: '分布' } ,'Hourly stats' : { @@ -1297,6 +1430,7 @@ function init() { ,bg: 'Статистика по часове' ,hr: 'Statistika po satu' ,it: 'Statistiche per ore' + ,ja: '１時間統計' ,dk: 'Timestatistik' ,fi: 'Tunneittainen tilasto' ,nb: 'Timestatistikk' @@ -1306,15 +1440,19 @@ function init() { ,sk: 'Hodinové štatistiky' ,nl: 'Statistieken per uur' ,ko: '시간 통계' + ,tr: 'Saatlik istatistikler' ,zh_cn: '每小时状态' } ,'netIOB stats': { // hourlystats.js nl: 'netIOB stats' ,sv: 'netIOB statistik' + ,dk: 'netIOB statistik' ,he: 'netIOB סטטיסטיקת' ,de: 'netIOB Statistiken' ,fi: 'netIOB tilasto' ,bg: 'netIOB татистика' + ,ru: 'статистика netIOB' + ,tr: 'netIOB istatistikleri' } ,'temp basals must be rendered to display this report': { //hourlystats.js nl: 'tijdelijk basaal moet zichtbaar zijn voor dit rapport' @@ -1324,6 +1462,8 @@ function init() { ,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה' ,bg: 'временните базали трябва да са показани за да се покаже тази това' ,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה' + ,ru: 'Для этого отчета требуется показать данные о врем базалах' + ,tr: 'Bu raporu görüntülemek için geçici bazal oluşturulmalıdır' } ,'Weekly success' : { cs: 'Statistika po týdnech' @@ -1338,6 +1478,7 @@ function init() { ,hr: 'Tjedni uspjeh' ,sv: 'Veckoresultat' ,it: 'Statistiche settimanali' + ,ja: '１週間統計' ,dk: 'Uge resultat' ,fi: 'Viikkotilasto' ,he: 'הצלחה שבועית' @@ -1347,6 +1488,7 @@ function init() { ,sk: 'Týždenná úspešnosť' ,nl: 'Wekelijkse successen' ,ko: '주간 통계' + ,tr: 'Haftalık başarı' ,zh_cn: '每周统计' } ,'No data available' : { @@ -1361,6 +1503,7 @@ function init() { ,hr: 'Nema raspoloživih podataka' ,sv: 'Data saknas' ,it: 'Dati non disponibili' + ,ja: '利用できるデータがありません' ,dk: 'Mangler data' ,fi: 'Tietoja ei saatavilla' ,nb: 'Mangler data' @@ -1370,6 +1513,7 @@ function init() { ,sk: 'Žiadne dostupné dáta' ,nl: 'Geen gegevens beschikbaar' ,ko: '활용할 수 있는 데이터 없음' + ,tr: 'Veri yok' ,zh_cn: '无可用数据' } ,'Low' : { @@ -1384,6 +1528,7 @@ function init() { ,bg: 'Ниска' ,hr: 'Nizak' ,it: 'Basso' + ,ja: '目標血糖値低値' ,dk: 'Lav' ,fi: 'Matala' ,nb: 'Lav' @@ -1393,6 +1538,7 @@ function init() { ,sk: 'Nízka' ,nl: 'Laag' ,ko: '낮음' + ,tr: 'Düşük' ,zh_cn: '低血糖' } ,'In Range' : { @@ -1407,6 +1553,7 @@ function init() { ,bg: 'В граници' ,hr: 'U rasponu' ,it: 'Nell\'intervallo' + ,ja: '目標血糖値範囲内' ,dk: 'Indenfor intervallet' ,fi: 'Tavoitealueella' ,nb: 'Innenfor intervallet' @@ -1416,6 +1563,7 @@ function init() { ,sk: 'V rozsahu' ,nl: 'Binnen bereik' ,ko: '범위 안 ' + ,tr: 'Hedef alanında' ,zh_cn: '范围内' } ,'Period' : { @@ -1430,6 +1578,7 @@ function init() { ,bg: 'Период' ,hr: 'Period' ,it: 'Periodo' + ,ja: '期間' ,dk: 'Periode' ,fi: 'Aikaväli' ,nb: 'Periode' @@ -1439,6 +1588,7 @@ function init() { ,sk: 'Obdobie' ,nl: 'Periode' ,ko: '기간 ' + ,tr: 'Periyot' ,zh_cn: '期间' } ,'High' : { @@ -1453,6 +1603,7 @@ function init() { ,bg: 'Висока' ,hr: 'Visok' ,it: 'Alto' + ,ja: '目標血糖値高値' ,dk: 'Høj' ,fi: 'Korkea' ,nb: 'Høy' @@ -1462,6 +1613,7 @@ function init() { ,sk: 'Vysoká' ,nl: 'Hoog' ,ko: '높음' + ,tr: 'Yüksek' ,zh_cn: '高血糖' } ,'Average' : { @@ -1476,6 +1628,7 @@ function init() { ,bg: 'Средна' ,hr: 'Prosjek' ,it: 'Media' + ,ja: '平均値' ,dk: 'Gennemsnit' ,fi: 'Keskiarvo' ,nb: 'Gjennomsnitt' @@ -1485,6 +1638,7 @@ function init() { ,sk: 'Priemer' ,nl: 'Gemiddeld' ,ko: '평균' + ,tr: 'Ortalama' ,zh_cn: '平均' } ,'Low Quartile' : { @@ -1499,6 +1653,7 @@ function init() { ,hr: 'Donji kvartil' ,sv: 'Nedre kvadranten' ,it: 'Quartile basso' + ,ja: '下四分位値' ,dk: 'Nedre kvartil' ,fi: 'Alin neljäsosa' ,nb: 'Nedre kvartil' @@ -1508,6 +1663,7 @@ function init() { ,sk: 'Nizky kvartil' ,nl: 'Eerste kwartiel' ,ko: '낮은 4분위' + ,tr: 'Alt Çeyrek' ,zh_cn: '下四分位数' } ,'Upper Quartile' : { @@ -1522,6 +1678,7 @@ function init() { ,hr: 'Gornji kvartil' ,sv: 'Övre kvadranten' ,it: 'Quartile alto' + ,ja: '高四分位値' ,dk: 'Øvre kvartil' ,fi: 'Ylin neljäsosa' ,nb: 'Øvre kvartil' @@ -1531,6 +1688,7 @@ function init() { ,sk: 'Vysoký kvartil' ,nl: 'Derde kwartiel' ,ko: '높은 4분위' + ,tr: 'Üst Çeyrek' ,zh_cn: '上四分位数' } ,'Quartile' : { @@ -1545,6 +1703,7 @@ function init() { ,hr: 'Kvartil' ,sv: 'Kvadrant' ,it: 'Quartile' + ,ja: '四分位値' ,dk: 'Kvartil' ,fi: 'Neljäsosa' ,nb: 'Kvartil' @@ -1554,6 +1713,7 @@ function init() { ,sk: 'Kvartil' ,nl: 'Kwartiel' ,ko: '4분위' + ,tr: 'Çeyrek' ,zh_cn: '四分位数' } ,'Date' : { @@ -1568,6 +1728,7 @@ function init() { ,bg: 'Дата' ,hr: 'Datum' ,it: 'Data' + ,ja: '日付' ,dk: 'Dato' ,fi: 'Päivämäärä' ,nb: 'Dato' @@ -1577,6 +1738,7 @@ function init() { ,sk: 'Dátum' ,nl: 'Datum' ,ko: '날짜' + ,tr: 'Tarih' ,zh_cn: '日期' } ,'Normal' : { @@ -1592,6 +1754,7 @@ function init() { ,bg: 'Нормалнa' ,hr: 'Normalno' ,it: 'Normale' + ,ja: '通常' ,dk: 'Normal' ,fi: 'Normaali' ,nb: 'Normal' @@ -1601,6 +1764,7 @@ function init() { ,sk: 'Normálny' ,nl: 'Normaal' ,ko: '보통' + ,tr: 'Normal' ,zh_cn: '正常' } ,'Median' : { @@ -1615,6 +1779,7 @@ function init() { ,hr: 'Srednje' ,sv: 'Median' ,it: 'Mediana' + ,ja: '中央値' ,dk: 'Median' ,fi: 'Mediaani' ,nb: 'Median' @@ -1624,6 +1789,7 @@ function init() { ,sk: 'Medián' ,nl: 'Mediaan' ,ko: '중간값' + ,tr: 'Orta Değer' ,zh_cn: '中值' } ,'Readings' : { @@ -1638,7 +1804,8 @@ function init() { ,bg: 'Измервания' ,hr: 'Vrijednosti' ,it: 'Valori' - ,dk: 'Aflæsning' + ,ja: '読み込み' + ,dk: 'Aflæsninger' ,fi: 'Lukemia' ,nb: 'Avlesning' ,he: 'קריאות' @@ -1647,6 +1814,7 @@ function init() { ,sk: 'Záznamy' ,nl: 'Metingen' ,ko: '혈당' + ,tr: 'Ölçüm' ,zh_cn: '读数' } ,'StDev' : { @@ -1661,6 +1829,7 @@ function init() { ,bg: 'Стандартно отклонение' ,hr: 'Standardna devijacija' ,it: 'Dev.std' + ,ja: '標準偏差' ,dk: 'Standard afvigelse' ,fi: 'Keskijakauma' ,nb: 'Standardavvik' @@ -1670,6 +1839,7 @@ function init() { ,ru: 'Стандартное отклонение' ,sk: 'Štand. odch.' ,ko: '표준 편차' + ,tr: 'Standart Sapma' ,zh_cn: '标准偏差' } ,'Daily stats report' : { @@ -1684,15 +1854,17 @@ function init() { ,hr: 'Izvješće o dnevnim statistikama' ,sv: 'Dygnsstatistik' ,it: 'Statistiche giornaliere' + ,ja: '１日ごとの統計のレポート' ,dk: 'Daglig statistik rapport' ,fi: 'Päivittäinen tilasto' ,nb: 'Daglig statistikkrapport' ,he: 'דוח סטטיסטיקה יומית' ,pl: 'Dzienne statystyki' - ,ru: 'Статистика дня' + ,ru: 'Суточная статистика' ,sk: 'Denné štatistiky' ,nl: 'Dagelijkse statistieken' ,ko: '날짜 통계 보고서' + ,tr: 'Günlük istatistikler raporu' ,zh_cn: '每日状态报表' } ,'Glucose Percentile report' : { @@ -1708,6 +1880,7 @@ function init() { ,bg: 'Графика на КЗ' ,hr: 'Izvješće o postotku GUK-a' ,it: 'Percentuale Glicemie' + ,ja: 'グルコース(%)レポート' ,dk: 'Glukoserapport i procent' ,fi: 'Verensokeriarvojen jakauma' ,nb: 'Glukoserapport i prosent' @@ -1717,6 +1890,7 @@ function init() { ,sk: 'Report percentilu glykémií' ,nl: 'Glucose percentiel rapport' ,ko: '혈당 백분위 보고서' + ,tr: 'Glikoz Yüzdelik raporu' ,zh_cn: '血糖百分位报表' } ,'Glucose distribution' : { @@ -1731,6 +1905,7 @@ function init() { ,hr: 'Distribucija GUK-a' ,sv: 'Glukosdistribution' ,it: 'Distribuzione glicemie' + ,ja: '血糖値の分布' ,dk: 'Glukosefordeling' ,fi: 'Glukoosijakauma' ,nb: 'Glukosefordeling' @@ -1740,6 +1915,7 @@ function init() { ,sk: 'Rozloženie glykémie' ,nl: 'Glucose verdeling' ,ko: '혈당 분포' + ,tr: 'Glikoz dağılımı' ,zh_cn: '血糖分布' } ,'days total' : { @@ -1754,6 +1930,7 @@ function init() { ,bg: 'общо за деня' ,hr: 'ukupno dana' ,it: 'Giorni totali' + ,ja: '合計日数' ,dk: 'antal dage' ,fi: 'päivän arvio' ,nb: 'antall dager' @@ -1763,6 +1940,7 @@ function init() { ,sk: 'dní celkom' ,nl: 'Totaal dagen' ,ko: '날짜 전체' + ,tr: 'toplam gün' ,zh_cn: '天总计' } ,'Total per day' : { @@ -1782,10 +1960,11 @@ function init() { ,nb: 'antall dager' ,he: 'מספר ימים' ,pl: 'dni łącznie' - ,ru: 'всего дней' + ,ru: 'всего за сутки' ,sk: 'dní celkom' ,nl: 'Totaal dagen' ,ko: '날짜 전체' + ,tr: 'Günlük toplam' ,zh_cn: '天总计' } ,'Overall' : { @@ -1800,7 +1979,8 @@ function init() { ,bg: 'Общо' ,hr: 'Ukupno' ,it: 'Generale' - ,dk: 'Overall' + ,ja: '総合' + ,dk: 'Gennemsnit' ,fi: 'Yhteenveto' ,nb: 'Generelt' ,he: 'סך הכל' @@ -1809,6 +1989,7 @@ function init() { ,sk: 'Súhrn' ,nl: 'Totaal' ,ko: '전체' + ,tr: 'Tüm' ,zh_cn: '概览' } ,'Range' : { @@ -1823,6 +2004,7 @@ function init() { ,bg: 'Диапазон' ,hr: 'Raspon' ,it: 'Intervallo' + ,ja: '範囲' ,dk: 'Interval' ,fi: 'Alue' ,nb: 'Intervall' @@ -1832,6 +2014,7 @@ function init() { ,sk: 'Rozsah' ,nl: 'Bereik' ,ko: '범위' + ,tr: 'Alan' ,zh_cn: '范围' } ,'% of Readings' : { @@ -1846,6 +2029,7 @@ function init() { ,bg: '% от измервания' ,hr: '% očitanja' ,it: '% dei valori' + ,ja: '%精度' ,dk: '% af aflæsningerne' ,fi: '% lukemista' ,nb: '% af avlesningene' @@ -1855,6 +2039,7 @@ function init() { ,sk: '% záznamov' ,nl: '% metingen' ,ko: '% 읽는 중' + ,tr: '% Okumaların' ,zh_cn: '%已读取' } ,'# of Readings' : { @@ -1869,15 +2054,17 @@ function init() { ,bg: '№ от измервания' ,hr: 'broj očitanja' ,it: '# di valori' - ,dk: 'Antal af aflæsninger' + ,ja: '#精度' + ,dk: 'Antal aflæsninger' ,fi: 'Lukemien määrä' ,nb: 'Antall avlesninger' ,he: 'מספר קריאות' ,pl: 'Ilość Odczytów' - ,ru: '№ измерения' + ,ru: 'кол-во измерений' ,sk: 'Počet záznamov' ,nl: 'Aantal metingen' ,ko: '# 읽는 중' + ,tr: '# Okumaların' ,zh_cn: '#已读取' } ,'Mean' : { @@ -1892,6 +2079,7 @@ function init() { ,bg: 'Средна стойност' ,hr: 'Prosjek' ,it: 'Media' + ,ja: '意味' ,dk: 'Gennemsnit' ,fi: 'Keskiarvo' ,nb: 'Gjennomsnitt' @@ -1901,6 +2089,7 @@ function init() { ,sk: 'Stred' ,nl: 'Gemiddeld' ,ko: '평균' + ,tr: 'ortalama' ,zh_cn: '平均' } ,'Standard Deviation' : { @@ -1915,6 +2104,7 @@ function init() { ,hr: 'Standardna devijacija' ,sv: 'Standardavvikelse' ,it: 'Deviazione Standard' + ,ja: '標準偏差' ,dk: 'Standardafvigelse' ,fi: 'Keskijakauma' ,nb: 'Standardavvik' @@ -1924,6 +2114,7 @@ function init() { ,sk: 'Štandardná odchylka' ,nl: 'Standaard deviatie' ,ko: '표준 편차' + ,tr: 'Standart Sapma' ,zh_cn: '标准偏差' } ,'Max' : { @@ -1938,6 +2129,7 @@ function init() { ,bg: 'Макс.' ,hr: 'Max' ,it: 'Max' + ,ja: '最大値' ,dk: 'Max' ,fi: 'Maks' ,nb: 'Max' @@ -1947,6 +2139,7 @@ function init() { ,sk: 'Max' ,nl: 'Max' ,ko: '최대값' + ,tr: 'Max' ,zh_cn: '最大值' } ,'Min' : { @@ -1961,6 +2154,7 @@ function init() { ,bg: 'Мин.' ,hr: 'Min' ,it: 'Min' + ,ja: '最小値' ,dk: 'Min' ,fi: 'Min' ,nb: 'Min' @@ -1970,6 +2164,7 @@ function init() { ,sk: 'Min' ,nl: 'Min' ,ko: '최소값' + ,tr: 'Min' ,zh_cn: '最小值' } ,'A1c estimation*' : { @@ -1984,6 +2179,7 @@ function init() { ,hr: 'Procjena HbA1c-a' ,sv: 'Beräknat A1c-värde ' ,it: 'Stima A1c' + ,ja: '予想HbA1c' ,dk: 'Beregnet A1c-værdi ' ,fi: 'A1c arvio*' ,nb: 'Beregnet HbA1c' @@ -1993,6 +2189,7 @@ function init() { ,sk: 'Odhadované HbA1C*' ,nl: 'Geschatte HbA1C' ,ko: '예상 당화혈 색소' + ,tr: 'Tahmini A1c *' ,zh_cn: '糖化血红蛋白估算' } ,'Weekly Success' : { @@ -2008,6 +2205,7 @@ function init() { ,hr: 'Tjedni uspjeh' ,sv: 'Veckoresultat' ,it: 'Risultati settimanali' + ,ja: '週間達成度' ,dk: 'Uge resultat' ,fi: 'Viikottainen tulos' ,nb: 'Ukeresultat' @@ -2017,6 +2215,7 @@ function init() { ,sk: 'Týždenná úspešnosť' ,nl: 'Wekelijks succes' ,ko: '주간 통계' + ,tr: 'Haftalık Başarı' ,zh_cn: '每周统计' } ,'There is not sufficient data to run this report. Select more days.' : { @@ -2031,6 +2230,7 @@ function init() { ,hr: 'Nema dovoljno podataka za izvođenje izvještaja. Odaberite još dana.' ,sv: 'Data saknas för att köra rapport. Välj fler dagar.' ,it: 'Non ci sono dati sufficienti per eseguire questo rapporto. Selezionare più giorni.' + ,ja: 'レポートするためのデータが足りません。もっと多くの日を選択してください。' ,dk: 'Der er utilstrækkeligt data til at generere rapporten. Vælg flere dage.' ,fi: 'Raporttia ei voida luoda liian vähäisen tiedon vuoksi. Valitse useampia päiviä.' ,nb: 'Der er ikke nok data til å lage rapporten. Velg flere dager.' @@ -2040,6 +2240,7 @@ function init() { ,sk: 'Nedostatok dát. Vyberte dlhšie časové obdobie.' ,nl: 'Er zijn niet genoeg gegevens voor dit rapport, selecteer meer dagen.' ,ko: '이 보고서를 실행하기 위한 데이터가 충분하지 않습니다. 더 많은 날들을 선택해 주세요.' + ,tr: 'Bu raporu çalıştırmak için yeterli veri yok. Daha fazla gün seçin.' ,zh_cn: '没有足够的数据生成报表，请选择更长时间段。' } // food editor @@ -2056,6 +2257,7 @@ function init() { ,hr: 'Koristi se pohranjeni API tajni hash' ,sv: 'Använd hemlig API-nyckel' ,it: 'Stai utilizzando API hash segreta' + ,ja: '保存されたAPI secret hashを使用する' ,dk: 'Anvender gemt API-nøgle' ,fi: 'Tallennettu salainen API-tarkiste käytössä' ,nb: 'Bruker lagret API nøkkel' @@ -2065,6 +2267,7 @@ function init() { ,sk: 'Používam uložený API hash heslo' ,nl: 'Gebruik opgeslagen geheime API Hash' ,ko: '저장된 API secret hash를 사용 중' + ,tr: 'Kaydedilmiş API secret hash kullan' ,zh_cn: '使用已存储的API密钥哈希值' ,zh_tw: '使用已存儲的API密鑰哈希值' } @@ -2081,6 +2284,7 @@ function init() { ,hr: 'Nema pohranjenog API tajnog hasha. Unesite tajni API' ,sv: 'Hemlig api-nyckel saknas. Du måste ange API hemlighet' ,it: 'API hash segreto non è ancora memorizzato. È necessario inserire API segreto.' + ,ja: 'API secret hashがまだ保存されていません。API secretの入力が必要です。' ,dk: 'Mangler API-nøgle. Du skal indtaste API nøglen' ,fi: 'Salainen API-tarkiste puuttuu. Syötä API tarkiste.' ,nb: 'Mangler API nøkkel. Du må skrive inn API hemmelighet.' @@ -2090,6 +2294,7 @@ function init() { ,sk: 'Nieje uložené žiadne API hash heslo. Musíte zadať API heslo.' ,nl: 'Er is nog geen geheime API Hash opgeslagen. U moet eerst een geheime API code invoeren.' ,ko: 'API secret hash가 아직 저장되지 않았습니다. API secret를 입력해 주세요.' + ,tr: 'Henüz bir API secret hash saklanmadı. API parolasını girmeniz gerekiyor.' ,zh_cn: '没有已存储的API密钥，请输入API密钥。' ,zh_tw: '沒有已存儲的API密鑰，請輸入API密鑰。' } @@ -2106,6 +2311,7 @@ function init() { ,hr: 'Baza podataka je učitana' ,sv: 'Databas laddad' ,it: 'Database caricato' + ,ja: 'データベースロード完了' ,dk: 'Database indlæst' ,fi: 'Tietokanta ladattu' ,nb: 'Database lest' @@ -2115,6 +2321,7 @@ function init() { ,sk: 'Databáza načítaná' ,nl: 'Database geladen' ,ko: '데이터베이스 로드' + ,tr: 'Veritabanı yüklendi' ,zh_cn: '数据库已载入' } ,'Error: Database failed to load' : { @@ -2129,6 +2336,7 @@ function init() { ,hr: 'Greška: Baza podataka nije učitana' ,sv: 'Error: Databas kan ej laddas' ,it: 'Errore: database non è stato caricato' + ,ja: 'エラー：データベースを読み込めません' ,dk: 'Fejl: Database kan ikke indlæses' ,fi: 'Virhe: Tietokannan lataaminen epäonnistui' ,nb: 'Feil: Database kan ikke leses' @@ -2138,8 +2346,33 @@ function init() { ,sk: 'Chyba pri načítaní databázy' ,nl: 'FOUT: Database niet geladen' ,ko: '에러: 데이터베이스 로드 실패' + ,tr: 'Hata: Veritabanı yüklenemedi' ,zh_cn: '错误：数据库载入失败' } + ,'Error' : { + cs: 'Error' + ,he: 'Error' + ,nb: 'Error' + ,fr: 'Error' + ,ro: 'Error' + ,el: 'Error' + ,de: 'Error' + ,es: 'Error' + ,dk: 'Error' + ,sv: 'Error' + ,bg: 'Error' + ,it: 'Error' + ,fi: 'Error' + ,pl: 'Error' + ,pt: 'Error' + ,ru: 'Error' + ,sk: 'Error' + ,nl: 'Error' + ,ko: 'Error' + ,tr: 'Error' + ,zh_cn: 'Error' + ,zh_tw: 'Error' + } ,'Create new record' : { cs: 'Vytvořit nový záznam' ,de: 'Erstelle neuen Datensatz' @@ -2152,7 +2385,8 @@ function init() { ,hr: 'Kreiraj novi zapis' ,sv: 'Skapa ny post' ,it: 'Crea nuovo registro' - ,dk: 'Danner ny post' + ,ja: '新しい記録を作る' + ,dk: 'Opret ny post' ,fi: 'Luo uusi tallenne' ,nb: 'Lager ny registrering' ,he: 'צור רשומה חדשה' @@ -2161,6 +2395,7 @@ function init() { ,sk: 'Vytovriť nový záznam' ,nl: 'Opslaan' ,ko: '새입력' + ,tr: 'Yeni kayıt oluştur' ,zh_cn: '新增记录' } ,'Save record' : { @@ -2175,6 +2410,7 @@ function init() { ,hr: 'Spremi zapis' ,sv: 'Spara post' ,it: 'Salva Registro' + ,ja: '保存' ,dk: 'Gemmer post' ,fi: 'Tallenna' ,nb: 'Lagrer registrering' @@ -2184,6 +2420,7 @@ function init() { ,sk: 'Uložiť záznam' ,nl: 'Sla op' ,ko: '저장' + ,tr: 'Kayıtları kaydet' ,zh_cn: '保存记录' } ,'Portions' : { @@ -2198,6 +2435,7 @@ function init() { ,hr: 'Dijelovi' ,sv: 'Portion' ,it: 'Porzioni' + ,ja: '一食分' ,dk: 'Portioner' ,fi: 'Annokset' ,nb: 'Porsjoner' @@ -2207,6 +2445,7 @@ function init() { ,sk: 'Porcií' ,nl: 'Porties' ,ko: '부분' + ,tr: 'Porsiyonlar' ,zh_cn: '部分' } ,'Unit' : { @@ -2221,6 +2460,7 @@ function init() { ,hr: 'Jedinica' ,sv: 'Enhet' ,it: 'Unità' + ,ja: '単位' ,dk: 'Enheder' ,fi: 'Yksikkö' ,nb: 'Enhet' @@ -2230,6 +2470,7 @@ function init() { ,sk: 'Jednot.' ,nl: 'Eenheid' ,ko: '단위' + ,tr: 'Birim' ,zh_cn: '单位' } ,'GI' : { @@ -2245,6 +2486,7 @@ function init() { ,bg: 'ГИ' ,hr: 'GI' ,it: 'IG-Ind.Glic.' + ,ja: 'GI' ,dk: 'GI' ,fi: 'GI' ,nb: 'GI' @@ -2254,6 +2496,7 @@ function init() { ,he: 'GI' ,nl: 'Glycemische index ' ,ko: '혈당 지수' + ,tr: 'GI-Glisemik İndeks' ,zh_cn: 'GI（血糖生成指数）' } ,'Edit record' : { @@ -2268,6 +2511,7 @@ function init() { ,hr: 'Uredi zapis' ,sv: 'Editera post' ,it: 'Modifica registro' + ,ja: '記録編集' ,dk: 'Rediger post' ,fi: 'Muokkaa tallennetta' ,nb: 'Editere registrering' @@ -2277,6 +2521,7 @@ function init() { ,sk: 'Upraviť záznam' ,nl: 'Bewerk invoer' ,ko: '편집' + ,tr: 'Kaydı düzenle' ,zh_cn: '编辑记录' } ,'Delete record' : { @@ -2291,6 +2536,7 @@ function init() { ,hr: 'Izbriši zapis' ,sv: 'Radera post' ,it: 'Cancella registro' + ,ja: '記録削除' ,dk: 'Slet post' ,fi: 'Tuhoa tallenne' ,nb: 'Slette registrering' @@ -2300,6 +2546,7 @@ function init() { ,sk: 'Zmazať záznam' ,nl: 'Verwijder invoer' ,ko: '삭제' + ,tr: 'Kaydı sil' ,zh_cn: '删除记录' } ,'Move to the top' : { @@ -2314,6 +2561,7 @@ function init() { ,bg: 'Преместване в началото' ,hr: 'Premjesti na vrh' ,it: 'Spostare verso l\'alto' + ,ja: 'トップ画面へ' ,dk: 'Gå til toppen' ,fi: 'Siirrä ylimmäksi' ,nb: 'Gå til toppen' @@ -2323,6 +2571,7 @@ function init() { ,sk: 'Presunúť na začiatok' ,nl: 'Ga naar boven' ,ko: '맨처음으로 이동' + ,tr: 'En üste taşı' ,zh_cn: '移至顶端' } ,'Hidden' : { @@ -2337,6 +2586,7 @@ function init() { ,bg: 'Скрити' ,hr: 'Skriveno' ,it: 'Nascosto' + ,ja: '隠す' ,dk: 'Skjult' ,fi: 'Piilotettu' ,nb: 'Skjult' @@ -2346,6 +2596,7 @@ function init() { ,sk: 'Skrytý' ,nl: 'Verborgen' ,ko: '숨김' + ,tr: 'Gizli' ,zh_cn: '隐藏' } ,'Hide after use' : { @@ -2360,6 +2611,7 @@ function init() { ,hr: 'Sakrij nakon korištenja' ,sv: 'Dölj efter användning' ,it: 'Nascondi dopo l\'uso' + ,ja: '使用後に隠す' ,dk: 'Skjul efter brug' ,fi: 'Piilota käytön jälkeen' ,nb: 'Skjul etter bruk' @@ -2369,6 +2621,7 @@ function init() { ,sk: 'Skryť po použití' ,nl: 'Verberg na gebruik' ,ko: '사용 후 숨김' + ,tr: 'Kullandıktan sonra gizle' ,zh_cn: '使用后隐藏' } ,'Your API secret must be at least 12 characters long' : { @@ -2385,6 +2638,7 @@ function init() { ,he:' הסיסמא הסודית חייבת להיות באורך של 12 תווים לפחות' ,sv: 'Hemlig API-nyckel måsta innehålla 12 tecken' ,it: 'il vostro API secreto deve essere lungo almeno 12 caratteri' + ,ja: 'APIシークレットは12文字以上の長さが必要です' ,dk: 'Din API nøgle skal være mindst 12 tegn lang' ,fi: 'API-avaimen tulee olla ainakin 12 merkin mittainen' ,nb: 'Din API nøkkel må være minst 12 tegn lang' @@ -2393,6 +2647,7 @@ function init() { ,sk: 'Vaše API heslo musí mať najmenej 12 znakov' ,nl: 'Uw API wachtwoord dient tenminste 12 karakters lang te zijn' ,ko: 'API secret는 최소 12자 이상이여야 합니다.' + ,tr: 'PI parolanız en az 12 karakter uzunluğunda olmalıdır' ,zh_cn: 'API密钥最少需要12个字符' ,zh_tw: 'API密鑰最少需要12個字符' } @@ -2409,6 +2664,7 @@ function init() { ,hr: 'Neispravan tajni API' ,sv: 'Felaktig API-nyckel' ,it: 'API secreto non corretto' + ,ja: 'APIシークレットは正しくありません' ,dk: 'Forkert API-nøgle' ,fi: 'Väärä API-avain' ,nb: 'Ugyldig API nøkkel' @@ -2418,6 +2674,7 @@ function init() { ,sk: 'Nesprávne API heslo' ,nl: 'Onjuist API wachtwoord' ,ko: '잘못된 API secret' + ,tr: 'Hatalı API parolası' ,zh_cn: 'API密钥错误' ,zh_tw: 'API密鑰錯誤' } @@ -2434,15 +2691,17 @@ function init() { ,hr: 'API tajni hash je pohranjen' ,sv: 'Lagrad hemlig API-hash' ,it: 'Hash API secreto memorizzato' + ,ja: 'APIシークレットを保存出来ました' ,dk: 'Hemmelig API-hash gemt' ,fi: 'API salaisuus talletettu' ,nb: 'API nøkkel lagret' ,pl: 'Poufne klucz API zapisane' ,he: ' הסיסמא הסודית נשמרה' - ,ru: 'Пароль API сохранен' + ,ru: 'Хэш пароля API сохранен' ,sk: 'Hash API hesla uložený' ,nl: 'API wachtwoord opgeslagen' ,ko: 'API secret hash가 저장 되었습니다.' + ,tr: 'API secret hash parolası saklandı' ,zh_cn: 'API密钥已存储' ,zh_tw: 'API密鑰已存儲' } @@ -2458,6 +2717,7 @@ function init() { ,bg: 'Статус' ,hr: 'Status' ,it: 'Stato' + ,ja: '統計' ,dk: 'Status' ,fi: 'Tila' ,nb: 'Status' @@ -2467,6 +2727,7 @@ function init() { ,sk: 'Status' ,nl: 'Status' ,ko: '상태' + ,tr: 'Durum' ,zh_cn: '状态' } ,'Not loaded' : { @@ -2482,6 +2743,7 @@ function init() { ,hr: 'Nije učitano' ,sv: 'Ej laddad' ,it: 'Non caricato' + ,ja: '読み込めません' ,dk: 'Ikke indlæst' ,fi: 'Ei ladattu' ,nb: 'Ikke lest' @@ -2491,6 +2753,7 @@ function init() { ,sk: 'Nenačítaný' ,nl: 'Niet geladen' ,ko: '로드되지 않음' + ,tr: 'Yüklü değil' ,zh_cn: '未载入' } ,'Food Editor' : { @@ -2506,6 +2769,7 @@ function init() { ,hr: 'Editor hrane' ,sv: 'Födoämneseditor' ,it: 'NS - Database Alimenti' + ,ja: '食事編集' ,he: 'עורך מזון' ,dk: 'Mad editor' ,fi: 'Muokkaa ruokia' @@ -2515,6 +2779,7 @@ function init() { ,sk: 'Editor jedál' ,nl: 'Voeding beheer' ,ko: '음식 편집기' + ,tr: 'Gıda Editörü' ,zh_cn: '食物编辑器' } ,'Your database' : { @@ -2529,6 +2794,7 @@ function init() { ,bg: 'Твоята база с данни' ,hr: 'Vaša baza podataka' ,it: 'Vostro database' + ,ja: 'あなたのデータベース' ,dk: 'Din database' ,fi: 'Tietokantasi' ,nb: 'Din database' @@ -2538,6 +2804,7 @@ function init() { ,sk: 'Vaša databáza' ,nl: 'Uw database' ,ko: '당신의 데이터베이스' + ,tr: 'Sizin Veritabanınız' ,zh_cn: '你的数据库' } ,'Filter' : { @@ -2552,6 +2819,7 @@ function init() { ,bg: 'Филтър' ,hr: 'Filter' ,it: 'Filtro' + ,ja: 'フィルター' ,dk: 'Filter' ,fi: 'Suodatin' ,nb: 'Filter' @@ -2561,6 +2829,7 @@ function init() { ,ru: 'Фильтр' ,sk: 'Filter' ,ko: '필터' + ,tr: 'Filtre' ,zh_cn: '过滤器' } ,'Save' : { @@ -2575,6 +2844,7 @@ function init() { ,hr: 'Spremi' ,sv: 'Spara' ,it: 'Salva' + ,ja: '保存' ,dk: 'Gem' ,fi: 'Tallenna' ,nb: 'Lagre' @@ -2584,6 +2854,7 @@ function init() { ,sk: 'Uložiť' ,nl: 'Opslaan' ,ko: '저장' + ,tr: 'Kaydet' ,zh_cn: '保存' ,zh_tw: '保存' } @@ -2599,6 +2870,7 @@ function init() { ,hr: 'Očisti' ,sv: 'Rensa' ,it: 'Pulisci' + ,ja: 'クリア' ,dk: 'Rense' ,fi: 'Tyhjennä' ,nb: 'Tøm' @@ -2608,6 +2880,7 @@ function init() { ,sk: 'Vymazať' ,nl: 'Leeg maken' ,ko: '취소' + ,tr: 'Temizle' ,zh_cn: '清除' } ,'Record' : { @@ -2622,6 +2895,7 @@ function init() { ,bg: 'Запиши' ,hr: 'Zapis' ,it: 'Registro' + ,ja: '記録' ,dk: 'Post' ,fi: 'Tietue' ,nb: 'Registrering' @@ -2631,6 +2905,7 @@ function init() { ,sk: 'Záznam' ,nl: 'Toevoegen' ,ko: '기록' + ,tr: 'Kayıt' ,zh_cn: '记录' } ,'Quick picks' : { @@ -2645,6 +2920,7 @@ function init() { ,hr: 'Brzi izbor' ,sv: 'Snabbval' ,it: 'Scelta rapida' + ,ja: 'クイック選択' ,dk: 'Hurtig valg' ,fi: 'Nopeat valinnat' ,nb: 'Hurtigvalg' @@ -2654,6 +2930,7 @@ function init() { ,sk: 'Rýchly výber' ,nl: 'Snelkeuze' ,ko: '빠른 선택' + ,tr: 'Hızlı seçim' ,zh_cn: '快速选择' } ,'Show hidden' : { @@ -2668,6 +2945,7 @@ function init() { ,hr: 'Prikaži skriveno' ,sv: 'Visa dolda' ,it: 'Mostra nascosto' + ,ja: '表示する' ,dk: 'Vis skjulte' ,fi: 'Näytä piilotettu' ,nb: 'Vis skjulte' @@ -2677,6 +2955,7 @@ function init() { ,sk: 'Zobraziť skryté' ,nl: 'Laat verborgen zien' ,ko: '숨김 보기' + ,tr: 'Gizli göster' ,zh_cn: '显示隐藏值' } ,'Your API secret' : { @@ -2693,6 +2972,7 @@ function init() { ,hr: 'Vaš tajni API' ,he: 'הסיסמא הסודית שלך' ,it: 'Il tuo API secreto' + ,ja: 'あなたのAPI Secret' ,dk: 'Din API-nøgle' ,fi: 'Sinun API-avaimesi' ,nb: 'Din API nøkkel' @@ -2701,6 +2981,7 @@ function init() { ,sk: 'Vaše API heslo' ,nl: 'Uw API wachtwoord' ,ko: 'API secret' + ,tr: 'API secret parolanız' ,zh_cn: 'API密钥' ,zh_tw: 'API密鑰' } @@ -2717,15 +2998,17 @@ function init() { ,hr: 'Pohrani hash na ovom računalu (Koristiti samo na osobnom računalu)' ,sv: 'Lagra hashvärde på denna dator (använd endast på privat dator)' ,it: 'Conservare hash su questo computer (utilizzare solo su computer privati)' + ,ja: 'このコンピューターにハッシュ値を保存する(このコンピューターでのみ使用する)' ,dk: 'Gemme hash på denne computer (brug kun på privat computer)' ,fi: 'Tallenna avain tälle tietokoneelle (käytä vain omalla tietokoneellasi)' ,nb: 'Lagre hash på denne pc (bruk kun på privat pc)' ,he:'שמור סיסמא הסודית על המחשב ( יש להשתמש רק על מחשב פרטי)' ,pl: 'Zapisz na tym komputerze (korzystaj tylko na komputerach prywatnych)' - ,ru: 'Сохранить на этом ПК (только для личных компьютеров)' + ,ru: 'Сохранить хеш на этом ПК (только для личных компьютеров)' ,sk: 'Uložiť hash na tomto počítači (Používajte iba na súkromných počítačoch)' ,nl: 'Sla wachtwoord op. (gebruik dit alleen op prive computers)' ,ko: '이 컴퓨터에 hash를 저장하세요.(단, 개인 컴퓨터를 사용하세요.)' + ,tr: 'Bu bilgisayarda hash parolasını sakla (Yalnızca özel bilgisayarlarda kullanın)' ,zh_cn: '在本机存储API密钥\n（请勿在公用电脑上使用本功能）' ,zh_tw: '在本機存儲API密鑰\n（請勿在公用電腦上使用本功能）' } @@ -2741,6 +3024,7 @@ function init() { ,bg: 'Събития' ,hr: 'Tretmani' ,it: 'Somministrazioni' + ,ja: '治療' ,dk: 'Behandling' ,fi: 'Hoitotoimenpiteet' ,nb: 'Behandlinger' @@ -2750,6 +3034,7 @@ function init() { ,sk: 'Ošetrenie' ,nl: 'Behandelingen' ,ko: '대처' + ,tr: 'Tedaviler' ,zh_cn: '操作' } ,'Time' : { @@ -2764,6 +3049,7 @@ function init() { ,bg: 'Време' ,hr: 'Vrijeme' ,it: 'Tempo' + ,ja: '時間' ,dk: 'Tid' ,fi: 'Aika' ,nb: 'Tid' @@ -2773,6 +3059,7 @@ function init() { ,sk: 'Čas' ,nl: 'Tijd' ,ko: '시간' + ,tr: 'Zaman' ,zh_cn: '时间' ,zh_tw: '時間' } @@ -2788,6 +3075,7 @@ function init() { ,bg: 'Вид събитие' ,hr: 'Vrsta događaja' ,it: 'Tipo di evento' + ,ja: 'イベント' ,dk: 'Hændelsestype' ,fi: 'Tapahtumatyyppi' ,nb: 'Type' @@ -2797,6 +3085,7 @@ function init() { ,sk: 'Typ udalosti' ,nl: 'Soort' ,ko: '입력 유형' + ,tr: 'Etkinlik tipi' ,zh_cn: '事件类型' } ,'Blood Glucose' : { @@ -2811,6 +3100,7 @@ function init() { ,bg: 'Кръвна захар' ,hr: 'GUK' ,it: 'Glicemie' + ,ja: '血糖値' ,dk: 'Glukoseværdi' ,fi: 'Verensokeri' ,nb: 'Blodsukker' @@ -2820,6 +3110,7 @@ function init() { ,sk: 'Glykémia' ,nl: 'Bloed glucose' ,ko: '혈당' + ,tr: 'Kan Şekeri' ,zh_cn: '血糖值' } ,'Entered By' : { @@ -2834,6 +3125,7 @@ function init() { ,bg: 'Въведено от' ,hr: 'Unos izvršio' ,it: 'inserito da' + ,ja: '入力者' ,dk: 'Indtastet af' ,fi: 'Tiedot syötti' ,nb: 'Lagt inn av' @@ -2843,6 +3135,7 @@ function init() { ,sk: 'Zadal' ,nl: 'Ingevoerd door' ,ko: '입력됨' + ,tr: 'Tarafından girildi' ,zh_cn: '输入人' } ,'Delete this treatment?' : { @@ -2857,6 +3150,7 @@ function init() { ,hr: 'Izbriši ovaj tretman?' ,sv: 'Ta bort händelse?' ,it: 'Eliminare questa somministrazione?' + ,ja: 'この治療データを削除しますか？' ,dk: 'Slet denne hændelse?' ,fi: 'Tuhoa tämä hoitotoimenpide?' ,nb: 'Slett denne hendelsen?' @@ -2866,6 +3160,7 @@ function init() { ,sk: 'Vymazať toto ošetrenie?' ,nl: 'Verwijder' ,ko: '이 대처를 지울까요?' + ,tr: 'Bu tedaviyi sil?' ,zh_cn: '删除这个操作？' } ,'Carbs Given' : { @@ -2880,6 +3175,7 @@ function init() { ,hr: 'Količina UH' ,sv: 'Antal kolhydrater' ,it: 'Carboidrati' + ,ja: '摂取糖質量' ,dk: 'Antal kulhydrater' ,fi: 'Hiilihydraatit' ,nb: 'Karbo' @@ -2889,6 +3185,7 @@ function init() { ,sk: 'Sacharidov' ,nl: 'Aantal koolhydraten' ,ko: '탄수화물 요구량' + ,tr: 'Karbonhidrat Verilen' ,zh_cn: '碳水化合物量' } ,'Inzulin Given' : { @@ -2903,6 +3200,7 @@ function init() { ,hr: 'Količina inzulina' ,sv: 'Insulin' ,it: 'Insulina' + ,ja: 'インスリン投与量' ,dk: 'Insulin' ,fi: 'Insuliiniannos' ,nb: 'Insulin' @@ -2912,6 +3210,7 @@ function init() { ,sk: 'Inzulínu' ,nl: 'Insuline' ,ko: '인슐린 요구량' + ,tr: 'İnsülin Verilen' ,zh_cn: '胰岛素输注' } ,'Event Time' : { @@ -2926,6 +3225,7 @@ function init() { ,bg: 'Въвеждане' ,hr: 'Vrijeme događaja' ,it: 'Ora Evento' + ,ja: 'イベント時間' ,dk: 'Tidspunkt for hændelsen' ,fi: 'Aika' ,nb: 'Tidspunkt for hendelsen' @@ -2935,6 +3235,7 @@ function init() { ,sk: 'Čas udalosti' ,nl: 'Tijdstip' ,ko: '입력 시간' + ,tr: 'Etkinliğin zamanı' ,zh_cn: '事件时间' } ,'Please verify that the data entered is correct' : { @@ -2949,6 +3250,7 @@ function init() { ,hr: 'Molim Vas provjerite jesu li uneseni podaci ispravni' ,sv: 'Vänligen verifiera att inlagd data är korrekt' ,it: 'Si prega di verificare che i dati inseriti siano corretti' + ,ja: '入力したデータが正しいか確認をお願いします。' ,dk: 'Venligst verificer at indtastet data er korrekt' ,fi: 'Varmista, että tiedot ovat oikein' ,nb: 'Vennligst verifiser at inntastet data er korrekt' @@ -2958,6 +3260,7 @@ function init() { ,sk: 'Prosím, skontrolujte správnosť zadaných údajov' ,nl: 'Controleer uw invoer' ,ko: '입력한 데이터가 정확한지 확인해 주세요.' + ,tr: 'Lütfen girilen verilerin doğru olduğunu kontrol edin.' ,zh_cn: '请验证输入的数据是否正确' } ,'BG' : { @@ -2973,6 +3276,7 @@ function init() { ,bg: 'КЗ' ,hr: 'GUK' ,it: 'Glicemie' + ,ja: 'BG' ,dk: 'BS' ,fi: 'VS' ,nb: 'BS' @@ -2981,6 +3285,7 @@ function init() { ,sk: 'Glykémia' ,nl: 'BG' ,ko: '혈당' + ,tr: 'KŞ' ,zh_cn: '血糖' } ,'Use BG correction in calculation' : { @@ -2996,14 +3301,16 @@ function init() { ,hr: 'Koristi korekciju GUK-a u izračunu' ,sv: 'Använd BS-korrektion för beräkning' ,it: 'Utilizzare la correzione nei calcoli delle Glicemie' + ,ja: 'ボーラス計算機能使用' ,dk: 'Anvend BS-korrektion i beregning' ,fi: 'Käytä korjausannosta laskentaan' ,nb: 'Bruk blodsukkerkorrigering i beregning' ,pl: 'Użyj BG w obliczeniach korekty' - ,ru: 'При рассчете проводите коррекцию на СК' + ,ru: 'При расчете проводите коррекцию на СК' ,sk: 'Použite korekciu na glykémiu' ,nl: 'Gebruik BG in berekeningen' ,ko: '계산에 보정된 혈당을 사용하세요.' + ,tr: 'Hesaplamada KŞ düzeltmesini kullan' ,zh_cn: '使用血糖值修正计算' } ,'BG from CGM (autoupdated)' : { @@ -3019,6 +3326,7 @@ function init() { ,bg: 'КЗ от сензора (автоматично)' ,hr: 'GUK sa CGM-a (ažuriran automatski)' ,it: 'Glicemie da CGM (aggiornamento automatico)' + ,ja: 'CGMグルコース値' ,dk: 'BS fra CGM (automatisk)' ,fi: 'VS sensorilta (päivitetty automaattisesti)' ,nb: 'BS fra CGM (automatisk)' @@ -3027,6 +3335,7 @@ function init() { ,sk: 'Glykémia z CGM (automatická aktualizácia) ' ,nl: 'BG van CGM (automatische invoer)' ,ko: 'CGM 혈당(자동 업데이트)' + ,tr: 'CGM den KŞ (otomatik güncelleme)' ,zh_cn: 'CGM（连续血糖监测）测量的血糖值（自动更新）' } ,'BG from meter' : { @@ -3042,6 +3351,7 @@ function init() { ,bg: 'КЗ от глюкомер' ,hr: 'GUK s glukometra' ,it: 'Glicemie da glucometro' + ,ja: '血糖測定器使用グルコース値' ,dk: 'BS fra blodsukkerapperat' ,fi: 'VS mittarilta' ,nb: 'BS fra blodsukkerapparat' @@ -3050,6 +3360,7 @@ function init() { ,sk: 'Glykémia z glukomeru' ,nl: 'BG van meter' ,ko: '혈당 측정기에서의 혈당' + ,tr: 'Glikometre KŞ' ,zh_cn: '血糖仪测量的血糖值' } ,'Manual BG' : { @@ -3065,6 +3376,7 @@ function init() { ,hr: 'Ručno unesen GUK' ,sv: 'Manuellt BS' ,it: 'Inserisci Glicemia' + ,ja: '手動入力グルコース値' ,dk: 'Manuelt BS' ,fi: 'Käsin syötetty VS' ,nb: 'Manuelt BS' @@ -3073,6 +3385,7 @@ function init() { ,sk: 'Ručne zadaná glykémia' ,nl: 'Handmatige BG' ,ko: '수동 입력 혈당' + ,tr: 'Manuel KŞ' ,zh_cn: '手动输入的血糖值' } ,'Quickpick' : { @@ -3088,6 +3401,7 @@ function init() { ,hr: 'Brzi izbor' ,sv: 'Snabbval' ,it: 'Scelta rapida' + ,ja: 'クイック選択' ,dk: 'Hurtig valg' ,fi: 'Pikavalinta' ,nb: 'Hurtigvalg' @@ -3096,6 +3410,7 @@ function init() { ,sk: 'Rýchly výber' ,nl: 'Snelkeuze' ,ko: '빠른 선택' + ,tr: 'Hızlı seçim' ,zh_cn: '快速选择' } ,'or' : { @@ -3110,6 +3425,7 @@ function init() { ,bg: 'или' ,hr: 'ili' ,it: 'o' + ,ja: 'または' ,dk: 'eller' ,fi: 'tai' ,nb: 'eller' @@ -3119,6 +3435,7 @@ function init() { ,sk: 'alebo' ,nl: 'of' ,ko: '또는' + ,tr: 'veya' ,zh_cn: '或' } ,'Add from database' : { @@ -3133,6 +3450,7 @@ function init() { ,hr: 'Dodaj iz baze podataka' ,sv: 'Lägg till från databas' ,it: 'Aggiungi dal database' + ,ja: 'データベースから追加' ,dk: 'Tilføj fra database' ,fi: 'Lisää tietokannasta' ,nb: 'Legg til fra database' @@ -3142,6 +3460,7 @@ function init() { ,sk: 'Pridať z databázy' ,nl: 'Toevoegen uit database' ,ko: '데이터베이스로 부터 추가' + ,tr: 'Veritabanından ekle' ,zh_cn: '从数据库增加' } ,'Use carbs correction in calculation' : { @@ -3157,14 +3476,16 @@ function init() { ,hr: 'Koristi korekciju za UH u izračunu' ,sv: 'Använd kolhydratkorrektion för beräkning' ,it: 'Utilizzare la correzione dei carboidrati nel calcolo' + ,ja: '糖質量計算機能を使用' ,dk: 'Benyt kulhydratkorrektion i beregning' ,fi: 'Käytä hiilihydraattikorjausta laskennassa' ,nb: 'Bruk karbohydratkorrigering i beregning' ,pl: 'Użyj wartość węglowodanów w obliczeniach korekty' - ,ru: 'Пользуйтесь коррекцией углеводов при рассчете' + ,ru: 'Пользуйтесь коррекцией углеводов при расчете' ,sk: 'Použite korekciu na sacharidy' ,nl: 'Gebruik KH correctie in berekening' ,ko: '계산에 보정된 탄수화물을 사용하세요.' + ,tr: 'Hesaplamada karbonhidrat düzeltmesini kullan' ,zh_cn: '使用碳水化合物修正计算结果' } ,'Use COB correction in calculation' : { @@ -3180,14 +3501,16 @@ function init() { ,hr: 'Koristi aktivne UH u izračunu' ,sv: 'Använd aktiva kolhydrater för beräkning' ,it: 'Utilizzare la correzione COB nel calcolo' + ,ja: 'COB補正計算を使用' ,dk: 'Benyt aktive kulhydrater i beregning' ,fi: 'Käytä aktiivisia hiilihydraatteja laskennassa' ,nb: 'Benytt aktive karbohydrater i beregning' ,pl: 'Użyj COB do obliczenia korekty' - ,ru: 'Учитывайте активные углеводы при рассчете (COB)' + ,ru: 'Учитывайте активные углеводы при расчете (COB)' ,sk: 'Použite korekciu na COB' ,nl: 'Gebruik ingenomen KH in berekening' ,ko: '계산에 보정된 COB를 사용하세요.' + ,tr: 'Hesaplamada COB aktif karbonhidrat düzeltmesini kullan' ,zh_cn: '使用COB（活性碳水化合物）修正计算结果' } ,'Use IOB in calculation' : { @@ -3203,14 +3526,16 @@ function init() { ,hr: 'Koristi aktivni inzulin u izračunu' ,sv: 'Använd aktivt insulin för beräkning' ,it: 'Utilizzare la correzione IOB nel calcolo' + ,ja: 'IOB計算を使用' ,dk: 'Benyt aktivt insulin i beregningen' ,fi: 'Käytä aktiviivista insuliinia laskennassa' ,nb: 'Bruk aktivt insulin i beregningen' ,pl: 'Użyj IOB w obliczeniach' - ,ru: 'Учитывайте активный инсулин при рассчете (IOB)' + ,ru: 'Учитывайте активный инсулин при расчете (IOB)' ,sk: 'Použite IOB vo výpočte' ,nl: 'Gebruik IOB in berekening' ,ko: '계산에 IOB를 사용하세요.' + ,tr: 'Hesaplamada IOB aktif insülin düzeltmesini kullan' ,zh_cn: '使用IOB（活性胰岛素）修正计算结果' } ,'Other correction' : { @@ -3226,6 +3551,7 @@ function init() { ,hr: 'Druga korekcija' ,sv: 'Övrig korrektion' ,it: 'Altre correzioni' + ,ja: 'その他の補正' ,dk: 'Øvrig korrektion' ,fi: 'Muu korjaus' ,nb: 'Annen korrigering' @@ -3234,6 +3560,7 @@ function init() { ,sk: 'Iná korekcia' ,nl: 'Andere correctie' ,ko: '다른 보정' + ,tr: 'Diğer düzeltme' ,zh_cn: '其它修正' } ,'Rounding' : { @@ -3249,6 +3576,7 @@ function init() { ,bg: 'Закръгляне' ,hr: 'Zaokruživanje' ,it: 'Arrotondamento' + ,ja: '端数処理' ,dk: 'Afrunding' ,fi: 'Pyöristys' ,nb: 'Avrunding' @@ -3257,6 +3585,7 @@ function init() { ,sk: 'Zaokrúhlenie' ,nl: 'Afgerond' ,ko: '라운딩' + ,tr: 'yuvarlama' ,zh_cn: '取整' } ,'Enter insulin correction in treatment' : { @@ -3272,6 +3601,7 @@ function init() { ,hr: 'Unesi korekciju inzulinom u tretman' ,sv: 'Ange insulinkorrektion för händelse' ,it: 'Inserisci correzione insulina nella somministrazione' + ,ja: '治療にインスリン補正を入力する。' ,dk: 'Indtast insulinkorrektion' ,fi: 'Syötä insuliinikorjaus' ,nb: 'Task inn insulinkorrigering' @@ -3280,6 +3610,7 @@ function init() { ,sk: 'Zadajte korekciu inzulínu do ošetrenia' ,nl: 'Voer insuline correctie toe aan behandeling' ,ko: '대처를 위해 보정된 인슐린을 입력하세요.' + ,tr: 'Tedavide insülin düzeltmesini girin' ,zh_cn: '在操作中输入胰岛素修正' } ,'Insulin needed' : { @@ -3294,6 +3625,7 @@ function init() { ,hr: 'Potrebno inzulina' ,sv: 'Beräknad insulinmängd' ,it: 'Insulina necessaria' + ,ja: '必要インスリン単位' ,dk: 'Insulin påkrævet' ,fi: 'Insuliinitarve' ,nb: 'Insulin nødvendig' @@ -3303,6 +3635,7 @@ function init() { ,sk: 'Potrebný inzulín' ,nl: 'Benodigde insuline' ,ko: '인슐린 필요' + ,tr: 'İnsülin gerekli' ,zh_cn: '需要的胰岛素量' } ,'Carbs needed' : { @@ -3317,6 +3650,7 @@ function init() { ,hr: 'Potrebno UH' ,sv: 'Beräknad kolhydratmängd' ,it: 'Carboidrati necessari' + ,ja: '必要糖質量' ,dk: 'Kulhydrater påkrævet' ,fi: 'Hiilihydraattitarve' ,nb: 'Karbohydrater nødvendig' @@ -3326,6 +3660,7 @@ function init() { ,sk: 'Potrebné sacharidy' ,nl: 'Benodigde koolhydraten' ,ko: '탄수화물 필요' + ,tr: 'Karbonhidrat gerekli' ,zh_cn: '需要的碳水量' } ,'Carbs needed if Insulin total is negative value' : { @@ -3341,6 +3676,7 @@ function init() { ,hr: 'Potrebno UH ako je ukupna vrijednost inzulina negativna' ,sv: 'Nödvändig kolhydratmängd för angiven insulinmängd' ,it: 'Carboidrati necessari se l\'insulina totale è un valore negativo' + ,ja: 'インスリン合計値がマイナスであればカーボ値入力が必要です。' ,dk: 'Kulhydrater er nødvendige når total insulin mængde er negativ' ,fi: 'Hiilihydraattitarve, jos yhteenlaskettu insuliini on negatiivinen' ,nb: 'Karbohydrater er nødvendige når total insulinmengde er negativ' @@ -3349,6 +3685,7 @@ function init() { ,sk: 'Potrebné sacharidy, ak je celkový inzulín záporná hodnota' ,nl: 'Benodigde KH als insuline een negatieve waarde geeft' ,ko: '인슐린 전체가 마이너스 값이면 탄수화물이 필요합니다.' + ,tr: 'Toplam insülin negatif değer olduğunda karbonhidrat gereklidir' ,zh_cn: '如果胰岛素总量为负时所需的碳水化合物量' } ,'Basal rate' : { @@ -3364,14 +3701,16 @@ function init() { ,hr: 'Bazal' ,sv: 'Basaldos' ,it: 'Velocità basale' + ,ja: '基礎インスリン割合' ,dk: 'Basal rate' ,fi: 'Perusannos' ,nb: 'Basal' ,pl: 'Dawka bazowa' - ,ru: 'Базальный' + ,ru: 'Скорость базала' ,sk: 'Bazál' ,nl: 'Basaal snelheid' ,ko: '기초량 비율' + ,tr: 'Basal oranı' ,zh_cn: '基础率' } ,'60 minutes earlier' : { @@ -3387,6 +3726,7 @@ function init() { ,bg: 'Преди 60 минути' ,hr: 'Prije 60 minuta' ,it: '60 minuti prima' + ,ja: '60分前' ,dk: '60 min tidligere' ,fi: '60 minuuttia aiemmin' ,nb: '60 min tidligere' @@ -3395,6 +3735,7 @@ function init() { ,sk: '60 min. pred' ,nl: '60 minuten eerder' ,ko: '60분 더 일찍' + ,tr: '60 dak. önce' //erken önce ??? ,zh_cn: '60分钟前' } ,'45 minutes earlier' : { @@ -3410,6 +3751,7 @@ function init() { ,bg: 'Преди 45 минути' ,hr: 'Prije 45 minuta' ,it: '45 minuti prima' + ,ja: '45分前' ,dk: '45 min tidligere' ,fi: '45 minuuttia aiemmin' ,nb: '45 min tidligere' @@ -3418,6 +3760,7 @@ function init() { ,sk: '45 min. pred' ,nl: '45 minuten eerder' ,ko: '45분 더 일찍' + ,tr: '45 dak. önce' ,zh_cn: '45分钟前' } ,'30 minutes earlier' : { @@ -3433,6 +3776,7 @@ function init() { ,bg: 'Преди 30 минути' ,hr: 'Prije 30 minuta' ,it: '30 minuti prima' + ,ja: '30分前' ,dk: '30 min tidigere' ,fi: '30 minuuttia aiemmin' ,nb: '30 min tidigere' @@ -3441,6 +3785,7 @@ function init() { ,sk: '30 min. pred' ,nl: '30 minuten eerder' ,ko: '30분 더 일찍' + ,tr: '30 dak. önce' ,zh_cn: '30分钟前' } ,'20 minutes earlier' : { @@ -3456,6 +3801,7 @@ function init() { ,bg: 'Преди 20 минути' ,hr: 'Prije 20 minuta' ,it: '20 minuti prima' + ,ja: '20分前' ,dk: '20 min tidligere' ,fi: '20 minuuttia aiemmin' ,nb: '20 min tidligere' @@ -3464,6 +3810,7 @@ function init() { ,sk: '20 min. pred' ,nl: '20 minuten eerder' ,ko: '20분 더 일찍' + ,tr: '20 dak. önce' ,zh_cn: '20分钟前' } ,'15 minutes earlier' : { @@ -3479,6 +3826,7 @@ function init() { ,bg: 'Преди 15 минути' ,hr: 'Prije 15 minuta' ,it: '15 minuti prima' + ,ja: '15分前' ,dk: '15 min tidligere' ,fi: '15 minuuttia aiemmin' ,nb: '15 min tidligere' @@ -3487,6 +3835,7 @@ function init() { ,sk: '15 min. pred' ,nl: '15 minuten eerder' ,ko: '15분 더 일찍' + ,tr: '15 dak. önce' ,zh_cn: '15分钟前' } ,'Time in minutes' : { @@ -3510,6 +3859,7 @@ function init() { ,sk: 'Čas v minútach' ,nl: 'Tijd in minuten' ,ko: '분' + ,tr: 'Dakika cinsinden süre' ,zh_cn: '1分钟前' } ,'15 minutes later' : { @@ -3524,6 +3874,7 @@ function init() { ,hr: '15 minuta kasnije' ,sv: '15 min senare' ,it: '15 minuti più tardi' + ,ja: '15分後' ,dk: '15 min senere' ,fi: '15 minuuttia myöhemmin' ,nb: '15 min senere' @@ -3533,6 +3884,7 @@ function init() { ,sk: '15 min. po' ,nl: '15 minuten later' ,ko: '15분 더 나중에' + ,tr: '15 dak. sonra' //sonra daha sonra ,zh_cn: '15分钟后' } ,'20 minutes later' : { @@ -3547,6 +3899,7 @@ function init() { ,hr: '20 minuta kasnije' ,sv: '20 min senare' ,it: '20 minuti più tardi' + ,ja: '20分後' ,dk: '20 min senere' ,fi: '20 minuuttia myöhemmin' ,nb: '20 min senere' @@ -3556,6 +3909,7 @@ function init() { ,sk: '20 min. po' ,nl: '20 minuten later' ,ko: '20분 더 나중에' + ,tr: '20 dak. sonra' ,zh_cn: '20分钟后' } ,'30 minutes later' : { @@ -3570,6 +3924,7 @@ function init() { ,hr: '30 minuta kasnije' ,sv: '30 min senare' ,it: '30 minuti più tardi' + ,ja: '30分後' ,dk: '30 min senere' ,fi: '30 minuuttia myöhemmin' ,nb: '30 min senere' @@ -3579,6 +3934,7 @@ function init() { ,sk: '30 min. po' ,nl: '30 minuten later' ,ko: '30분 더 나중에' + ,tr: '30 dak. sonra' ,zh_cn: '30分钟后' } ,'45 minutes later' : { @@ -3593,6 +3949,7 @@ function init() { ,hr: '45 minuta kasnije' ,sv: '45 min senare' ,it: '45 minuti più tardi' + ,ja: '45分後' ,dk: '45 min senere' ,fi: '45 minuuttia myöhemmin' ,nb: '45 min senere' @@ -3602,6 +3959,7 @@ function init() { ,sk: '45 min. po' ,nl: '45 minuten later' ,ko: '45분 더 나중에' + ,tr: '45 dak. sonra' ,zh_cn: '45分钟后' } ,'60 minutes later' : { @@ -3616,6 +3974,7 @@ function init() { ,hr: '60 minuta kasnije' ,sv: '60 min senare' ,it: '60 minuti più tardi' + ,ja: '60分後' ,dk: '60 min senere' ,fi: '60 minuuttia myöhemmin' ,nb: '60 min senere' @@ -3625,6 +3984,7 @@ function init() { ,sk: '60 min. po' ,nl: '60 minuten later' ,ko: '60분 더 나중에' + ,tr: '60 dak. sonra' ,zh_cn: '60分钟后' } ,'Additional Notes, Comments' : { @@ -3639,6 +3999,7 @@ function init() { ,hr: 'Dodatne bilješke, komentari' ,sv: 'Notering, övrigt' ,it: 'Note aggiuntive, commenti' + ,ja: '追加メモ、コメント' ,dk: 'Ekstra noter, kommentarer' ,fi: 'Lisähuomiot, kommentit' ,nb: 'Ekstra notater, kommentarer' @@ -3648,6 +4009,7 @@ function init() { ,sk: 'Ďalšie poznámky, komentáre' ,nl: 'Extra aantekeningen' ,ko: '추가 메모' + ,tr: 'Ek Notlar, Yorumlar' ,zh_cn: '备注' } ,'RETRO MODE' : { @@ -3663,6 +4025,7 @@ function init() { ,bg: 'МИНАЛО ВРЕМЕ' ,hr: 'Retrospektivni način' ,it: 'Modalità retrospettiva' + ,ja: '振り返りモード' ,dk: 'Retro mode' ,fi: 'VANHENTUNEET TIEDOT' ,nb: 'Retro mode' @@ -3671,6 +4034,7 @@ function init() { ,ru: 'режим РЕТРО' ,sk: 'V MINULOSTI' ,ko: 'PETRO MODE' + ,tr: 'RETRO MODE' ,zh_cn: '历史模式' } ,'Now' : { @@ -3685,6 +4049,7 @@ function init() { ,bg: 'Сега' ,hr: 'Sad' ,it: 'Ora' + ,ja: '今' ,dk: 'Nu' ,fi: 'Nyt' ,nb: 'Nå' @@ -3694,6 +4059,7 @@ function init() { ,sk: 'Teraz' ,nl: 'Nu' ,ko: '현재' + ,tr: 'Şimdi' ,zh_cn: '现在' } ,'Other' : { @@ -3708,6 +4074,7 @@ function init() { ,bg: 'Друго' ,hr: 'Drugo' ,it: 'Altro' + ,ja: '他の' ,dk: 'Øvrige' ,fi: 'Muu' ,nb: 'Annet' @@ -3717,6 +4084,7 @@ function init() { ,sk: 'Iný' ,nl: 'Andere' ,ko: '다른' + ,tr: 'Diğer' ,zh_cn: '其它' } ,'Submit Form' : { @@ -3731,6 +4099,7 @@ function init() { ,bg: 'Въвеждане на данните' ,hr: 'Predaj obrazac' ,it: 'Invia il modulo' + ,ja: 'フォームを投稿する' ,dk: 'Gem hændelsen' ,fi: 'Lähetä tiedot' ,nb: 'Lagre' @@ -3740,6 +4109,7 @@ function init() { ,sk: 'Odoslať formulár' ,nl: 'Formulier opslaan' ,ko: '양식 제출' + ,tr: 'Formu gönder' ,zh_cn: '提交' } ,'Profile Editor' : { @@ -3754,6 +4124,7 @@ function init() { ,bg: 'Редактор на профила' ,hr: 'Editor profila' ,it: 'NS - Dati Personali' + ,ja: 'プロフィール編集' ,dk: 'Profil editor' ,fi: 'Profiilin muokkaus' ,nb: 'Profileditor' @@ -3763,6 +4134,7 @@ function init() { ,sk: 'Editor profilu' ,nl: 'Profiel beheer' ,ko: '프로 편집기' + ,tr: 'Profil Düzenleyicisi' ,zh_cn: '配置文件编辑器' ,zh_tw: '配置文件編輯器' } @@ -3779,6 +4151,7 @@ function init() { ,bg: 'Статистика' ,hr: 'Alat za prijavu' ,it: 'NS - Statistiche' + ,ja: '報告' ,dk: 'Rapporteringsværktøj' ,fi: 'Raportointityökalu' ,nb: 'Rapporteringsverktøy' @@ -3787,6 +4160,7 @@ function init() { ,sk: 'Správy' ,nl: 'Rapporten' ,ko: '보고서' + ,tr: 'Raporlar' ,zh_cn: '生成报表' ,zh_tw: '生成報表' } @@ -3803,6 +4177,7 @@ function init() { ,hr: 'Dodajte hranu iz svoje baze podataka' ,sv: 'Lägg till livsmedel från databas' ,it: 'Aggiungere cibo al database' + ,ja: 'データベースから食べ物を追加' ,dk: 'Tilføj mad fra din database' ,fi: 'Lisää ruoka tietokannasta' ,nb: 'Legg til mat fra din database' @@ -3811,6 +4186,7 @@ function init() { ,sk: 'Pridať jedlo z Vašej databázy' ,nl: 'Voeg voeding toe uit uw database' ,ko: '데이터베이스에서 음식을 추가하세요.' + ,tr: 'Veritabanınızdan yemek ekleyin' ,zh_cn: '从数据库增加食物' } ,'Reload database' : { @@ -3826,6 +4202,7 @@ function init() { ,hr: 'Ponovo učitajte bazu podataka' ,sv: 'Ladda om databas' ,it: 'Ricarica database' + ,ja: 'データベース再読み込み' ,dk: 'Genindlæs databasen' ,fi: 'Lataa tietokanta uudelleen' ,nb: 'Last inn databasen på nytt' @@ -3834,6 +4211,7 @@ function init() { ,sk: 'Obnoviť databázu' ,nl: 'Database opnieuw laden' ,ko: '데이터베이스 재로드' + ,tr: 'Veritabanını yeniden yükle' ,zh_cn: '重新载入数据库' } ,'Add' : { @@ -3849,6 +4227,7 @@ function init() { ,hr: 'Dodaj' ,sv: 'Lägg till' ,it: 'Aggiungere' + ,ja: '追加' ,dk: 'Tilføj' ,fi: 'Lisää' ,nb: 'Legg til' @@ -3857,6 +4236,7 @@ function init() { ,sk: 'Pridať' ,nl: 'Toevoegen' ,ko: '추가' + ,tr: 'Ekle' ,zh_cn: '增加' } ,'Unauthorized' : { @@ -3872,14 +4252,16 @@ function init() { ,bg: 'Неразрешен достъп' ,hr: 'Neautorizirano' ,it: 'Non Autorizzato' + ,ja: '認証されていません' ,dk: 'Uautoriseret' - ,fi: 'Kielletty' + ,fi: 'Et ole autentikoitunut' ,nb: 'Uautorisert' ,pl: 'Nieuwierzytelniono' ,ru: 'Не авторизовано' ,sk: 'Neautorizované' ,nl: 'Ongeauthoriseerd' ,ko: '미인증' + ,tr: 'Yetkisiz' ,zh_cn: '未授权' ,zh_tw: '未授權' } @@ -3896,6 +4278,7 @@ function init() { ,hr: 'Neuspjeli unos podataka' ,sv: 'Lägga till post nekas' ,it: 'Voce del Registro fallita' + ,ja: '入力されたものは記録できませんでした' ,dk: 'Tilføjelse af post fejlede' ,fi: 'Tiedon tallentaminen epäonnistui' ,nb: 'Lagring feilet' @@ -3904,6 +4287,7 @@ function init() { ,sk: 'Zadanie záznamu zlyhalo' ,nl: 'Toevoegen mislukt' ,ko: '입력 실패' + ,tr: 'Kayıt girişi başarısız oldu' ,zh_cn: '输入记录失败' } ,'Device authenticated' : { @@ -3919,6 +4303,7 @@ function init() { ,bg: 'Устройстово е разпознато' ,hr: 'Uređaj autenticiran' ,it: 'Disp. autenticato' + ,ja: '機器は認証されました。' ,dk: 'Enhed godkendt' ,fi: 'Laite autentikoitu' ,nb: 'Enhet godkjent' @@ -3927,6 +4312,7 @@ function init() { ,sk: 'Zariadenie overené' ,nl: 'Apparaat geauthenticeerd' ,ko: '기기 인증' + ,tr: 'Cihaz kimliği doğrulandı' ,zh_cn: '设备已认证' ,zh_tw: '設備已認證' } @@ -3943,6 +4329,7 @@ function init() { ,bg: 'Устройсройството не е разпознато' ,hr: 'Uređaj nije autenticiran' ,it: 'Disp. non autenticato' + ,ja: '機器は認証されていません。' ,dk: 'Enhed ikke godkendt' ,fi: 'Laite ei ole autentikoitu' ,nb: 'Enhet ikke godkjent' @@ -3951,6 +4338,7 @@ function init() { ,sk: 'Zariadenie nieje overené' ,nl: 'Apparaat niet geauthenticeerd' ,ko: '미인증 기기' + ,tr: 'Cihaz kimliği doğrulanmamış' ,zh_cn: '设备未认证' ,zh_tw: '設備未認證' } @@ -3967,6 +4355,7 @@ function init() { ,hr: 'Status autentikacije' ,sv: 'Autentiseringsstatus' ,it: 'Stato di autenticazione' + ,ja: '認証ステータス' ,dk: 'Godkendelsesstatus' ,fi: 'Autentikoinnin tila' ,nb: 'Autentiseringsstatus' @@ -3975,6 +4364,7 @@ function init() { ,sk: 'Stav overenia' ,nl: 'Authenticatie status' ,ko: '인증 상태' + ,tr: 'Kimlik doğrulama durumu' ,zh_cn: '认证状态' ,zh_tw: '認證狀態' } @@ -3991,6 +4381,7 @@ function init() { ,bg: 'Удостоверяване' ,hr: 'Autenticirati' ,it: 'Autenticare' + ,ja: '認証' ,dk: 'Godkende' ,fi: 'Autentikoi' ,nb: 'Autentiser' @@ -3999,6 +4390,7 @@ function init() { ,sk: 'Overiť' ,nl: 'Authenticatie' ,ko: '인증' + ,tr: 'Kimlik doğrulaması' ,zh_cn: '认证' ,zh_tw: '認證' } @@ -4015,6 +4407,7 @@ function init() { ,hr: 'Ukloniti' ,sv: 'Ta bort' ,it: 'Rimuovere' + ,ja: '除く' ,dk: 'Fjern' ,fi: 'Poista' ,nb: 'Slett' @@ -4023,6 +4416,7 @@ function init() { ,sk: 'Odstrániť' ,nl: 'Verwijder' ,ko: '삭제' + ,tr: 'Kaldır' ,zh_cn: '取消' ,zh_tw: '取消' } @@ -4039,6 +4433,7 @@ function init() { ,hr: 'Vaš uređaj još nije autenticiran' ,sv: 'Din enhet är ej autentiserad' ,it: 'Il tuo dispositivo non è ancora stato autenticato' + ,ja: '機器はまだ承認されていません。' ,dk: 'Din enhed er ikke godkendt endnu' ,fi: 'Laitettasi ei ole vielä autentikoitu' ,nb: 'Din enhet er ikke godkjent enda' @@ -4047,6 +4442,7 @@ function init() { ,sk: 'Toto zariadenie zatiaľ nebolo overené' ,nl: 'Uw apparaat is nog niet geauthenticeerd' ,ko: '당신의 기기는 아직 인증되지 않았습니다.' + ,tr: 'Cihazınız henüz doğrulanmamış' ,zh_cn: '此设备还未进行认证' ,zh_tw: '這個設備還未進行認證' } @@ -4062,6 +4458,7 @@ function init() { ,bg: 'Сензор' ,hr: 'Senzor' ,it: 'Sensore' + ,ja: 'センサー' ,dk: 'Sensor' ,fi: 'Sensori' ,nb: 'Sensor' @@ -4071,6 +4468,7 @@ function init() { ,sk: 'Senzor' ,nl: 'Sensor' ,ko: '센서' + ,tr: 'Sensor' ,zh_cn: 'CGM探头' } ,'Finger' : { @@ -4085,6 +4483,7 @@ function init() { ,bg: 'От пръстта' ,hr: 'Prst' ,it: 'Dito' + ,ja: '指' ,dk: 'Finger' ,fi: 'Sormi' ,nb: 'Finger' @@ -4094,6 +4493,7 @@ function init() { ,sk: 'Glukomer' ,nl: 'Vinger' ,ko: '손가락' + ,tr: 'Parmak' ,zh_cn: '手指' } ,'Manual' : { @@ -4108,6 +4508,7 @@ function init() { ,bg: 'Ръчно' ,hr: 'Ručno' ,it: 'Manuale' + ,ja: '手動入力' ,dk: 'Manuel' ,fi: 'Manuaalinen' ,nb: 'Manuell' @@ -4117,6 +4518,7 @@ function init() { ,sk: 'Ručne' ,nl: 'Handmatig' ,ko: '수' + ,tr: 'Elle' ,zh_cn: '手动' } ,'Scale' : { @@ -4132,6 +4534,7 @@ function init() { ,hr: 'Skala' ,sv: 'Skala' ,it: 'Scala' + ,ja: 'グラフ縦軸' ,dk: 'Skala' ,fi: 'Skaala' ,nb: 'Skala' @@ -4140,6 +4543,7 @@ function init() { ,sk: 'Mierka' ,nl: 'Schaal' ,ko: '규모' + ,tr: 'Ölçek' ,zh_cn: '函数' ,zh_tw: '函數' } @@ -4155,6 +4559,7 @@ function init() { ,bg: 'Линейна' ,hr: 'Linearno' ,it: 'Lineare' + ,ja: '線形軸表示' ,dk: 'Lineær' ,fi: 'Lineaarinen' ,nb: 'Lineær' @@ -4164,6 +4569,7 @@ function init() { ,sk: 'Lineárne' ,nl: 'Lineair' ,ko: 'Linear' + ,tr: 'Doğrusal' //çizgisel ,zh_cn: '线性' ,zh_tw: '線性' } @@ -4179,6 +4585,7 @@ function init() { ,bg: 'Логоритмична' ,hr: 'Logaritamski' ,it: 'Logaritmica' + ,ja: '対数軸表示' ,dk: 'Logaritmisk' ,fi: 'Logaritminen' ,nb: 'Logaritmisk' @@ -4188,6 +4595,7 @@ function init() { ,sk: 'Logaritmické' ,nl: 'Logaritmisch' ,ko: '다수' + ,tr: 'Logaritmik' ,zh_cn: '对数' ,zh_tw: '對數' } @@ -4198,6 +4606,7 @@ function init() { ,es: 'Logarítmo (Dinámico)' ,dk: 'Logaritmisk (Dynamisk)' ,it: 'Logaritmica (Dinamica)' + ,ja: '対数軸(動的)表示' ,fr: 'Logarithmique (Dynamique)' ,el: 'Λογαριθμική (Δυναμική)' ,ro: 'Logaritmic (Dinamic)' @@ -4211,6 +4620,7 @@ function init() { ,sk: 'Logaritmické (Dynamické)' ,nl: 'Logaritmisch (Dynamisch)' ,ko: '다수(동적인)' + ,tr: 'Logaritmik (Dinamik)' ,zh_cn: '对数（动态）' ,zh_tw: '對數（動態）' } @@ -4222,6 +4632,7 @@ function init() { ,fr: 'Insuline à bord' ,dk: 'Aktivt insulin (IOB)' ,it: 'IOB-Insulina a Bordo' + ,ja: 'IOB・残存インスリン' ,nb: 'AI' ,el: 'Ενεργή Ινσουλίνη (IOB)' ,ro: 'IOB-Insulină activă' @@ -4230,10 +4641,11 @@ function init() { ,sv: 'Aktivt insulin (IOB)' ,pl: 'Aktywna insulina (IOB)' ,pt: 'Insulina ativa' - ,ru: 'Активный инсулин' + ,ru: 'Активный инсулин IOB' ,sk: 'Aktívny inzulín (IOB)' ,nl: 'Actieve insuline (IOB)' ,ko: 'IOB' + ,tr: 'Aktif İnsülin (IOB)' ,zh_cn: '活性胰岛素（IOB）' ,zh_tw: '活性胰島素（IOB）' } @@ -4245,6 +4657,7 @@ function init() { ,fr: 'Glucides à bord' ,dk: 'Aktive kulhydrater (COB)' ,it: 'COB-Carboidrati a Bordo' + ,ja: 'COB・残存カーボ' ,nb: 'AK' ,el: 'Ενεργοί Υδατάνθρακες (COB)' ,ro: 'COB-Carbohidrați activi' @@ -4253,21 +4666,23 @@ function init() { ,sv: 'Aktiva kolhydrater (COB)' ,pl: 'Aktywne wglowodany (COB)' ,pt: 'Carboidratos ativos' - ,ru: 'Активные углеводы' + ,ru: 'Активные углеводы COB' ,sk: 'Aktívne sacharidy (COB)' ,nl: 'Actieve koolhydraten (COB)' ,ko: 'COB' + ,tr: 'Aktif Karbonhidrat (COB)' ,zh_cn: '活性碳水化合物（COB）' ,zh_tw: '活性碳水化合物（COB）' } ,'Bolus Wizard Preview' : { cs: 'BWP-Náhled bolusového kalk.' ,he: 'סקירת אשף הבולוס' - ,de: 'Bolus-Kalkulator Vorschau' + ,de: 'Bolus-Kalkulator Vorschau (BWP)' ,es: 'Vista previa del cálculo del bolo' ,fr: 'Prévue du Calculatuer de bolus' ,dk: 'Bolus Wizard (BWP)' ,it: 'BWP-Calcolatore di bolo' + ,ja: 'BWP・ボーラスウィザード参照' ,nb: 'Boluskalkulator' ,el: 'Εργαλείο Εκτίμησης Επάρκειας Ινσουλίνης (BWP)' ,ro: 'BWP-Sugestie de bolusare' @@ -4280,6 +4695,7 @@ function init() { ,sk: 'Bolus Wizard' ,nl: 'Bolus Wizard Preview (BWP)' ,ko: 'Bolus 마법사 미리보기' + ,tr: 'Bolus hesaplama Sihirbazı Önizlemesi (BWP)' //İnsülin etkinlik süresi hesaplaması ,zh_cn: '大剂量向导预览（BWP）' ,zh_tw: '大劑量嚮導預覽（BWP）' } @@ -4291,6 +4707,7 @@ function init() { ,fr: 'Valeur chargée' ,dk: 'Værdi indlæst' ,it: 'Valori Caricati' + ,ja: '数値読み込み完了' ,nb: 'Verdi lastet' ,el: 'Τιμή ανακτήθηκε' ,ro: 'Valoare încărcată' @@ -4303,6 +4720,7 @@ function init() { ,nl: 'Waarde geladen' ,sk: 'Hodnoty načítané' ,ko: '값이 로드됨' + ,tr: 'Yüklenen Değer' ,zh_cn: '数值已读取' ,zh_tw: '數值已讀取' } @@ -4312,8 +4730,9 @@ function init() { ,de: 'Kanülenalter' ,es: 'Antigüedad cánula' ,fr: 'Age de la canule' - ,dk: 'Insuflon alder (CAGE)' + ,dk: 'Indstik alder (CAGE)' ,it: 'CAGE-Cambio Ago' + ,ja: 'CAGE・カニューレ使用日数' ,el: 'Ημέρες Χρήσης Κάνουλας (CAGE)' ,nb: 'Nålalder' ,ro: 'CAGE-Vechime canulă' @@ -4326,6 +4745,7 @@ function init() { ,sk: 'Zavedenie kanyly (CAGE)' ,nl: 'Canule leeftijd (CAGE)' ,ko: '캐뉼라 사용기간' + ,tr: 'Kanül yaşı' ,zh_cn: '管路使用时间（CAGE）' ,zh_tw: '管路使用時間（CAGE）' } @@ -4337,6 +4757,7 @@ function init() { ,fr: 'Profil Basal' ,dk: 'Basal profil' ,it: 'BASAL-Profilo Basale' + ,ja: 'ベーサルプロフィール' ,el: 'Προφίλ Βασικής Ινσουλίνης (BASAL)' ,nb: 'Basalprofil' ,ro: 'Profil bazală' @@ -4345,10 +4766,11 @@ function init() { ,sv: 'Basalprofil' ,pl: 'Profil dawki bazowej' ,pt: 'Perfil de Basal' - ,ru: 'Профиль Базального' + ,ru: 'Профиль Базала' ,sk: 'Bazál' ,nl: 'Basaal profiel' ,ko: 'Basal 프로파일' + ,tr: 'Bazal Profil' ,zh_cn: '基础率配置文件' ,zh_tw: '基礎率配置文件' } @@ -4365,6 +4787,7 @@ function init() { ,hr: 'Tišina 30 minuta' ,sv: 'Tyst i 30 min' ,it: 'Silenzio per 30 minuti' + ,ja: '30分静かにする' ,dk: 'Stilhed i 30 min' ,fi: 'Hiljennä 30 minuutiksi' ,nb: 'Stille i 30 min' @@ -4373,6 +4796,7 @@ function init() { ,sk: 'Stíšiť na 30 minút' ,nl: 'Sluimer 30 minuten' ,ko: '30분간 무음' + ,tr: '30 dakika sessizlik' ,zh_cn: '静音30分钟' ,zh_tw: '靜音30分鐘' } @@ -4389,6 +4813,7 @@ function init() { ,hr: 'Tišina 60 minuta' ,sv: 'Tyst i 60 min' ,it: 'Silenzio per 60 minuti' + ,ja: '60分静かにする' ,dk: 'Stilhed i 60 min' ,fi: 'Hiljennä tunniksi' ,nb: 'Stille i 60 min' @@ -4397,6 +4822,7 @@ function init() { ,sk: 'Stíšiť na 60 minút' ,nl: 'Sluimer 60 minuten' ,ko: '60분간 무음' + ,tr: '60 dakika sessizlik' ,zh_cn: '静音60分钟' ,zh_tw: '靜音60分鐘' } @@ -4413,6 +4839,7 @@ function init() { ,hr: 'Tišina 90 minuta' ,sv: 'Tyst i 90 min' ,it: 'Silenzio per 90 minuti' + ,ja: '90分静かにする' ,dk: 'Stilhed i 90 min' ,fi: 'Hiljennä 1.5 tunniksi' ,nb: 'Stille i 90 min' @@ -4421,6 +4848,7 @@ function init() { ,sk: 'Stíšiť na 90 minút' ,nl: 'Sluimer 90 minuten' ,ko: '90분간 무음' + ,tr: '90 dakika sessizlik' ,zh_cn: '静音90分钟' ,zh_tw: '靜音90分鐘' } @@ -4437,6 +4865,7 @@ function init() { ,hr: 'Tišina 120 minuta' ,sv: 'Tyst i 120 min' ,it: 'Silenzio per 120 minuti' + ,ja: '120分静かにする' ,dk: 'Stilhed i 120 min' ,fi: 'Hiljennä 2 tunniksi' ,nb: 'Stile i 120 min' @@ -4445,6 +4874,7 @@ function init() { ,sk: 'Stíšiť na 120 minút' ,nl: 'Sluimer 2 uur' ,ko: '120분간 무음' + ,tr: '120 dakika sessizlik' ,zh_cn: '静音2小时' ,zh_tw: '靜音2小時' } @@ -4460,6 +4890,7 @@ function init() { ,bg: '2часа' ,hr: '2h' ,it: '2ORE' + ,ja: '２時間' ,dk: '2t' ,fi: '2h' ,nb: '2t' @@ -4468,6 +4899,7 @@ function init() { ,sk: '2 hod' ,nl: '2uur' ,ko: '2시간' + ,tr: '2sa.' ,zh_cn: '2小时' ,zh_tw: '2小時' } @@ -4484,6 +4916,7 @@ function init() { ,bg: '3часа' ,hr: '3h' ,it: '3ORE' + ,ja: '3時間' ,dk: '3t' ,fi: '3h' ,nb: '3t' @@ -4492,6 +4925,7 @@ function init() { ,sk: '3 hod' ,nl: '3uur' ,ko: '3시간' + ,tr: '3sa.' ,zh_cn: '3小时' ,zh_tw: '3小時' } @@ -4508,6 +4942,7 @@ function init() { ,bg: '6часа' ,hr: '6h' ,it: '6ORE' + ,ja: '6時間' ,dk: '6t' ,fi: '6h' ,nb: '6t' @@ -4516,6 +4951,7 @@ function init() { ,sk: '6 hod' ,nl: '6uur' ,ko: '6시간' + ,tr: '6sa.' ,zh_cn: '6小时' ,zh_tw: '6小時' } @@ -4532,7 +4968,8 @@ function init() { ,bg: '12часа' ,hr: '12h' ,it: '12ORE' - ,dk: '12tim' + ,ja: '12時間' + ,dk: '12t' ,fi: '12h' ,nb: '12t' ,pl: '12h' @@ -4540,6 +4977,7 @@ function init() { ,sk: '12 hod' ,nl: '12uur' ,ko: '12시간' + ,tr: '12sa.' ,zh_cn: '12小时' ,zh_tw: '12小時' } @@ -4556,6 +4994,7 @@ function init() { ,bg: '24часа' ,hr: '24h' ,it: '24ORE' + ,ja: '24時間' ,dk: '24t' ,fi: '24h' ,nb: '24t' @@ -4564,6 +5003,7 @@ function init() { ,sk: '24 hod' ,nl: '24uur' ,ko: '24시간' + ,tr: '24sa.' ,zh_cn: '24小时' ,zh_tw: '24小時' } @@ -4580,6 +5020,7 @@ function init() { ,bg: 'Настройки' ,hr: 'Postavke' ,it: 'Impostazioni' + ,ja: '設定' ,dk: 'Indstillinger' ,fi: 'Asetukset' ,nb: 'Innstillinger' @@ -4588,6 +5029,7 @@ function init() { ,sk: 'Nastavenia' ,nl: 'Instellingen' ,ko: '설정' + ,tr: 'Ayarlar' ,zh_cn: '设置' ,zh_tw: '設置' } @@ -4612,6 +5054,7 @@ function init() { ,sk: 'Jednotky' ,nl: 'Eenheden' ,ko: '단위' + ,tr: 'Birim' //Birim Ünite ,zh_cn: '计量单位' ,zh_tw: '计量單位' } @@ -4628,6 +5071,7 @@ function init() { ,bg: 'Формат на датата' ,hr: 'Format datuma' ,it: 'Formato data' + ,ja: '日数初期化' ,dk: 'Dato format' ,fi: 'Aikamuoto' ,nb: 'Datoformat' @@ -4636,6 +5080,7 @@ function init() { ,sk: 'Formát času' ,nl: 'Datum formaat' ,ko: '날짜 형식' + ,tr: 'Veri formatı' ,zh_cn: '时间格式' ,zh_tw: '時間格式' } @@ -4652,6 +5097,7 @@ function init() { ,bg: '12 часа' ,hr: '12 sati' ,it: '12 ore' + ,ja: '12時間制' ,dk: '12 timer' ,fi: '12 tuntia' ,nb: '12 timer' @@ -4660,6 +5106,7 @@ function init() { ,sk: '12 hodín' ,nl: '12 uur' ,ko: '12 시간' + ,tr: '12 saat' ,zh_cn: '12小时制' ,zh_tw: '12小時制' } @@ -4676,6 +5123,7 @@ function init() { ,bg: '24 часа' ,hr: '24 sata' ,it: '24 ore' + ,ja: '24時間制' ,dk: '24 timer' ,fi: '24 tuntia' ,nb: '24 timer' @@ -4684,6 +5132,7 @@ function init() { ,sk: '24 hodín' ,nl: '24 uur' ,ko: '24 시간' + ,tr: '24 saat' ,zh_cn: '24小时制' ,zh_tw: '24小時制' } @@ -4699,6 +5148,7 @@ function init() { ,hr: 'Evidencija tretmana' ,sv: 'Ange händelse' ,it: 'Somministrazioni' + ,ja: '治療を記録' ,dk: 'Log en hændelse' ,fi: 'Tallenna tapahtuma' ,nb: 'Logg en hendelse' @@ -4708,6 +5158,7 @@ function init() { ,sk: 'Záznam ošetrenia' ,nl: 'Registreer een behandeling' ,ko: 'Treatment 로그' + ,tr: 'Tedaviyi günlüğe kaydet' ,zh_cn: '记录操作' } ,'BG Check' : { @@ -4722,6 +5173,7 @@ function init() { ,bg: 'Проверка на КЗ' ,hr: 'Kontrola GUK-a' ,it: 'Controllo Glicemia' + ,ja: 'BG測定' ,dk: 'BS kontrol' ,fi: 'Verensokerin tarkistus' ,nb: 'Blodsukkerkontroll' @@ -4731,6 +5183,7 @@ function init() { ,sk: 'Kontrola glykémie' ,nl: 'Bloedglucose check' ,ko: '혈당 체크' + ,tr: 'KŞ Kontol' ,zh_cn: '测量血糖' } ,'Meal Bolus' : { @@ -4745,6 +5198,7 @@ function init() { ,hr: 'Bolus za obrok' ,sv: 'Måltidsbolus' ,it: 'Bolo Pasto' + ,ja: '食事ボーラス' ,dk: 'Måltidsbolus' ,fi: 'Ruokailubolus' ,nb: 'Måltidsbolus' @@ -4754,6 +5208,7 @@ function init() { ,sk: 'Bolus na jedlo' ,nl: 'Maaltijd bolus' ,ko: '식사 인슐린' + ,tr: 'Yemek bolus' ,zh_cn: '正餐大剂量' } ,'Snack Bolus' : { @@ -4768,6 +5223,7 @@ function init() { ,bg: 'Болус-лека закуска' ,hr: 'Bolus za užinu' ,it: 'Bolo Merenda' + ,ja: '間食ボーラス' ,dk: 'Mellemmåltidsbolus' ,fi: 'Ruokakorjaus' ,nb: 'Mellommåltidsbolus' @@ -4777,6 +5233,7 @@ function init() { ,sk: 'Bolus na desiatu/olovrant' ,nl: 'Snack bolus' ,ko: '스넥 인슐린' + ,tr: 'Aperatif (Snack) Bolus' ,zh_cn: '加餐大剂量' } ,'Correction Bolus' : { @@ -4791,6 +5248,7 @@ function init() { ,hr: 'Korekcija' ,sv: 'Korrektionsbolus' ,it: 'Bolo Correttivo' + ,ja: '補正ボーラス' ,dk: 'Korrektionsbolus' ,fi: 'Korjausbolus' ,nb: 'Korreksjonsbolus' @@ -4800,6 +5258,7 @@ function init() { ,sk: 'Korekčný bolus' ,nl: 'Correctie bolus' ,ko: '수정 인슐린' + ,tr: 'Düzeltme Bolusu' ,zh_cn: '临时大剂量' } ,'Carb Correction' : { @@ -4814,6 +5273,7 @@ function init() { ,hr: 'Bolus za hranu' ,sv: 'Kolhydratskorrektion' ,it: 'Carboidrati Correttivi' + ,ja: 'カーボ治療' ,dk: 'Kulhydratskorrektion' ,fi: 'Hiilihydraattikorjaus' ,nb: 'Karbohydratkorrigering' @@ -4823,6 +5283,7 @@ function init() { ,sk: 'Prídavok sacharidov' ,nl: 'Koolhydraat correctie' ,ko: '탄수화물 수정' + ,tr: 'Karbonhidrat Düzeltme' ,zh_cn: '碳水修正' } ,'Note' : { @@ -4837,6 +5298,7 @@ function init() { ,bg: 'Бележка' ,hr: 'Bilješka' ,it: 'Nota' + ,ja: 'メモ' ,dk: 'Note' ,fi: 'Merkintä' ,nb: 'Notat' @@ -4846,6 +5308,7 @@ function init() { ,sk: 'Poznámka' ,nl: 'Notitie' ,ko: '메모' + ,tr: 'Not' ,zh_cn: '备忘' } ,'Question' : { @@ -4860,6 +5323,7 @@ function init() { ,bg: 'Въпрос' ,hr: 'Pitanje' ,it: 'Domanda' + ,ja: '質問' ,dk: 'Spørgsmål' ,fi: 'Kysymys' ,nb: 'Spørsmål' @@ -4869,6 +5333,7 @@ function init() { ,sk: 'Otázka' ,nl: 'Vraag' ,ko: '질문' + ,tr: 'Soru' ,zh_cn: '问题' } ,'Exercise' : { @@ -4883,6 +5348,7 @@ function init() { ,bg: 'Спорт' ,hr: 'Aktivnost' ,it: 'Esercizio Fisico' + ,ja: '運動' ,dk: 'Træning' ,fi: 'Fyysinen harjoitus' ,nb: 'Trening' @@ -4892,6 +5358,7 @@ function init() { ,sk: 'Cvičenie' ,nl: 'Beweging / sport' ,ko: '운동' + ,tr: 'Egzersiz' ,zh_cn: '运动' } ,'Pump Site Change' : { @@ -4906,6 +5373,7 @@ function init() { ,bg: 'Смяна на сет' ,hr: 'Promjena seta' ,it: 'CAGE-Cambio Ago' + ,ja: 'CAGE・ポンプ注入場所変更' ,dk: 'Skift insulin infusionssted' ,fi: 'Kanyylin vaihto' ,nb: 'Pumpebytte' @@ -4915,6 +5383,7 @@ function init() { ,sk: 'Výmena setu' ,nl: 'Nieuwe pomp infuus' ,ko: '펌프 위치 변경' + ,tr: 'Pompa Kanül değişimi' ,zh_cn: '更换胰岛素输注部位' } ,'CGM Sensor Start' : { @@ -4929,6 +5398,7 @@ function init() { ,bg: 'Ре/Стартиране на сензор' ,hr: 'Start senzora' ,it: 'CGM Avvio sensore' + ,ja: 'CGMセンサー開始' ,dk: 'Sensorstart' ,fi: 'Sensorin aloitus' ,nb: 'Sensorstart' @@ -4938,8 +5408,34 @@ function init() { ,sk: 'Spustenie senzoru' ,nl: 'CGM Sensor start' ,ko: 'CGM 센서 시작' + ,tr: 'CGM Sensörü Başlat' ,zh_cn: '启动CGM（连续血糖监测）探头' } + ,'CGM Sensor Stop' : { + cs: 'CGM Sensor Stop' + ,de: 'CGM Sensor Stop' + ,es: 'CGM Sensor Stop' + ,fr: 'CGM Sensor Stop' + ,el: 'CGM Sensor Stop' + ,pt: 'CGM Sensor Stop' + ,sv: 'CGM Sensor Stop' + ,ro: 'CGM Sensor Stop' + ,bg: 'CGM Sensor Stop' + ,hr: 'CGM Sensor Stop' + ,it: 'CGM Sensor Stop' + ,ja: 'CGM Sensor Stop' + ,dk: 'CGM Sensor Stop' + ,fi: 'CGM Sensor Stop' + ,nb: 'CGM Sensor Stop' + ,he: 'CGM Sensor Stop' + ,pl: 'CGM Sensor Stop' + ,ru: 'CGM Sensor Stop' + ,sk: 'CGM Sensor Stop' + ,nl: 'CGM Sensor Stop' + ,ko: 'CGM Sensor Stop' + ,tr: 'CGM Sensor Stop' + ,zh_cn: 'CGM Sensor Stop' + } ,'CGM Sensor Insert' : { cs: 'Výměna sensoru' ,de: 'CGM Sensor Wechsel' @@ -4952,6 +5448,7 @@ function init() { ,bg: 'Смяна на сензор' ,hr: 'Promjena senzora' ,it: 'CGM Cambio sensore' + ,ja: 'CGMセンサー挿入' ,dk: 'Sensor ombytning' ,fi: 'Sensorin vaihto' ,nb: 'Sensorbytte' @@ -4961,6 +5458,7 @@ function init() { ,sk: 'Výmena senzoru' ,nl: 'CGM sensor wissel' ,ko: 'CGM 센서 삽입' + ,tr: 'CGM Sensor yerleştir' ,zh_cn: '植入CGM（连续血糖监测）探头' } ,'Dexcom Sensor Start' : { @@ -4975,6 +5473,7 @@ function init() { ,bg: 'Ре/Стартиране на Декском сензор' ,hr: 'Start Dexcom senzora' ,it: 'Avvio sensore Dexcom' + ,ja: 'Dexcomセンサー開始' ,dk: 'Dexcom sensor start' ,fi: 'Sensorin aloitus' ,nb: 'Dexcom sensor start' @@ -4984,6 +5483,7 @@ function init() { ,sk: 'Spustenie senzoru DEXCOM' ,nl: 'Dexcom sensor start' ,ko: 'Dexcom 센서 시작' + ,tr: 'Dexcom Sensör Başlat' ,zh_cn: '启动Dexcom探头' } ,'Dexcom Sensor Change' : { @@ -4998,6 +5498,7 @@ function init() { ,bg: 'Смяна на Декском сензор' ,hr: 'Promjena Dexcom senzora' ,it: 'Cambio sensore Dexcom' + ,ja: 'Dexcomセンサー挿入' ,dk: 'Dexcom sensor ombytning' ,fi: 'Sensorin vaihto' ,nb: 'Dexcom sensor bytte' @@ -5007,6 +5508,7 @@ function init() { ,sk: 'Výmena senzoru DEXCOM' ,nl: 'Dexcom sensor wissel' ,ko: 'Dexcom 센서 교체' + ,tr: 'Dexcom Sensör değiştir' ,zh_cn: '更换Dexcom探头' } ,'Insulin Cartridge Change' : { @@ -5021,6 +5523,7 @@ function init() { ,bg: 'Смяна на резервоар' ,hr: 'Promjena spremnika inzulina' ,it: 'Cambio cartuccia insulina' + ,ja: 'インスリンリザーバー交換' ,dk: 'Skift insulin beholder' ,fi: 'Insuliinisäiliön vaihto' ,nb: 'Skifte insulin beholder' @@ -5030,6 +5533,7 @@ function init() { ,sk: 'Výmena inzulínu' ,nl: 'Insuline cartridge wissel' ,ko: '인슐린 카트리지 교체' + ,tr: 'İnsülin rezervuar değişimi' ,zh_cn: '更换胰岛素储液器' } ,'D.A.D. Alert' : { @@ -5044,6 +5548,7 @@ function init() { ,bg: 'Сигнал от обучено куче' ,hr: 'Obavijest dijabetičkog psa' ,it: 'Allarme D.A.D.(Diabete Alert Dog)' + ,ja: 'メディカルアラート犬（ＤＡＤ）の知らせ' ,dk: 'Vuf Vuf! (Diabeteshundealarm!)' ,fi: 'Diabeteskoirahälytys' ,nb: 'Diabeteshundalarm' @@ -5053,6 +5558,7 @@ function init() { ,sk: 'Upozornenie signálneho psa' ,nl: 'Hulphond waarschuwing' ,ko: 'D.A.D(Diabetes Alert Dog) 알림' + ,tr: 'D.A.D(Diabetes Alert Dog)' ,zh_cn: 'D.A.D（低血糖通报犬）警告' } ,'Glucose Reading' : { @@ -5076,6 +5582,7 @@ function init() { ,sk: 'Hodnota glykémie' ,nl: 'Glucose meting' ,ko: '혈당 읽기' + ,tr: 'Glikoz Değeri' ,zh_cn: '血糖数值' } ,'Measurement Method' : { @@ -5090,6 +5597,7 @@ function init() { ,bg: 'Метод на измерване' ,hr: 'Metoda mjerenja' ,it: 'Metodo di misurazione' + ,ja: '測定方法' ,dk: 'Målemetode' ,fi: 'Mittaustapa' ,nb: 'Målemetode' @@ -5099,6 +5607,7 @@ function init() { ,sk: 'Metóda merania' ,nl: 'Meetmethode' ,ko: '측정 방법' + ,tr: 'Ölçüm Metodu' ,zh_cn: '测量方法' } ,'Meter' : { @@ -5113,7 +5622,8 @@ function init() { ,bg: 'Глюкомер' ,hr: 'Glukometar' ,it: 'Glucometro' - ,dk: 'Glukosemeter' + ,ja: '血糖測定器' + ,dk: 'Blodsukkermåler' ,fi: 'Sokerimittari' ,nb: 'Måleapparat' ,he: 'מד סוכר' @@ -5122,6 +5632,7 @@ function init() { ,sk: 'Glukomer' ,nl: 'Glucosemeter' ,ko: '혈당 측정기' + ,tr: 'Glikometre' ,zh_cn: '血糖仪' } ,'Insulin Given' : { @@ -5136,6 +5647,7 @@ function init() { ,bg: 'Инсулин' ,hr: 'Količina iznulina' ,it: 'Insulina' + ,ja: '投与されたインスリン' ,dk: 'Insulin dosis' ,fi: 'Insuliiniannos' ,nb: 'Insulin' @@ -5145,6 +5657,7 @@ function init() { ,sk: 'Podaný inzulín' ,nl: 'Toegediende insuline' ,ko: '인슐린 요구량' + ,tr: 'Verilen İnsülin' ,zh_cn: '胰岛素输注量' } ,'Amount in grams' : { @@ -5159,6 +5672,7 @@ function init() { ,bg: 'К-во в грамове' ,hr: 'Količina u gramima' ,it: 'Quantità in grammi' + ,ja: 'グラム換算' ,dk: 'Antal gram' ,fi: 'Määrä grammoissa' ,nb: 'Antall gram' @@ -5168,6 +5682,7 @@ function init() { ,sk: 'Množstvo v gramoch' ,nl: 'Hoeveelheid in gram' ,ko: '합계(grams)' + ,tr: 'Gram cinsinden miktar' ,zh_cn: '总量（g）' } ,'Amount in units' : { @@ -5182,6 +5697,7 @@ function init() { ,hr: 'Količina u jedinicama' ,sv: 'Antal enheter' ,it: 'Quantità in unità' + ,ja: '単位換算' ,dk: 'Antal enheder' ,fi: 'Annos yksiköissä' ,nb: 'Antall enheter' @@ -5191,6 +5707,7 @@ function init() { ,sk: 'Množstvo v jednotkách' ,nl: 'Aantal in eenheden' ,ko: '합계(units)' + ,tr: 'Birim miktarı' ,zh_cn: '总量（U）' } ,'View all treatments' : { @@ -5205,6 +5722,7 @@ function init() { ,bg: 'Преглед на всички събития' ,hr: 'Prikaži sve tretmane' ,it: 'Visualizza tutti le somministrazioni' + ,ja: '全治療内容を参照' ,dk: 'Vis behandlinger' ,fi: 'Katso kaikki hoitotoimenpiteet' ,nb: 'Vis behandlinger' @@ -5214,6 +5732,7 @@ function init() { ,sk: 'Zobraziť všetky ošetrenia' ,nl: 'Bekijk alle behandelingen' ,ko: '모든 treatments 보기' + ,tr: 'Tüm tedavileri görüntüle' ,zh_cn: '查看所有操作' } ,'Enable Alarms' : { @@ -5228,6 +5747,7 @@ function init() { ,bg: 'Активни аларми' ,hr: 'Aktiviraj alarme' ,it: 'Attiva Allarme' + ,ja: 'アラームを有効にする' ,dk: 'Aktivere alarmer' ,fi: 'Aktivoi hälytykset' ,nb: 'Aktiver alarmer' @@ -5237,32 +5757,45 @@ function init() { ,sk: 'Aktivovať alarmy' ,nl: 'Alarmen aan!' ,ko: '알람 켜기' + ,tr: 'Alarmları Etkinleştir' ,zh_cn: '启用报警' ,zh_tw: '啟用報警' } ,'Pump Battery Change' : { nl: 'Pompbatterij vervangen' ,sv: 'Byte av pumpbatteri' + ,dk: 'Udskift pumpebatteri' ,de: 'Pumpenbatterie wechseln' ,fi: 'Pumpun patterin vaihto' ,bg: 'Смяна на батерия на помпата' + ,ja: 'ポンプバッテリー交換' ,pl: 'Zmiana baterii w pompie' + ,ru: 'замена батареи помпы' + ,tr: 'Pompa pil değişimi' } ,'Pump Battery Low Alarm' : { nl: 'Pompbatterij bijna leeg Alarm' ,sv: 'Pumpbatteri lågt Alarm' + ,dk: 'Pumpebatteri lav Alarm' ,de: 'Pumpenbatterie niedrig Alarm' ,fi: 'Varoitus! Pumpun patteri loppumassa' ,bg: 'Аларма за слаба батерия на помпата' + ,ja: 'ポンプバッテリーが低下' ,pl: 'Alarm! Niski poziom baterii w pompie' + ,ru: 'Внимание! низкий заряд батареи помпы' + ,tr: 'Pompa Düşük pil alarmı' } ,'Pump Battery change overdue!' : { // batteryage.js nl: 'Pompbatterij moet vervangen worden!' ,sv: 'Pumpbatteriet måste bytas!' + ,dk: 'Pumpebatteri skal skiftes!' ,de: 'Pumpenbatterie Wechsel überfällig!' ,fi: 'Pumpun patterin vaihto myöhässä!' ,bg: 'Смяната на батерията на помпата - наложителна' + ,ja: 'ポンプバッテリー交換期限切れてます！' , pl: 'Bateria pompy musi być wymieniona!' + ,ru: 'пропущен срок замены батареи!' + ,tr: 'Pompa pil değişimi gecikti!' } ,'When enabled an alarm may sound.' : { cs: 'Při povoleném alarmu zní zvuk' @@ -5276,6 +5809,7 @@ function init() { ,bg: 'Когато е активирано, алармата ще има звук' ,hr: 'Kad je aktiviran, alarm se može oglasiti' ,it: 'Quando si attiva un allarme acustico.' + ,ja: '有効にすればアラームが鳴動します。' ,dk: 'Når aktiveret kan alarm lyde' ,fi: 'Aktivointi mahdollistaa äänihälytykset' ,nb: 'Når aktivert er alarmer aktive' @@ -5285,6 +5819,7 @@ function init() { ,sk: 'Pri aktivovanom alarme znie zvuk ' ,nl: 'Als ingeschakeld kan alarm klinken' ,ko: '알림을 활성화 하면 알람이 울립니다.' + ,tr: 'Etkinleştirilirse, alarm çalar.' ,zh_cn: '启用后可发出声音报警' ,zh_tw: '啟用後可發出聲音報警' } @@ -5300,7 +5835,8 @@ function init() { ,bg: 'Много висока КЗ' ,hr: 'Hitni alarm za hiper' ,it: 'Urgente:Glicemia Alta' - ,dk: 'Kritisk grænse overskredet' + ,ja: '緊急高血糖アラーム' + ,dk: 'Kritisk høj grænse overskredet' ,fi: 'Kriittinen korkea' ,nb: 'Kritisk høy alarm' ,he: 'התראת גבוה דחופה' @@ -5309,6 +5845,7 @@ function init() { ,sk: 'Naliehavý alarm vysokej glykémie' ,nl: 'Urgent Alarm Hoge BG' ,ko: '긴급 고혈당 알람' + ,tr: 'Acil Yüksek Alarm' //Dikkat yüksek alarm ,zh_cn: '血糖过高报警' ,zh_tw: '血糖過高報警' } @@ -5324,6 +5861,7 @@ function init() { ,bg: 'Висока КЗ' ,hr: 'Alarm za hiper' ,it: 'Glicemia Alta' + ,ja: '高血糖アラーム' ,dk: 'Høj grænse overskredet' ,fi: 'Korkea verensokeri' ,nb: 'Høy alarm' @@ -5333,6 +5871,7 @@ function init() { ,sk: 'Alarm vysokej glykémie' ,nl: 'Alarm hoge BG' ,ko: '고혈당 알람' + ,tr: 'Yüksek Alarmı' ,zh_cn: '高血糖报警' ,zh_tw: '高血糖報警' } @@ -5348,6 +5887,7 @@ function init() { ,bg: 'Ниска КЗ' ,hr: 'Alarm za hipo' ,it: 'Glicemia bassa' + ,ja: '低血糖アラーム' ,dk: 'Lav grænse overskredet' ,fi: 'Matala verensokeri' ,nb: 'Lav alarm' @@ -5357,6 +5897,7 @@ function init() { ,sk: 'Alarm nízkej glykémie' ,nl: 'Alarm lage BG' ,ko: '저혈당 알람' + ,tr: 'Düşük Alarmı' ,zh_cn: '低血糖报警' ,zh_tw: '低血糖報警' } @@ -5372,6 +5913,7 @@ function init() { ,bg: 'Много ниска КЗ' ,hr: 'Hitni alarm za hipo' ,it: 'Urgente:Glicemia Bassa' + ,ja: '緊急低血糖アラーム' ,dk: 'Advarsel: Lav' ,fi: 'Kriittinen matala' ,nb: 'Kritisk lav alarm' @@ -5381,6 +5923,7 @@ function init() { ,sk: 'Naliehavý alarm nízkej glykémie' ,nl: 'Urgent Alarm lage BG' ,ko: '긴급 저혈당 알람' + ,tr: 'Acil Düşük Alarmı' ,zh_cn: '血糖过低报警' ,zh_tw: '血糖過低報警' } @@ -5397,6 +5940,7 @@ function init() { ,bg: 'Стари данни' ,hr: 'Pažnja: Stari podaci' ,it: 'Notifica Dati' + ,ja: '注意：古いデータ' ,dk: 'Advarsel: Gamle data' ,fi: 'Vanhat tiedot: varoitus' ,nb: 'Advarsel: Gamle data' @@ -5405,6 +5949,7 @@ function init() { ,sk: 'Varovanie: Zastaralé dáta' ,nl: 'Waarschuwing Oude gegevens na' ,ko: '손실 데이터 : 경고' + ,tr: 'Eski Veri: Uyarı' //Uyarı: veri artık geçerli değil ,zh_cn: '数据过期：提醒' ,zh_tw: '數據過期：提醒' } @@ -5421,6 +5966,7 @@ function init() { ,bg: 'Много стари данни' ,hr: 'Hitno: Stari podaci' ,it: 'Notifica:Urgente' + ,ja: '緊急：古いデータ' ,dk: 'Kritisk: Gamle data' ,fi: 'Vanhat tiedot: hälytys' ,nb: 'Advarsel: Veldig gamle data' @@ -5429,6 +5975,7 @@ function init() { ,sk: 'Naliehavé: Zastaralé dáta' ,nl: 'Urgente Waarschuwing Oude gegevens na' ,ko: '손실 데이터 : 긴급' + ,tr: 'Eski Veri: Acil' ,zh_cn: '数据过期：警告' ,zh_tw: '數據過期：警告' } @@ -5445,6 +5992,7 @@ function init() { ,bg: 'мин' ,hr: 'min' ,it: 'min' + ,ja: '分' ,dk: 'min' ,fi: 'minuuttia' ,nb: 'min' @@ -5453,6 +6001,7 @@ function init() { ,sk: 'min.' ,nl: 'minuten' ,ko: '분' + ,tr: 'dk.' ,zh_cn: '分' ,zh_tw: '分' } @@ -5469,7 +6018,8 @@ function init() { ,bg: 'Нощен режим' ,hr: 'Noćni način' ,it: 'Modalità Notte' - ,dk: 'Nat mode' + ,ja: '夜間モード' + ,dk: 'Nat tilstand' ,fi: 'Yömoodi' ,nb: 'Nattmodus' ,pl: 'Tryb nocny' @@ -5477,6 +6027,7 @@ function init() { ,sk: 'Nočný mód' ,nl: 'Nachtstand' ,ko: '나이트 모드' + ,tr: 'Gece Modu' ,zh_cn: '夜间模式' ,zh_tw: '夜間模式' } @@ -5493,6 +6044,7 @@ function init() { ,bg: 'Когато е активирано, страницата ще е затъмнена от 22-06ч' ,hr: 'Kad je uključen, stranica će biti zatamnjena od 22-06' ,it: 'Attivandola, la pagina sarà oscurata dalle 22:00-06:00.' + ,ja: '有効にすると、ページは 夜22時から 朝6時まで単色表示になります。' ,dk: 'Når aktiveret vil denne side nedtones fra 22:00-6:00' ,fi: 'Aktivoituna sivu himmenee kello 22 ja 06 välillä' ,nb: 'Når aktivert vil denne siden nedtones fra 22:00-06:00' @@ -5501,6 +6053,7 @@ function init() { ,sk: 'Keď je povolený, obrazovka bude stlmená od 22:00 do 6:00.' ,nl: 'Scherm dimmen tussen 22:00 en 06:00' ,ko: '페이지를 켜면 오후 10시 부터 오전 6시까지 비활성화 될 것이다.' + ,tr: 'Etkinleştirildiğinde, ekran akşam 22\'den sabah 6\'ya kadar kararır.' ,zh_cn: '启用后将在夜间22点至早晨6点降低页面亮度' ,zh_tw: '啟用後將在夜間22點至早晨6點降低頁面亮度' } @@ -5517,6 +6070,7 @@ function init() { ,bg: 'Активен' ,hr: 'Aktiviraj' ,it: 'Permettere' + ,ja: '有効' ,dk: 'Aktivere' ,fi: 'Aktivoi' ,nb: 'Aktiver' @@ -5525,6 +6079,7 @@ function init() { ,sk: 'Povoliť' ,nl: 'Activeren' ,ko: '활성화' + ,tr: 'Etkinleştir' ,zh_cn: '启用' ,zh_tw: '啟用' } @@ -5541,14 +6096,16 @@ function init() { ,bg: 'Показвай RAW данни' ,hr: 'Prikazuj sirove podatke o GUK-u' ,it: 'Mostra dati Raw BG' - ,dk: 'Vis rå data' + ,ja: '素のBGデータを表示する' + ,dk: 'Vis rå BS data' ,fi: 'Näytä raaka VS tieto' ,nb: 'Vis rådata' ,pl: 'Wyświetl surowe dane RAW' - ,ru: 'Показывать данные RAW' + ,ru: 'Показывать необработанные данные RAW' ,sk: 'Zobraziť RAW dáta' ,nl: 'Laat ruwe data zien' ,ko: 'Raw 혈당 데이터 보기' + ,tr: 'Ham KŞ verilerini göster' ,zh_cn: '显示原始血糖数据' ,zh_tw: '顯示原始血糖數據' } @@ -5565,6 +6122,7 @@ function init() { ,bg: 'Никога' ,hr: 'Nikad' ,it: 'Mai' + ,ja: '決して' ,dk: 'Aldrig' ,fi: 'Ei koskaan' ,nb: 'Aldri' @@ -5573,6 +6131,7 @@ function init() { ,sk: 'Nikdy' ,nl: 'Nooit' ,ko: '보지 않기' + ,tr: 'Hiçbir zaman' //Asla ,zh_cn: '不显示' ,zh_tw: '不顯示' } @@ -5589,6 +6148,7 @@ function init() { ,bg: 'Винаги' ,hr: 'Uvijek' ,it: 'Sempre' + ,ja: 'いつも' ,dk: 'Altid' ,fi: 'Aina' ,nb: 'Alltid' @@ -5597,6 +6157,7 @@ function init() { ,sk: 'Vždy' ,nl: 'Altijd' ,ko: '항상' + ,tr: 'Her zaman' ,zh_cn: '一直显示' ,zh_tw: '一直顯示' } @@ -5613,6 +6174,7 @@ function init() { ,bg: 'Когато има шум' ,hr: 'Kad postoji šum' ,it: 'Quando vi è rumore' + ,ja: '測定不良があった時' ,dk: 'Når der er støj' ,fi: 'Signaalihäiriöiden yhteydessä' ,nb: 'Når det er støy' @@ -5621,6 +6183,7 @@ function init() { ,sk: 'Pri šume' ,nl: 'Bij ruis' ,ko: '노이즈가 있을 때' + ,tr: 'Gürültü olduğunda' ,zh_cn: '当有噪声时显示' ,zh_tw: '當有噪聲時顯示' } @@ -5637,6 +6200,7 @@ function init() { ,bg: 'Когато е активно, малки бели точки ще показват RAW данните' ,hr: 'Kad je omogućeno, male bijele točkice će prikazivati sirove podatke o GUK-u.' ,it: 'Quando lo abiliti, visualizzerai piccoli puntini bianchi (raw BG data)' + ,ja: '有効にすると、小さい白ドットが素のBGデータ用に表示されます' ,dk: 'Ved aktivering vil små hvide prikker blive vist for rå BG tal' ,fi: 'Aktivoituna raaka VS tieto piirtyy aikajanalle valkoisina pisteinä' ,nb: 'Ved aktivering vil små hvite prikker bli vist for rå BG tall' @@ -5645,6 +6209,7 @@ function init() { ,sk: 'Keď je povolené, malé bodky budú zobrazovať RAW dáta.' ,nl: 'Indien geactiveerd is ruwe data zichtbaar als witte punten' ,ko: '활성화 하면 작은 흰점들이 raw 혈당 데이터를 표시하게 될 것이다.' + ,tr: 'Etkinleştirildiğinde, ham KŞ verileri için küçük beyaz noktalar görüntülenecektir.' ,zh_cn: '启用后将使用小白点标注原始血糖数据' ,zh_tw: '啟用後將使用小白點標註原始血糖數據' } @@ -5661,6 +6226,7 @@ function init() { ,bg: 'Име на страницата' ,hr: 'Vlastiti naziv' ,it: 'Titolo personalizzato' + ,ja: 'カスタムタイトル' ,dk: 'Valgfri titel' ,fi: 'Omavalintainen otsikko' ,nb: 'Egen tittel' @@ -5669,6 +6235,7 @@ function init() { ,sk: 'Vlastný názov stránky' ,ko: '사용자 정의 제목' ,nl: 'Eigen titel' + ,tr: 'Özel Başlık' ,zh_cn: '自定义标题' ,zh_tw: '自定義標題' } @@ -5685,6 +6252,7 @@ function init() { ,hr: 'Tema' ,sv: 'Tema' ,it: 'Tema' + ,ja: 'テーマ' ,dk: 'Tema' ,fi: 'Teema' ,nb: 'Tema' @@ -5693,6 +6261,7 @@ function init() { ,sk: 'Vzhľad' ,nl: 'Thema' ,ko: '테마' + ,tr: 'Tema' ,zh_cn: '主题' ,zh_tw: '主題' } @@ -5709,6 +6278,7 @@ function init() { ,bg: 'Черно-бяла' ,hr: 'Default' ,it: 'Predefinito' + ,ja: 'デフォルト' ,dk: 'Standard' ,fi: 'Oletus' ,nb: 'Standard' @@ -5717,6 +6287,7 @@ function init() { ,sk: 'Predvolený' ,nl: 'Standaard' ,ko: '초기설정' + ,tr: 'Varsayılan' ,zh_cn: '默认' ,zh_tw: '默認' } @@ -5733,6 +6304,7 @@ function init() { ,bg: 'Цветна' ,hr: 'Boje' ,it: 'Colori' + ,ja: '色付き' ,dk: 'Farver' ,fi: 'Värit' ,nb: 'Farger' @@ -5741,6 +6313,7 @@ function init() { ,sk: 'Farebný' ,nl: 'Kleuren' ,ko: '색상' + ,tr: 'Renkler' ,zh_cn: '彩色' ,zh_tw: '彩色' } @@ -5761,10 +6334,13 @@ function init() { ,ko: '색맹 친화적인 색상' ,bg: 'Цветове за далтонисти' ,it: 'Colori per daltonici' + ,ja: '色覚異常の方向けの色' ,fi: 'Värisokeille sopivat värit' ,zh_cn: '色盲患者可辨识的颜色' ,zh_tw: '色盲患者可辨識的顏色' ,pl: 'Kolory dla niedowidzących' + ,tr: 'Renk körü dostu görünüm' + ,ru: 'Цветовая гамма для людей с дальтонизмом' } ,'Reset, and use defaults' : { cs: 'Vymaž a nastav výchozí hodnoty' @@ -5779,6 +6355,7 @@ function init() { ,bg: 'Нулирай и използвай стандартните настройки' ,hr: 'Resetiraj i koristi defaultne vrijednosti' ,it: 'Resetta le impostazioni predefinite' + ,ja: 'リセットしてデフォルト設定を使用' ,dk: 'Returner til standardopsætning' ,fi: 'Palauta oletusasetukset' ,nb: 'Gjenopprett standardinnstillinger' @@ -5787,6 +6364,7 @@ function init() { ,sk: 'Resetovať do pôvodného nastavenia' ,nl: 'Herstel standaard waardes' ,ko: '초기화 그리고 초기설정으로 사용' + ,tr: 'Sıfırla ve varsayılanları kullan' ,zh_cn: '使用默认值重置' ,zh_tw: '使用默認值重置' } @@ -5803,6 +6381,7 @@ function init() { ,bg: 'Калибрации' ,hr: 'Kalibriranje' ,it: 'Calibrazioni' + ,ja: '較生' ,dk: 'Kalibrering' ,fi: 'Kalibraatiot' ,nb: 'Kalibreringer' @@ -5811,6 +6390,7 @@ function init() { ,sk: 'Kalibrácie' ,nl: 'Kalibraties' ,ko: '보정' + ,tr: 'Kalibrasyon' ,zh_cn: '校准' } ,'Alarm Test / Smartphone Enable' : { @@ -5826,6 +6406,7 @@ function init() { ,bg: 'Тестване на алармата / Активно за мобилни телефони' ,hr: 'Alarm test / Aktiviraj smartphone' ,it: 'Test Allarme / Abilita Smartphone' + ,ja: 'アラームテスト/スマートフォンを有効にする' ,dk: 'Alarm test / Smartphone aktiveret' ,fi: 'Hälytyksien testaus / Älypuhelimien äänet päälle' ,nb: 'Alarmtest / Smartphone aktivering' @@ -5834,6 +6415,7 @@ function init() { ,sk: 'Test alarmu' ,nl: 'Alarm test / activeer Smartphone' ,ko: '알람 테스트 / 스마트폰 활성화' + ,tr: 'Alarm Testi / Akıllı Telefon için Etkin' ,zh_cn: '报警测试/智能手机启用' ,zh_tw: '報警測試/智能手機啟用' } @@ -5850,14 +6432,16 @@ function init() { ,bg: 'Болус съветник ' ,hr: 'Bolus wizard' ,it: 'BW-Calcolatore di Bolo' + ,ja: 'ボーラスウィザード' ,dk: 'Bolusberegner' ,fi: 'Annosopas' ,nb: 'Boluskalkulator' ,pl: 'Kalkulator bolusa' - ,ru: 'Болюс Мастер' + ,ru: 'калькулятор болюса' ,sk: 'Bolusový kalkulátor' ,nl: 'Bolus calculator' ,ko: 'Bolus 마법사' + ,tr: 'Bolus Hesaplayıcısı' ,zh_cn: '大剂量向导' ,zh_tw: '大劑量嚮導' } @@ -5874,6 +6458,7 @@ function init() { ,bg: 'в бъдещето' ,hr: 'U budućnosti' ,it: 'nel futuro' + ,ja: '先の時間' ,dk: 'i fremtiden' ,fi: 'tulevaisuudessa' ,nb: 'fremtiden' @@ -5882,6 +6467,7 @@ function init() { ,sk: 'v budúcnosti' ,nl: 'In de toekomst' ,ko: '미래' + ,tr: 'gelecekte' ,zh_cn: '在未来' ,zh_tw: '在未來' } @@ -5898,6 +6484,7 @@ function init() { ,bg: 'преди време' ,hr: 'prije' ,it: 'tempo fa' + ,ja: '時間前' ,dk: 'tid siden' ,fi: 'aikaa sitten' ,nb: 'tid siden' @@ -5906,6 +6493,7 @@ function init() { ,sk: 'čas pred' ,nl: 'tijd geleden' ,ko: '시간 전' + ,tr: 'süre önce' //yakın zamanda ,zh_cn: '在过去' ,zh_tw: '在過去' } @@ -5922,6 +6510,7 @@ function init() { ,bg: 'час по-рано' ,hr: 'sat unazad' ,it: 'ora fa' + ,ja: '時間前' ,dk: 'time siden' ,fi: 'tunti sitten' ,nb: 'Time siden' @@ -5930,6 +6519,7 @@ function init() { ,sk: 'hod. pred' ,nl: 'uur geleden' ,ko: '시간 전' + ,tr: 'saat önce' ,zh_cn: '小时前' ,zh_tw: '小時前' } @@ -5946,6 +6536,7 @@ function init() { ,bg: 'часа по-рано' ,hr: 'sati unazad' ,it: 'ore fa' + ,ja: '時間前' ,dk: 'timer siden' ,fi: 'tuntia sitten' ,nb: 'Timer siden' @@ -5954,6 +6545,7 @@ function init() { ,sk: 'hod. pred' ,nl: 'uren geleden' ,ko: '시간 전' + ,tr: 'saatler önce' ,zh_cn: '小时前' ,zh_tw: '小時前' } @@ -5970,6 +6562,7 @@ function init() { ,bg: 'мин. по-рано' ,hr: 'minuta unazad' ,it: 'minuto fa' + ,ja: '分前' ,dk: 'minut siden' ,fi: 'minuutti sitten' ,nb: 'minutter siden' @@ -5978,6 +6571,7 @@ function init() { ,sk: 'min. pred' ,nl: 'm geleden' ,ko: '분 전' + ,tr: 'dk. önce' ,zh_cn: '分钟前' ,zh_tw: '分鐘前' } @@ -5994,6 +6588,7 @@ function init() { ,bg: 'мин. по-рано' ,hr: 'minuta unazad' ,it: 'minuti fa' + ,ja: '分前' ,dk: 'minutter siden' ,fi: 'minuuttia sitten' ,nb: 'minutter siden' @@ -6002,6 +6597,7 @@ function init() { ,sk: 'min. pred' ,nl: 'm geleden' ,ko: '분 전' + ,tr: 'dakika önce' ,zh_cn: '分钟前' ,zh_tw: '分鐘前' } @@ -6018,6 +6614,7 @@ function init() { ,bg: 'ден по-рано' ,hr: 'dan unazad' ,it: 'Giorno fa' + ,ja: '日前' ,dk: 'dag siden' ,fi: 'päivä sitten' ,nb: 'dag siden' @@ -6026,6 +6623,7 @@ function init() { ,sk: 'deň pred' ,nl: 'dag geleden' ,ko: '일 전' + ,tr: 'gün önce' ,zh_cn: '天前' ,zh_tw: '天前' } @@ -6042,6 +6640,7 @@ function init() { ,bg: 'дни по-рано' ,hr: 'dana unazad' ,it: 'giorni fa' + ,ja: '日前' ,dk: 'dage siden' ,fi: 'päivää sitten' ,nb: 'dager siden' @@ -6050,6 +6649,7 @@ function init() { ,sk: 'dni pred' ,nl: 'dagen geleden' ,ko: '일 전' + ,tr: 'günler önce' ,zh_cn: '天前' ,zh_tw: '天前' } @@ -6066,6 +6666,7 @@ function init() { ,bg: 'преди много време' ,hr: 'prije dosta vremena' ,it: 'Molto tempo fa' + ,ja: '前の期間' ,dk: 'længe siden' ,fi: 'Pitkän aikaa sitten' ,nb: 'lenge siden' @@ -6074,6 +6675,7 @@ function init() { ,sk: 'veľmi dávno' ,nl: 'lang geleden' ,ko: '기간 전' + ,tr: 'uzun zaman önce' ,zh_cn: '很长时间前' ,zh_tw: '很長時間前' } @@ -6090,6 +6692,7 @@ function init() { ,bg: 'Чист' ,hr: 'Čisto' ,it: 'Pulito' + ,ja: 'なし' ,dk: 'Rent' ,fi: 'Puhdas' ,nb: 'Rent' @@ -6098,6 +6701,7 @@ function init() { ,sk: 'Čistý' ,nl: 'Schoon' ,ko: 'Clean' + ,tr: 'Temiz' ,zh_cn: '无' ,zh_tw: '無' } @@ -6114,6 +6718,7 @@ function init() { ,bg: 'Лек' ,hr: 'Lagano' ,it: 'Leggero' + ,ja: '軽い' ,dk: 'Let' ,fi: 'Kevyt' ,nb: 'Lite' @@ -6122,6 +6727,7 @@ function init() { ,sk: 'Nízky' ,nl: 'Licht' ,ko: 'Light' + ,tr: 'Kolay' ,zh_cn: '轻度' ,zh_tw: '輕度' } @@ -6138,6 +6744,7 @@ function init() { ,bg: 'Среден' ,hr: 'Srednje' ,it: 'Medio' + ,ja: '中間' ,dk: 'Middel' ,fi: 'Keskiverto' ,nb: 'Middels' @@ -6146,6 +6753,7 @@ function init() { ,sk: 'Stredný' ,nl: 'Gemiddeld' ,ko: '보통' + ,tr: 'Orta' ,zh_cn: '中度' ,zh_tw: '中度' } @@ -6161,6 +6769,7 @@ function init() { ,bg: 'Висок' ,hr: 'Teško' ,it: 'Pesante' + ,ja: '重たい' ,dk: 'Meget' ,fi: 'Raskas' ,nb: 'Mye' @@ -6169,6 +6778,7 @@ function init() { ,sk: 'Veľký' ,nl: 'Zwaar' ,ko: '심한' + ,tr: 'Ağır' ,zh_cn: '重度' ,zh_tw: '嚴重' } @@ -6184,6 +6794,7 @@ function init() { ,bg: 'Вид събитие' ,hr: 'Vrsta tretmana' ,it: 'Somministrazione' + ,ja: '治療タイプ' ,dk: 'Behandlingstype' ,fi: 'Hoidon tyyppi' ,nb: 'Behandlingstype' @@ -6192,6 +6803,7 @@ function init() { ,sk: 'Typ ošetrenia' ,nl: 'Type behandeling' ,ko: 'Treatment 타입' + ,tr: 'Tedavi tipi' ,zh_cn: '操作类型' } ,'Raw BG' : { @@ -6214,6 +6826,7 @@ function init() { ,sk: 'RAW dáta glykémie' ,nl: 'Ruwe BG data' ,ko: 'Raw 혈당' + ,tr: 'Ham KŞ' ,zh_cn: '原始血糖' } ,'Device' : { @@ -6228,6 +6841,7 @@ function init() { ,hr: 'Uređaj' ,sv: 'Enhet' ,it: 'Dispositivo' + ,ja: '機器' ,dk: 'Enhed' ,fi: 'Laite' ,nb: 'Enhet' @@ -6236,6 +6850,7 @@ function init() { ,sk: 'Zariadenie' ,nl: 'Apparaat' ,ko: '기기' + ,tr: 'Cihaz' ,zh_cn: '设备' } ,'Noise' : { @@ -6251,6 +6866,7 @@ function init() { ,bg: 'Шум' ,hr: 'Šum' ,it: 'Rumore' + ,ja: '測定不良' ,dk: 'Støj' ,fi: 'Kohina' ,nb: 'Støy' @@ -6259,6 +6875,7 @@ function init() { ,sk: 'Šum' ,nl: 'Ruis' ,ko: '노이즈' + ,tr: 'parazit' // gürültü ,zh_cn: '噪声' } ,'Calibration' : { @@ -6274,6 +6891,7 @@ function init() { ,bg: 'Калибрация' ,hr: 'Kalibriranje' ,it: 'Calibratura' + ,ja: '較正' ,dk: 'Kalibrering' ,fi: 'Kalibraatio' ,nb: 'Kalibrering' @@ -6282,6 +6900,7 @@ function init() { ,sk: 'Kalibrácia' ,nl: 'Kalibratie' ,ko: '보정' + ,tr: 'Kalibrasyon' ,zh_cn: '校准' } ,'Show Plugins' : { @@ -6297,6 +6916,7 @@ function init() { ,hr: 'Prikaži plugine' ,sv: 'Visa tillägg' ,it: 'Mostra Plugin' + ,ja: 'プラグイン表示' ,dk: 'Vis plugins' ,fi: 'Näytä pluginit' ,nb: 'Vis plugins' @@ -6305,6 +6925,7 @@ function init() { ,sk: 'Zobraziť pluginy' ,nl: 'Laat Plug-Ins zien' ,ko: '플러그인 보기' + ,tr: 'Eklentileri Göster' ,zh_cn: '显示插件' ,zh_tw: '顯示插件' } @@ -6321,6 +6942,7 @@ function init() { ,hr: 'O aplikaciji' ,sv: 'Om' ,it: 'Informazioni' + ,ja: '約' ,dk: 'Om' ,fi: 'Nightscoutista' ,nb: 'Om' @@ -6329,6 +6951,7 @@ function init() { ,sk: 'O aplikácii' ,nl: 'Over' ,ko: '대하여' + ,tr: 'Hakkında' ,zh_cn: '关于' ,zh_tw: '關於' } @@ -6345,6 +6968,7 @@ function init() { ,hr: 'Vrijednost u' ,sv: 'Värde om' ,it: 'Valore in' + ,ja: '数値' ,dk: 'Værdi i' ,fi: 'Arvo yksiköissä' ,nb: 'Verdi i' @@ -6353,6 +6977,7 @@ function init() { ,sk: 'Hodnota v' ,nl: 'Waarde in' ,ko: '값' + ,tr: 'Değer cinsinden' ,zh_cn: '数值' } ,'Carb Time' : { @@ -6367,15 +6992,17 @@ function init() { ,hr: 'Vrijeme unosa UH' ,sv: 'Kolhydratstid' ,it: 'Tempo' + ,ja: 'カーボ時間' ,dk: 'Kulhydratstid' ,fi: 'Syöntiaika' ,nb: 'Karbohydrattid' ,he: 'זמן פחמימה' ,pl: 'Czas posiłku' - ,ru: 'Время приема углеводов' + ,ru: 'Время действия углеводов' ,sk: 'Čas jedla' ,nl: 'Koolhydraten tijd' ,ko: '탄수화물 시간' + ,tr: 'Karbonhidratların alım zamanı' ,zh_cn: '碳水时间' } ,'Language' : { @@ -6394,10 +7021,12 @@ function init() { ,bg: 'Език' ,pl: 'Język' ,it: 'Lingua' + ,ja: '言語' ,ru: 'Язык' ,sk: 'Jazyk' ,nl: 'Taal' ,ko: '언어' + ,tr: 'Dil' ,zh_cn: '语言' ,zh_tw: '語言' } @@ -6421,6 +7050,8 @@ function init() { ,nl: 'Voeg toe' ,ko: '새입력' ,it: 'Aggiungi nuovo' + ,ja: '新たに加える' + ,tr: 'Yeni ekle' ,zh_cn: '新增' } ,'g' : { // grams shortcut @@ -6442,6 +7073,8 @@ function init() { ,nl: 'g' ,ko: 'g' ,it: 'g' + ,ja: 'g' + ,tr: 'g' ,zh_cn: '克' ,zh_tw: '克' } @@ -6464,6 +7097,8 @@ function init() { ,nl: 'ml' ,ko: 'ml' ,it: 'ml' + ,ja: 'ml' + ,tr: 'ml' ,zh_cn: '毫升' ,zh_tw: '毫升' } @@ -6486,6 +7121,8 @@ function init() { ,nl: 'stk' ,ko: '조각 바로 가기(pieces shortcut)' ,it: 'pz' + ,ja: 'pcs' + ,tr: 'parça' ,zh_cn: '件' ,zh_tw: '件' } @@ -6495,7 +7132,7 @@ function init() { ,de: 'Mahlzeit hierher verschieben' ,es: 'Arrastre y suelte aquí alimentos' ,fr: 'Glisser et déposer repas ici ' - ,dk: 'Hiv og slip mad her' + ,dk: 'Træk og slip mad her' ,sv: 'Dra&Släpp mat här' ,ro: 'Drag&drop aliment aici' ,el: 'Σύρετε εδώ φαγητό' @@ -6508,6 +7145,7 @@ function init() { ,sk: 'Potiahni a pusti jedlo sem' ,ko: '음식을 여기에 드래그&드랍 해주세요.' ,it: 'Trascina&rilascia cibo qui' + ,tr: 'Yiyecekleri buraya sürükle bırak' ,zh_cn: '拖放食物到这' ,nl: 'Maaltijd naar hier verplaatsen' } @@ -6530,6 +7168,7 @@ function init() { ,sk: 'Portál starostlivosti' ,nl: 'Zorgportaal' ,ko: 'Care Portal' + ,tr: 'Care Portal' ,zh_cn: '服务面板' ,zh_tw: '服務面板' } @@ -6553,6 +7192,7 @@ function init() { ,nl: 'Medium/Onbekend' ,ko: '보통/알려지지 않은' ,it: 'Media/Sconosciuto' + ,tr: 'Orta/Bilinmeyen' ,zh_cn: '中等/不知道' } ,'IN THE FUTURE' : { @@ -6575,6 +7215,7 @@ function init() { ,nl: 'IN DE TOEKOMST' ,ko: '미래' ,it: 'NEL FUTURO' + ,tr: 'GELECEKTE' ,zh_cn: '在未来' } ,'Update' : { // Update button @@ -6592,11 +7233,12 @@ function init() { ,bg: 'Актуализирай' ,it: 'Aggiornamento' ,pl: 'Aktualizacja' - ,fi: 'Päivitys' + ,fi: 'Tallenna' ,ru: 'Обновить' ,sk: 'Aktualizovať' ,nl: 'Update' ,ko: '업데이트' + ,tr: 'Güncelleştirme' ,zh_cn: '更新认证状态' ,zh_tw: '更新認證狀態' } @@ -6620,6 +7262,7 @@ function init() { ,sk: 'Usporiadať' ,nl: 'Sortering' ,ko: '순서' + ,tr: 'Sıra' ,zh_cn: '排序' } ,'oldest on top' : { @@ -6628,7 +7271,7 @@ function init() { ,de: 'älteste oben' ,es: 'Más antiguo arriba' ,fr: 'Plus vieux en tête de liste' - ,dk: 'ældste øverst' + ,dk: 'ældste først' ,sv: 'Äldst först' ,nb: 'Eldste først' ,el: 'τα παλαιότερα πρώτα' @@ -6642,6 +7285,7 @@ function init() { ,sk: 'najstaršie hore' ,nl: 'Oudste boven' ,ko: '오래된 것 부터' + ,tr: 'en eski üste' ,zh_cn: '按时间升序排列' } ,'newest on top' : { @@ -6651,7 +7295,7 @@ function init() { ,de: 'neueste oben' ,es: 'Más nuevo arriba' ,fr: 'Nouveaux en tête de liste' - ,dk: 'nyeste øverst' + ,dk: 'nyeste først' ,nb: 'Nyeste først' ,el: 'τα νεότερα πρώτα' ,ro: 'mai noi primele' @@ -6664,12 +7308,14 @@ function init() { ,sk: 'najnovšie hore' ,nl: 'Nieuwste boven' ,ko: '새로운 것 부터' + ,tr: 'en yeni üste' ,zh_cn: '按时间降序排列' } ,'All sensor events' : { cs: 'Všechny události sensoru' ,he: 'כל האירועים חיישן' ,sv: 'Alla sensorhändelser' + ,dk: 'Alle sensorhændelser' ,nb: 'Alle sensorhendelser' ,de: 'Alle Sensor-Ereignisse' ,es: 'Todos los eventos del sensor' @@ -6686,6 +7332,7 @@ function init() { ,sk: 'Všetky udalosti senzoru' ,nl: 'Alle sensor gegevens' ,ko: '모든 센서 이벤트' + ,tr: 'Tüm sensör olayları' ,zh_cn: '所有探头事件' } ,'Remove future items from mongo database' : { @@ -6708,6 +7355,7 @@ function init() { ,sk: 'Odobrať budúce položky z Mongo databázy' ,nl: 'Verwijder items die in de toekomst liggen uit database' ,ko: 'mongo DB에서 미래 항목들을 지우세요.' + ,tr: 'Gelecekteki öğeleri mongo veritabanından kaldır' ,zh_cn: '从数据库中清除所有未来条目' ,zh_tw: '從數據庫中清除所有未來條目' } @@ -6731,6 +7379,7 @@ function init() { ,sk: 'Nájsť a odstrániť záznamy ošetrenia v budúcnosti' ,nl: 'Zoek en verwijder behandelingen met datum in de toekomst' ,ko: '미래에 treatments를 검색하고 지우세요.' + ,tr: 'Gelecekte tedavileri bulun ve kaldır' ,zh_cn: '查找并清除所有未来的操作' ,zh_tw: '查找並清除所有未來的操作' } @@ -6754,6 +7403,7 @@ function init() { ,sk: 'Táto úloha nájde a odstáni záznamy ošetrenia v budúcnosti.' ,nl: 'Dit commando zoekt en verwijdert behandelingen met datum in de toekomst' ,ko: '이 작업은 미래에 treatments를 검색하고 지우는 것입니다.' + ,tr: 'Bu görev gelecekte tedavileri bul ve kaldır.' ,zh_cn: '此功能查找并清除所有未来的操作。' ,zh_tw: '此功能查找並清除所有未來的操作。' } @@ -6777,6 +7427,7 @@ function init() { ,sk: 'Odstrániť záznamy ošetrenia v budúcnosti' ,nl: 'Verwijder behandelingen met datum in de toekomst' ,ko: '미래 treatments 지우기' + ,tr: 'Gelecekte tedavileri kaldır' ,zh_cn: '清除未来操作' ,zh_tw: '清除未來操作' } @@ -6800,6 +7451,7 @@ function init() { ,sk: 'Nájsť a odstrániť CGM dáta v budúcnosti' ,nl: 'Zoek en verwijder behandelingen met datum in de toekomst' ,ko: '미래에 입력을 검색하고 지우세요.' + ,tr: 'Gelecekteki girdileri bul ve kaldır' ,zh_cn: '查找并清除所有的未来的记录' ,zh_tw: '查找並清除所有的未來的記錄' } @@ -6823,6 +7475,7 @@ function init() { ,sk: 'Táto úloha nájde a odstráni CGM dáta v budúcnosti vzniknuté zle nastaveným časom uploaderu.' ,nl: 'Dit commando zoekt en verwijdert behandelingen met datum in de toekomst' ,ko: '이 작업은 잘못된 날짜/시간으로 업로드 되어 생성된 미래의 CGM 데이터를 검색하고 지우는 것입니다.' + ,tr: 'Yükleyicinin oluşturduğu gelecekteki CGM verilerinin yanlış tarih/saat olanlarını bul ve kaldır.' ,zh_cn: '此功能查找并清除所有上传时日期时间错误导致生成在未来时间的CGM数据。' ,zh_tw: '此功能查找並清除所有上傳時日期時間錯誤導致生成在未來時間的CGM數據。' } @@ -6842,10 +7495,11 @@ function init() { ,fi: 'Poista tapahtumat' ,pl: 'Usuń wpisy w przyszłości' ,pt: 'Remover entradas futuras' - ,ru: 'Удаляются данные из будущего' + ,ru: 'Удалить данные из будущего' ,sk: 'Odstrániť CGM dáta v budúcnosti' ,nl: 'Verwijder invoer met datum in de toekomst' ,ko: '미래의 입력 지우기' + ,tr: 'Gelecekteki girdileri kaldır' ,zh_cn: '清除未来记录' ,zh_tw: '清除未來記錄' } @@ -6869,6 +7523,7 @@ function init() { ,sk: 'Nahrávam databázu...' ,nl: 'Database laden ....' ,ko: '데이터베이스 로딩' + ,tr: 'Veritabanı yükleniyor ...' ,zh_cn: '载入数据库...' ,zh_tw: '載入數據庫...' } @@ -6892,6 +7547,7 @@ function init() { ,sk: 'Databáza obsahuje %1 záznamov v budúcnosti' ,nl: 'Database bevat %1 toekomstige data' ,ko: '데이터베이스는 미래 기록을 %1 포함하고 있습니다.' + ,tr: 'Veritabanı %1 gelecekteki girdileri içeriyor' ,zh_cn: '数据库包含%1条未来记录' ,zh_tw: '數據庫包含%1條未來記錄' } @@ -6915,6 +7571,7 @@ function init() { ,sk: 'Odstrániť %1 vybraných záznamov' ,nl: 'Verwijder %1 geselecteerde data?' ,ko: '선택된 기록 %1를 지우시겠습니까?' + ,tr: 'Seçilen %1 kayıtlar kaldırılsın? ' ,zh_cn: '清除%1条选择的记录？' ,zh_tw: '清除%1條選擇的記錄？' } @@ -6938,6 +7595,7 @@ function init() { ,sk: 'Chyba pri nahrávanií databázy' ,nl: 'Fout bij het laden van database' ,ko: '데이터베이스 로딩 에러' + ,tr: 'Veritabanını yüklerken hata oluştu' ,zh_cn: '载入数据库错误' ,zh_tw: '載入數據庫錯誤' } @@ -6961,6 +7619,7 @@ function init() { ,sk: '%1 záznamov bolo odstránených...' ,nl: 'Data %1 verwijderd ' ,ko: '기록 %1가 삭제되었습니다.' + ,tr: '%1 kaydı silindi ...' ,zh_cn: '%1条记录已清除' ,zh_tw: '%1條記錄已清除' } @@ -6984,6 +7643,7 @@ function init() { ,sk: 'Chyba pri odstraňovaní záznamu %1' ,nl: 'Fout bij het verwijderen van %1 data' ,ko: '기록 %1을 삭제하는 중에 에러가 발생했습니다.' + ,tr: '%1 kayıt kaldırılırken hata oluştu' ,zh_cn: '%1条记录清除出错' ,zh_tw: '%1條記錄清除出錯' } @@ -7007,9 +7667,34 @@ function init() { ,sk: 'Odstraňovanie záznamov...' ,nl: 'Verwijderen van data .....' ,ko: '기록 삭제 중' + ,tr: 'Kayıtlar siliniyor ...' ,zh_cn: '正在删除记录...' ,zh_tw: '正在刪除記錄...' } + ,'%1 records deleted' : { + cs: '%1 records deleted' + ,he: '%1 records deleted' + ,nb: '%1 records deleted' + ,fr: '%1 records deleted' + ,ro: '%1 records deleted' + ,el: '%1 records deleted' + ,de: '%1 records deleted' + ,es: '%1 records deleted' + ,dk: '%1 records deleted' + ,sv: '%1 records deleted' + ,bg: '%1 records deleted' + ,it: '%1 records deleted' + ,fi: '%1 records deleted' + ,pl: '%1 records deleted' + ,pt: '%1 records deleted' + ,ru: '%1 records deleted' + ,sk: '%1 records deleted' + ,nl: '%1 records deleted' + ,ko: '%1 records deleted' + ,tr: '%1 records deleted' + ,zh_cn: '%1 records deleted' + ,zh_tw: '%1 records deleted' + } ,'Clean Mongo status database' : { cs: 'Vyčištění Mongo databáze statusů' ,he: 'נקי מסד הנתונים מצב מונגו ' @@ -7030,6 +7715,7 @@ function init() { ,sk: 'Vyčistiť Mongo databázu statusov' ,nl: 'Ruim Mongo database status op' ,ko: 'Mongo 상태 데이터베이스를 지우세요.' + ,tr: 'Mongo durum veritabanını temizle' ,zh_cn: '清除状态数据库' } ,'Delete all documents from devicestatus collection' : { @@ -7051,6 +7737,7 @@ function init() { ,ru: 'Стереть все документы из коллекции статус устройства' ,sk: 'Odstránenie všetkých záznamov z kolekcie "devicestatus"' ,ko: 'devicestatus 수집에서 모든 문서들을 지우세요' + ,tr: 'Devicestatus koleksiyonundan tüm dokümanları sil' ,zh_cn: '从设备状态采集删除所有文档' ,nl: 'Verwijder alle documenten uit "devicestatus" database' } @@ -7061,7 +7748,7 @@ function init() { ,el: 'Αυτή η ενέργεια διαγράφει όλα τα δεδομένα της κατάστασης της συσκευής ανάγνωσης. Χρήσιμη όταν η κατάσταση της συσκευής ανάγνωσης δεν ανανεώνεται σωστά.' ,de: 'Diese Aufgabe entfernt alle Dokumente aus der Gerätestatus-Sammlung. Nützlich wenn der Uploader-Batteriestatus sich nicht aktualisiert.' ,es: 'Este comando elimina todos los documentos desde la colección devicestatus. Útil cuando el estado de la batería cargadora no se actualiza correctamente' - ,dk: 'Denne handling fjerner alle dokumenter fra device status tabellen. Brugbart når uploader betteri status ikke er korrekt opdateret.' + ,dk: 'Denne handling fjerner alle dokumenter fra device status tabellen. Brugbart når uploader batteri status ikke opdateres korrekt.' ,ro: 'Acest instrument șterge toate documentele din colecția devicestatus. Se folosește când încărcarea bateriei nu se afișează corect.' ,sv: 'Denna uppgift tar bort alla dokument från devicestatuskollektionen. Användbart när batteristatus ej uppdateras' ,bg: 'Тази опция премахва всички документи от папката статус-устройство. Полезно е, когато статусът на батерията не се обновява.' @@ -7072,6 +7759,7 @@ function init() { ,ru: 'Эта опция удаляет все документы из коллекции статус устройства. Полезно когда состояние батвреи загрузчика не обновляется' ,sk: 'Táto úloha vymaže všetky záznamy z kolekcie "devicestatus". Je to vhodné keď sa stav batérie nezobrazuje správne.' ,ko: '이 작업은 모든 문서를 devicestatus 수집에서 지웁니다. 업로더 배터리 상태가 적절하게 업데이트 되지 않을 때 유용합니다.' + ,tr: 'Bu görev tüm durumları Devicestatus koleksiyonundan kaldırır. Yükleyici pil durumu güncellenmiyorsa kullanışlıdır.' ,zh_cn: '此功能从设备状态采集中删除所有文档。适用于上传设备电量信息不能正常同步时使用。' ,nl: 'Dit commando verwijdert alle documenten uit "devicestatus" database. Handig wanneer de batterij status niet correct wordt geupload.' } @@ -7095,9 +7783,10 @@ function init() { ,sk: 'Zmazať všetky záznamy' ,nl: 'Verwijder alle documenten' ,ko: '모든 문서들을 지우세요' + ,tr: 'Tüm Belgeleri sil' ,zh_cn: '删除所有文档' } - ,'Delete all documents from devicestatus collection devicestatus?' : { + ,'Delete all documents from devicestatus collection?' : { cs: 'Odstranit všechny dokumenty z kolekce devicestatus?' ,he: 'מחק את כל המסמכים מרשימת סטטוס ההתקנים ' ,nb: 'Fjern alle dokumenter fra device status tabellen?' @@ -7116,6 +7805,7 @@ function init() { ,ru: 'Стереть все документы коллекции статус устройства?' ,sk: 'Zmazať všetky záznamy z kolekcie "devicestatus"?' ,ko: 'devicestatus 수집의 모든 문서들을 지우세요.' + ,tr: 'Tüm Devicestatus koleksiyon belgeleri silinsin mi?' ,zh_cn: '从设备状态采集删除所有文档？' ,nl: 'Wil je alle data van "devicestatus" database verwijderen?' } @@ -7139,6 +7829,7 @@ function init() { ,sk: 'Databáza obsahuje %1 záznamov' ,nl: 'Database bevat %1 gegevens' ,ko: '데이터베이스는 %1 기록을 포함합니다.' + ,tr: 'Veritabanı %1 kayıt içeriyor' ,zh_cn: '数据库包含%1条记录' } ,'All records removed ...' : { @@ -7148,7 +7839,7 @@ function init() { ,de: 'Alle Einträge entfernt...' ,es: 'Todos los registros eliminados ...' ,fr: 'Toutes les valeurs ont été effacées' - ,dk: 'Alle indgange fjernet ...' + ,dk: 'Alle hændelser fjernet ...' ,el: 'Έγινε διαγραφή όλων των δεδομένων' ,ro: 'Toate înregistrările au fost șterse.' ,sv: 'Alla händelser raderade ...' @@ -7161,8 +7852,369 @@ function init() { ,sk: 'Všetky záznamy boli zmazané...' ,nl: 'Alle gegevens verwijderd' ,ko: '모든 기록들이 지워졌습니다.' + ,tr: 'Tüm kayıtlar kaldırıldı ...' ,zh_cn: '所有记录已经被清除' } + ,'Delete all documents from devicestatus collection older than 30 days' : { + cs: 'Delete all documents from devicestatus collection older than 30 days' + ,he: 'Delete all documents from devicestatus collection older than 30 days' + ,nb: 'Delete all documents from devicestatus collection older than 30 days' + ,fr: 'Delete all documents from devicestatus collection older than 30 days' + ,ro: 'Delete all documents from devicestatus collection older than 30 days' + ,el: 'Delete all documents from devicestatus collection older than 30 days' + ,de: 'Delete all documents from devicestatus collection older than 30 days' + ,es: 'Delete all documents from devicestatus collection older than 30 days' + ,dk: 'Delete all documents from devicestatus collection older than 30 days' + ,sv: 'Delete all documents from devicestatus collection older than 30 days' + ,bg: 'Delete all documents from devicestatus collection older than 30 days' + ,it: 'Delete all documents from devicestatus collection older than 30 days' + ,fi: 'Delete all documents from devicestatus collection older than 30 days' + ,pl: 'Delete all documents from devicestatus collection older than 30 days' + ,pt: 'Delete all documents from devicestatus collection older than 30 days' + ,ru: 'Delete all documents from devicestatus collection older than 30 days' + ,sk: 'Delete all documents from devicestatus collection older than 30 days' + ,nl: 'Delete all documents from devicestatus collection older than 30 days' + ,ko: 'Delete all documents from devicestatus collection older than 30 days' + ,tr: 'Delete all documents from devicestatus collection older than 30 days' + ,zh_cn: 'Delete all documents from devicestatus collection older than 30 days' + ,zh_tw: 'Delete all documents from devicestatus collection older than 30 days' + } + ,'Number of Days to Keep:' : { + cs: 'Number of Days to Keep:' + ,he: 'Number of Days to Keep:' + ,nb: 'Number of Days to Keep:' + ,fr: 'Number of Days to Keep:' + ,ro: 'Number of Days to Keep:' + ,el: 'Number of Days to Keep:' + ,de: 'Number of Days to Keep:' + ,es: 'Number of Days to Keep:' + ,dk: 'Number of Days to Keep:' + ,sv: 'Number of Days to Keep:' + ,bg: 'Number of Days to Keep:' + ,it: 'Number of Days to Keep:' + ,fi: 'Number of Days to Keep:' + ,pl: 'Number of Days to Keep:' + ,pt: 'Number of Days to Keep:' + ,ru: 'Number of Days to Keep:' + ,sk: 'Number of Days to Keep:' + ,nl: 'Number of Days to Keep:' + ,ko: 'Number of Days to Keep:' + ,tr: 'Number of Days to Keep:' + ,zh_cn: 'Number of Days to Keep:' + ,zh_tw: 'Number of Days to Keep:' + } + ,'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' : { + cs: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,he: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,nb: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,fr: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,ro: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,el: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,de: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,es: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,dk: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,sv: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,bg: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,it: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,fi: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,pl: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,pt: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,ru: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,sk: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,nl: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,ko: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,tr: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,zh_cn: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + ,zh_tw: 'This task removes all documents from devicestatus collection that are older than 30 days. Useful when uploader battery status is not properly updated.' + } + ,'Delete old documents from devicestatus collection?' : { + cs: 'Delete old documents from devicestatus collection?' + ,he: 'Delete old documents from devicestatus collection?' + ,nb: 'Delete old documents from devicestatus collection?' + ,fr: 'Delete old documents from devicestatus collection?' + ,ro: 'Delete old documents from devicestatus collection?' + ,el: 'Delete old documents from devicestatus collection?' + ,de: 'Delete old documents from devicestatus collection?' + ,es: 'Delete old documents from devicestatus collection?' + ,dk: 'Delete old documents from devicestatus collection?' + ,sv: 'Delete old documents from devicestatus collection?' + ,bg: 'Delete old documents from devicestatus collection?' + ,it: 'Delete old documents from devicestatus collection?' + ,fi: 'Delete old documents from devicestatus collection?' + ,pl: 'Delete old documents from devicestatus collection?' + ,pt: 'Delete old documents from devicestatus collection?' + ,ru: 'Delete old documents from devicestatus collection?' + ,sk: 'Delete old documents from devicestatus collection?' + ,nl: 'Delete old documents from devicestatus collection?' + ,ko: 'Delete old documents from devicestatus collection?' + ,tr: 'Delete old documents from devicestatus collection?' + ,zh_cn: 'Delete old documents from devicestatus collection?' + ,zh_tw: 'Delete old documents from devicestatus collection?' + } + ,'Clean Mongo entries (glucose entries) database' : { + cs: 'Clean Mongo entries (glucose entries) database' + ,he: 'Clean Mongo entries (glucose entries) database' + ,nb: 'Clean Mongo entries (glucose entries) database' + ,fr: 'Clean Mongo entries (glucose entries) database' + ,ro: 'Clean Mongo entries (glucose entries) database' + ,el: 'Clean Mongo entries (glucose entries) database' + ,de: 'Clean Mongo entries (glucose entries) database' + ,es: 'Clean Mongo entries (glucose entries) database' + ,dk: 'Clean Mongo entries (glucose entries) database' + ,sv: 'Clean Mongo entries (glucose entries) database' + ,bg: 'Clean Mongo entries (glucose entries) database' + ,it: 'Clean Mongo entries (glucose entries) database' + ,fi: 'Clean Mongo entries (glucose entries) database' + ,pl: 'Clean Mongo entries (glucose entries) database' + ,pt: 'Clean Mongo entries (glucose entries) database' + ,ru: 'Clean Mongo entries (glucose entries) database' + ,sk: 'Clean Mongo entries (glucose entries) database' + ,nl: 'Clean Mongo entries (glucose entries) database' + ,ko: 'Clean Mongo entries (glucose entries) database' + ,tr: 'Clean Mongo entries (glucose entries) database' + ,zh_cn: 'Clean Mongo entries (glucose entries) database' + ,zh_tw: 'Clean Mongo entries (glucose entries) database' + } + ,'Delete all documents from entries collection older than 180 days' : { + cs: 'Delete all documents from entries collection older than 180 days' + ,he: 'Delete all documents from entries collection older than 180 days' + ,nb: 'Delete all documents from entries collection older than 180 days' + ,fr: 'Delete all documents from entries collection older than 180 days' + ,ro: 'Delete all documents from entries collection older than 180 days' + ,el: 'Delete all documents from entries collection older than 180 days' + ,de: 'Delete all documents from entries collection older than 180 days' + ,es: 'Delete all documents from entries collection older than 180 days' + ,dk: 'Delete all documents from entries collection older than 180 days' + ,sv: 'Delete all documents from entries collection older than 180 days' + ,bg: 'Delete all documents from entries collection older than 180 days' + ,it: 'Delete all documents from entries collection older than 180 days' + ,fi: 'Delete all documents from entries collection older than 180 days' + ,pl: 'Delete all documents from entries collection older than 180 days' + ,pt: 'Delete all documents from entries collection older than 180 days' + ,ru: 'Delete all documents from entries collection older than 180 days' + ,sk: 'Delete all documents from entries collection older than 180 days' + ,nl: 'Delete all documents from entries collection older than 180 days' + ,ko: 'Delete all documents from entries collection older than 180 days' + ,tr: 'Delete all documents from entries collection older than 180 days' + ,zh_cn: 'Delete all documents from entries collection older than 180 days' + ,zh_tw: 'Delete all documents from entries collection older than 180 days' + } + ,'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' : { + cs: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,he: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,nb: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,fr: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ro: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,el: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,de: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,es: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,dk: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,sv: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,bg: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,it: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,fi: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,pl: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,pt: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ru: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,sk: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,nl: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ko: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,tr: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,zh_cn: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,zh_tw: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + } + ,'Delete old documents' : { + cs: 'Delete old documents' + ,he: 'Delete old documents' + ,nb: 'Delete old documents' + ,fr: 'Delete old documents' + ,ro: 'Delete old documents' + ,el: 'Delete old documents' + ,de: 'Delete old documents' + ,es: 'Delete old documents' + ,dk: 'Delete old documents' + ,sv: 'Delete old documents' + ,bg: 'Delete old documents' + ,it: 'Delete old documents' + ,fi: 'Delete old documents' + ,pl: 'Delete old documents' + ,pt: 'Delete old documents' + ,ru: 'Delete old documents' + ,sk: 'Delete old documents' + ,nl: 'Delete old documents' + ,ko: 'Delete old documents' + ,tr: 'Delete old documents' + ,zh_cn: 'Delete old documents' + ,zh_tw: 'Delete old documents' + } + ,'Delete old documents from entries collection?' : { + cs: 'Delete old documents from entries collection?' + ,he: 'Delete old documents from entries collection?' + ,nb: 'Delete old documents from entries collection?' + ,fr: 'Delete old documents from entries collection?' + ,ro: 'Delete old documents from entries collection?' + ,el: 'Delete old documents from entries collection?' + ,de: 'Delete old documents from entries collection?' + ,es: 'Delete old documents from entries collection?' + ,dk: 'Delete old documents from entries collection?' + ,sv: 'Delete old documents from entries collection?' + ,bg: 'Delete old documents from entries collection?' + ,it: 'Delete old documents from entries collection?' + ,fi: 'Delete old documents from entries collection?' + ,pl: 'Delete old documents from entries collection?' + ,pt: 'Delete old documents from entries collection?' + ,ru: 'Delete old documents from entries collection?' + ,sk: 'Delete old documents from entries collection?' + ,nl: 'Delete old documents from entries collection?' + ,ko: 'Delete old documents from entries collection?' + ,tr: 'Delete old documents from entries collection?' + ,zh_cn: 'Delete old documents from entries collection?' + ,zh_tw: 'Delete old documents from entries collection?' + } + ,'%1 is not a valid number' : { + cs: '%1 is not a valid number' + ,he: '%1 is not a valid number' + ,nb: '%1 is not a valid number' + ,fr: '%1 is not a valid number' + ,ro: '%1 is not a valid number' + ,el: '%1 is not a valid number' + ,de: '%1 is not a valid number' + ,es: '%1 is not a valid number' + ,dk: '%1 is not a valid number' + ,sv: '%1 is not a valid number' + ,bg: '%1 is not a valid number' + ,it: '%1 is not a valid number' + ,fi: '%1 is not a valid number' + ,pl: '%1 is not a valid number' + ,pt: '%1 is not a valid number' + ,ru: '%1 is not a valid number' + ,sk: '%1 is not a valid number' + ,nl: '%1 is not a valid number' + ,ko: '%1 is not a valid number' + ,tr: '%1 is not a valid number' + ,zh_cn: '%1 is not a valid number' + ,zh_tw: '%1 is not a valid number' + } + ,'%1 is not a valid number - must be more than 2' : { + cs: '%1 is not a valid number - must be more than 2' + ,he: '%1 is not a valid number - must be more than 2' + ,nb: '%1 is not a valid number - must be more than 2' + ,fr: '%1 is not a valid number - must be more than 2' + ,ro: '%1 is not a valid number - must be more than 2' + ,el: '%1 is not a valid number - must be more than 2' + ,de: '%1 is not a valid number - must be more than 2' + ,es: '%1 is not a valid number - must be more than 2' + ,dk: '%1 is not a valid number - must be more than 2' + ,sv: '%1 is not a valid number - must be more than 2' + ,bg: '%1 is not a valid number - must be more than 2' + ,it: '%1 is not a valid number - must be more than 2' + ,fi: '%1 is not a valid number - must be more than 2' + ,pl: '%1 is not a valid number - must be more than 2' + ,pt: '%1 is not a valid number - must be more than 2' + ,ru: '%1 is not a valid number - must be more than 2' + ,sk: '%1 is not a valid number - must be more than 2' + ,nl: '%1 is not a valid number - must be more than 2' + ,ko: '%1 is not a valid number - must be more than 2' + ,tr: '%1 is not a valid number - must be more than 2' + ,zh_cn: '%1 is not a valid number - must be more than 2' + ,zh_tw: '%1 is not a valid number - must be more than 2' + } + ,'Clean Mongo treatments database' : { + cs: 'Clean Mongo treatments database' + ,he: 'Clean Mongo treatments database' + ,nb: 'Clean Mongo treatments database' + ,fr: 'Clean Mongo treatments database' + ,ro: 'Clean Mongo treatments database' + ,el: 'Clean Mongo treatments database' + ,de: 'Clean Mongo treatments database' + ,es: 'Clean Mongo treatments database' + ,dk: 'Clean Mongo treatments database' + ,sv: 'Clean Mongo treatments database' + ,bg: 'Clean Mongo treatments database' + ,it: 'Clean Mongo treatments database' + ,fi: 'Clean Mongo treatments database' + ,pl: 'Clean Mongo treatments database' + ,pt: 'Clean Mongo treatments database' + ,ru: 'Clean Mongo treatments database' + ,sk: 'Clean Mongo treatments database' + ,nl: 'Clean Mongo treatments database' + ,ko: 'Clean Mongo treatments database' + ,tr: 'Clean Mongo treatments database' + ,zh_cn: 'Clean Mongo treatments database' + ,zh_tw: 'Clean Mongo treatments database' + } + ,'Delete all documents from treatments collection older than 180 days' : { + cs: 'Delete all documents from treatments collection older than 180 days' + ,he: 'Delete all documents from treatments collection older than 180 days' + ,nb: 'Delete all documents from treatments collection older than 180 days' + ,fr: 'Delete all documents from treatments collection older than 180 days' + ,ro: 'Delete all documents from treatments collection older than 180 days' + ,el: 'Delete all documents from treatments collection older than 180 days' + ,de: 'Delete all documents from treatments collection older than 180 days' + ,es: 'Delete all documents from treatments collection older than 180 days' + ,dk: 'Delete all documents from treatments collection older than 180 days' + ,sv: 'Delete all documents from treatments collection older than 180 days' + ,bg: 'Delete all documents from treatments collection older than 180 days' + ,it: 'Delete all documents from treatments collection older than 180 days' + ,fi: 'Delete all documents from treatments collection older than 180 days' + ,pl: 'Delete all documents from treatments collection older than 180 days' + ,pt: 'Delete all documents from treatments collection older than 180 days' + ,ru: 'Delete all documents from treatments collection older than 180 days' + ,sk: 'Delete all documents from treatments collection older than 180 days' + ,nl: 'Delete all documents from treatments collection older than 180 days' + ,ko: 'Delete all documents from treatments collection older than 180 days' + ,tr: 'Delete all documents from treatments collection older than 180 days' + ,zh_cn: 'Delete all documents from treatments collection older than 180 days' + ,zh_tw: 'Delete all documents from treatments collection older than 180 days' + } + ,'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' : { + cs: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,he: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,nb: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,fr: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ro: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,el: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,de: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,es: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,dk: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,sv: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,bg: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,it: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,fi: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,pl: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,pt: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ru: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,sk: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,nl: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,ko: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,tr: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,zh_cn: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + ,zh_tw: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.' + } + ,'Delete old documents from treatments collection?' : { + cs: 'Delete old documents from treatments collection?' + ,he: 'Delete old documents from treatments collection?' + ,nb: 'Delete old documents from treatments collection?' + ,fr: 'Delete old documents from treatments collection?' + ,ro: 'Delete old documents from treatments collection?' + ,el: 'Delete old documents from treatments collection?' + ,de: 'Delete old documents from treatments collection?' + ,es: 'Delete old documents from treatments collection?' + ,dk: 'Delete old documents from treatments collection?' + ,sv: 'Delete old documents from treatments collection?' + ,bg: 'Delete old documents from treatments collection?' + ,it: 'Delete old documents from treatments collection?' + ,fi: 'Delete old documents from treatments collection?' + ,pl: 'Delete old documents from treatments collection?' + ,pt: 'Delete old documents from treatments collection?' + ,ru: 'Delete old documents from treatments collection?' + ,sk: 'Delete old documents from treatments collection?' + ,nl: 'Delete old documents from treatments collection?' + ,ko: 'Delete old documents from treatments collection?' + ,tr: 'Delete old documents from treatments collection?' + ,zh_cn: 'Delete old documents from treatments collection?' + ,zh_tw: 'Delete old documents from treatments collection?' + } ,'Admin Tools' : { cs: 'Nástroje pro správu' ,he: 'כלי אדמיניסטרציה ' @@ -7174,6 +8226,7 @@ function init() { ,dl: 'Administrator opgaver' ,el: 'Εργαλεία Διαχειριστή' ,sv: 'Adminverktyg' + ,dk: 'Administrations værktøj' ,bg: 'Настройки на администратора' ,it: 'NS - Dati Mongo' ,fi: 'Ylläpitotyökalut' @@ -7183,6 +8236,7 @@ function init() { ,sk: 'Nástroje pre správu' ,nl: 'Admin tools' ,ko: '관리 도구' + ,tr: 'Yönetici araçları' ,zh_cn: '管理工具' ,zh_tw: '管理工具' } @@ -7206,6 +8260,7 @@ function init() { ,sk: 'Nightscout výkazy' ,nl: 'Nightscout rapportages' ,ko: 'Nightscout 보고하기' + ,tr: 'NightScout raporları' ,zh_cn: 'Nightscout报表生成器' } ,'Cancel' : { @@ -7221,6 +8276,7 @@ function init() { ,sv: 'Avbryt' ,bg: 'Откажи' ,it: 'Cancellare' + ,ja: '中止' ,fi: 'Peruuta' ,pl: 'Anuluj' ,pt: 'Cancelar' @@ -7228,6 +8284,7 @@ function init() { ,sk: 'Zrušiť' ,nl: 'Annuleer' ,ko: '취소' + ,tr: 'İptal' ,zh_cn: '取消' } ,'Edit treatment' : { @@ -7238,7 +8295,7 @@ function init() { ,de: 'Bearbeite Behandlung' ,es: 'Editar tratamiento' ,fr: 'Modifier un traitement' - ,dk: 'Rediger indgang' + ,dk: 'Rediger behandling' ,el: 'Επεξεργασία Εγγραφής' ,sv: 'Redigera behandling' ,bg: 'Редакция на събитие' @@ -7250,6 +8307,7 @@ function init() { ,sk: 'Upraviť ošetrenie' ,nl: 'Bewerkt behandeling' ,ko: 'Treatments 편집' + ,tr: 'Tedaviyi düzenle' ,zh_cn: '编辑操作' } ,'Duration' : { @@ -7272,6 +8330,7 @@ function init() { ,sk: 'Trvanie' ,nl: 'Duur' ,ko: '기간' + ,tr: 'süre' ,zh_cn: '持续' } ,'Duration in minutes' : { @@ -7294,6 +8353,7 @@ function init() { ,sk: 'Trvanie v minútach' ,nl: 'Duur in minuten' ,ko: '분당 지속 기간' + ,tr: 'Süre dakika cinsinden' ,zh_cn: '持续时间（分钟）' } ,'Temp Basal' : { @@ -7315,6 +8375,7 @@ function init() { ,sk: 'Dočasný bazál' ,nl: 'Tijdelijke basaal' ,ko: '임시 basal' + ,tr: 'Geçici Bazal Oranı' ,zh_cn: '临时基础率' } ,'Temp Basal Start' : { @@ -7336,6 +8397,7 @@ function init() { ,sk: 'Začiatok dočasného bazálu' ,nl: 'Start tijdelijke basaal' ,ko: '임시 basal 시작' + ,tr: 'Geçici Bazal Oranını Başlanğıcı' ,zh_cn: '临时基础率开始' } ,'Temp Basal End' : { @@ -7357,6 +8419,7 @@ function init() { ,sk: 'Koniec dočasného bazálu' ,nl: 'Einde tijdelijke basaal' ,ko: '임시 basal 종료' + ,tr: 'Geçici bazal oranını Bitişi' ,zh_cn: '临时基础率结束' } ,'Percent' : { // value in % for temp basal @@ -7379,6 +8442,7 @@ function init() { ,sk: 'Percent' ,nl: 'Procent' ,ko: '퍼센트' + ,tr: 'Yüzde' ,zh_cn: '百分比' } ,'Basal change in %' : { @@ -7400,6 +8464,7 @@ function init() { ,sk: 'Zmena bazálu v %' ,nl: 'Basaal aanpassing in %' ,ko: '% 이내의 basal 변경' + ,tr: 'Bazal değişimi % cinsinden' ,zh_cn: '基础率变化百分比' } ,'Basal value' : { // absolute value for temp basal @@ -7417,10 +8482,11 @@ function init() { ,fi: 'Basaalin määrä' ,pl: 'Dawka podstawowa' ,pt: 'Valor da basal' - ,ru: 'Временный базал' + ,ru: 'величина временного базалал' ,sk: 'Hodnota bazálu' ,nl: 'Basaal snelheid' ,ko: 'Basal' + ,tr: 'Bazal değeri' ,zh_cn: '基础率值' } ,'Absolute basal value' : { @@ -7438,10 +8504,11 @@ function init() { ,fi: 'Absoluuttinen basaalimäärä' ,pl: 'Bezwględna wartość dawki podstawowej' ,pt: 'Valor absoluto da basal' - ,ru: 'Абсолютный базал' + ,ru: 'Абсолютная величина базала' ,sk: 'Absolútna hodnota bazálu' ,nl: 'Absolute basaal waarde' ,ko: '절대적인 basal' + ,tr: 'Mutlak bazal değeri' ,zh_cn: '绝对基础率值' } ,'Announcement' : { @@ -7464,6 +8531,7 @@ function init() { ,sk: 'Oznámenia' ,nl: 'Mededeling' ,ko: '공지' + ,tr: 'Duyuru' ,zh_cn: '通告' } ,'Loading temp basal data' : { @@ -7485,6 +8553,7 @@ function init() { ,sk: 'Nahrávam dáta dočasného bazálu' ,nl: 'Laden tijdelijke basaal gegevens' ,ko: '임시 basal 로딩' + ,tr: 'Geçici bazal verileri yükleniyor' ,zh_cn: '载入临时基础率数据' } ,'Save current record before changing to new?' : { @@ -7497,7 +8566,7 @@ function init() { ,el: 'Αποθήκευση τρεχουσας εγγραφής πριν δημιουργήσουμε νέα?' ,de: 'Aktuelle Einträge speichern?' ,es: 'Grabar datos actuales antes de cambiar por nuevos?' - ,dk: 'Gem aktuelle indgang før der skiftes til ny?' + ,dk: 'Gem aktuelle hændelse før der skiftes til ny?' ,fi: 'Tallenna nykyinen merkintä ennen vaihtoa uuteen?' ,bg: 'Запази текущият запис преди да промениш новия ' ,pl: 'Zapisać bieżący rekord przed zamianą na nowy?' @@ -7507,6 +8576,7 @@ function init() { ,nl: 'Opslaan voor verder te gaan?' ,ko: '새 데이터로 변경하기 전에 현재의 기록을 저장하시겠습니까?' ,it: 'Salvare i dati correnti prima di cambiarli?' + ,tr: 'Yenisine geçmeden önce mevcut girişleri kaydet?' ,zh_cn: '在修改至新值前保存当前记录？' } ,'Profile Switch' : { @@ -7518,7 +8588,7 @@ function init() { ,el: 'Εναλλαγή προφίλ' ,de: 'Profil wechseln' ,es: 'Cambiar Perfil' - ,dk: 'Byt profil' + ,dk: 'Skift profil' ,nb: 'Bytt profil' ,fi: 'Vaihda profiilia' ,bg: 'Смяна на профил' @@ -7529,6 +8599,7 @@ function init() { ,nl: 'Profiel wissel' ,ko: '프로파일 변경' ,it: 'Cambio profilo' + ,tr: 'Profil Değiştir' ,zh_cn: '切换配置文件' } ,'Profile' : { @@ -7551,6 +8622,7 @@ function init() { ,sk: 'Profil' ,nl: 'Profiel' ,ko: '프로파일' + ,tr: 'Profil' ,zh_cn: '配置文件' } ,'General profile settings' : { @@ -7573,6 +8645,7 @@ function init() { ,nl: 'Profiel instellingen' ,ko: '일반 프로파일 설정' ,it: 'Impostazioni generali profilo' + ,tr: 'Genel profil ayarları' ,zh_cn: '通用配置文件设置' } ,'Title' : { @@ -7595,6 +8668,7 @@ function init() { ,nl: 'Titel' ,ko: '제목' ,it: 'Titolo' + ,tr: 'Başlık' ,zh_cn: '标题' } ,'Database records' : { @@ -7607,7 +8681,7 @@ function init() { ,nb: 'Databaseverdier' ,de: 'Datenbankeinträge' ,es: 'Registros grabados en base datos' - ,dk: 'Database indgange' + ,dk: 'Database hændelser' ,fi: 'Tietokantamerkintöjä' ,bg: 'Записи в базата с данни' ,pl: 'Rekordy bazy danych' @@ -7616,6 +8690,7 @@ function init() { ,sk: 'Záznamy databázi' ,ko: '데이터베이스 기록' ,it: 'Record del database' + ,tr: 'Veritabanı kayıtları' ,zh_cn: '数据库记录' ,nl: 'Database gegevens' } @@ -7629,7 +8704,7 @@ function init() { ,nb: 'Legg til ny rad' ,de: 'Neuen Eintrag hinzufügen' ,es: 'Añadir nuevo registro' - ,dk: 'Tilføj ny indgang' + ,dk: 'Tilføj ny hændelse' ,fi: 'Lisää uusi merkintä' ,bg: 'Добави нов запис' ,pl: 'Dodaj nowy rekord' @@ -7639,6 +8714,8 @@ function init() { ,nl: 'Toevoegen' ,ko: '새 기록 추가' ,it: 'Aggiungi un nuovo record' + ,ja: '新しい記録を加える' + ,tr: 'Yeni kayıt ekle' ,zh_cn: '新增记录' } ,'Remove this record' : { @@ -7661,6 +8738,8 @@ function init() { ,nl: 'Verwijder' ,ko: '이 기록 삭' ,it: 'Rimuovi questo record' + ,ja: 'この記録を除く' + ,tr: 'Bu kaydı kaldır' ,zh_cn: '删除记录' } ,'Clone this record to new' : { @@ -7673,7 +8752,7 @@ function init() { ,es: 'Duplicar este registro como nuevo' ,nb: 'Kopier til ny rad' ,de: 'Diesen Eintrag duplizieren' - ,dk: 'Dupliker denne indgang' + ,dk: 'Kopier denne hændelse til ny' ,fi: 'Kopioi tämä merkintä uudeksi' ,bg: 'Копирай този запис като нов' ,pl: 'Powiel ten rekord na nowy' @@ -7683,6 +8762,7 @@ function init() { ,nl: 'Kopieer deze invoer naar nieuwe' ,ko: '이 기록을 새기록으로 복제하기' ,it: 'Clona questo record in uno nuovo' + ,tr: 'Bu kaydı yeniden kopyala' ,zh_cn: '复制记录' } ,'Record valid from' : { @@ -7694,7 +8774,7 @@ function init() { ,el: 'Ισχύει από' ,de: 'Eintrag gültig ab' ,es: 'Registro válido desde' - ,dk: 'Indgang gyldig fra' + ,dk: 'Hændelse gyldig fra' ,nb: 'Rad gyldig fra' ,fi: 'Merkintä voimassa alkaen' ,bg: 'Записът е валиден от ' @@ -7705,6 +8785,7 @@ function init() { ,nl: 'Geldig van' ,ko: '유효 기록' ,it: 'Record valido da' + ,tr: 'Buradan geçerli giriş' ,zh_cn: '有效记录，从' } ,'Stored profiles' : { @@ -7727,6 +8808,7 @@ function init() { ,nl: 'Opgeslagen profielen' ,ko: '저장된 프로파일' ,it: 'Profili salvati' + ,tr: 'Kaydedilmiş profiller' //Kayıtlı profiller,Saklanan profiller ,zh_cn: '配置文件已存储' } ,'Timezone' : { @@ -7749,6 +8831,7 @@ function init() { ,nl: 'Tijdzone' ,ko: '타임존' ,it: 'Fuso orario' + ,tr: 'Saat dilimi' ,zh_cn: '时区' } ,'Duration of Insulin Activity (DIA)' : { @@ -7771,6 +8854,7 @@ function init() { ,nl: 'Werkingsduur insuline (DIA)' ,ko: '활성 인슐린 지속 시간(DIA)' ,it: 'Durata Attività Insulinica (DIA)' + ,tr: 'İnsülin Etki Süresi (DIA)' ,zh_cn: '胰岛素作用时间（DIA）' } ,'Represents the typical duration over which insulin takes effect. Varies per patient and per insulin type. Typically 3-4 hours for most pumped insulin and most patients. Sometimes also called insulin lifetime.' : { @@ -7793,6 +8877,7 @@ function init() { ,nl: 'Geeft de werkingsduur van de insuline in het lichaam aan. Dit verschilt van patient tot patient er per soort insuline, algemeen gemiddelde is 3 tot 4 uur. ' ,ko: '인슐린이 작용하는 지속시간을 나타냅니다. 사람마다 그리고 인슐린 종류에 따라 다르고 일반적으로 3~4시간간 동안 지속되며 인슐린 작용 시간(Insulin lifetime)이라고 불리기도 합니다.' ,it: 'Rappresenta la durata tipica nel quale l\'insulina ha effetto. Varia in base al paziente ed al tipo d\'insulina. Tipicamente 3-4 ore per la maggior parte dei microinfusori e dei pazienti. Chiamata anche durata d\'azione insulinica.' + ,tr: 'İnsülinin etki ettiği tipik süreye karşılık gelir. Hastaya ve insülin tipine göre değişir. Çoğu pompa insülini ve çoğu hasta için genellikle 3-4 saattir. Bazen de insülin etki süresi de denir.' ,zh_cn: '体现典型的胰岛素活性持续时间。 通过百分比和胰岛素类型体现。对于大多数胰岛素和患者来说是3至4个小时。也称为胰岛素生命周期。' } ,'Insulin to carb ratio (I:C)' : { @@ -7805,16 +8890,17 @@ function init() { ,nb: 'IKH forhold' ,de: 'Insulin/Kohlenhydrate-Verhältnis (I:KH)' ,es: 'Relación Insulina/Carbohidratos (I:C)' - ,dk: 'Insulin til kulhydrat forhold (I:C)' + ,dk: 'Insulin til kulhydrat forhold også kaldet Kulhydrat-insulinratio (I:C)' ,fi: 'Insuliiniannoksen hiilihydraattisuhde (I:HH)' ,bg: 'Съотношение инсулин/въглехидратите ICR I:C И:ВХ' ,pl: 'Współczynnik insulina/węglowodany (I:C)' ,pt: 'Relação Insulina-Carboidrato (I:C)' - ,ru: 'Соотношение инсулин/углеводы' + ,ru: 'Соотношение инсулин/углеводы I:C' ,sk: 'Inzulín-sacharidový pomer (I:C)' ,nl: 'Insuline - Koolhydraat ratio (I:C)' ,ko: '탄수화물에 대한 인슐린 비율(I:C)' ,it: 'Rapporto Insulina-Carboidrati (I:C)' + ,tr: 'İnsülin/Karbonhidrat oranı (I:C)' ,zh_cn: '碳水化合物系数（ICR）' } ,'hours' : { @@ -7837,6 +8923,7 @@ function init() { ,nl: 'Uren' ,ko: '시간' ,it: 'ore' + ,tr: 'saat' ,zh_cn: '小时' } ,'g/hour' : { @@ -7858,6 +8945,7 @@ function init() { ,nl: 'g/uur' ,ko: 'g/시간' ,it: 'g/ora' + ,tr: 'g/saat' ,zh_cn: 'g/小时' } ,'g carbs per U insulin. The ratio of how many grams of carbohydrates are offset by each U of insulin.' : { @@ -7867,6 +8955,7 @@ function init() { ,fr: 'g de glucides par Uninté d\'insuline. Le rapport représentant la quantité de glucides compensée par une unité d\'insuline.' ,el: 'Γραμμάρια (g) υδατάνθρακα ανά μονάδα (U) ινσουλίνης. Πόσα γραμμάρια υδατάνθρακα αντιστοιχούν σε μία μονάδα ινσουλίνης' ,sv: 'gram kolhydrater per enhet insulin. Antal gram kolhydrater varje enhet insulin sänker' + ,dk: 'gram kulhydrater per enhed insulin. (Kulhydrat-insulinratio) Den mængde kulhydrat, som dækkes af en enhed insulin.' ,es: 'gr. de carbohidratos por unidad de insulina. La proporción de cuántos gramos de carbohidratos se consumen por unidad de insulina.' ,de: 'g Kohlenhydrate pro Einheit Insulin. Das Verhältnis wie viele Gramm Kohlenhydrate je Einheit Insulin verbraucht werden.' ,nb: 'g karbohydrater per enhet insulin. Beskriver hvor mange gram karbohydrater som hånderes av en enhet insulin.' @@ -7874,10 +8963,11 @@ function init() { ,bg: 'грам въглехидрат към 1 единица инсулин. Съотношението колко грама въглехидрат се покриват от 1 единица инсулин.' ,pl: 'g węglowodanów na 1j insuliny. Współczynnik ilości gram weglowodanów równoważonych przez 1j insuliny.' ,pt: 'g de carboidrato por unidade de insulina. A razão de quantos gramas de carboidrato são processados por cada unidade de insulina.' - ,ru: 'г углеводов на ед инсулина. Соотношение ед инсулина необходимого для компенсации некоторого количества граммов углеводов' + ,ru: 'г углеводов на ед инсулина. Соотношение показывает количество гр углеводов компенсируемого единицей инсулина.' ,sk: 'gramy sacharidov na jednotku inzulínu. Pomer udáva aké množstvo sacharidov pokryje jednotka inzulínu.' ,ko: '인슐린 단위 당 탄수화물 g. 인슐린 단위에 대한 탄수화물의 양의 비율을 나타냅니다.' ,it: 'g carbo per U di insulina. Il rapporto tra quanti grammi di carboidrati sono compensati da ogni U di insulina.' + ,tr: 'İnsülin ünite başına g karbonhidrat. İnsülin ünite başına kaç gram karbonhidrat tüketildiği oranıdır.' ,zh_cn: '克碳水每单位胰岛素。每单位胰岛素可以抵消的碳水化合物克值比例。' ,nl: 'G KH per Eh insuline. De verhouding tussen hoeveel grammen koohlhydraten er verwerkt kunnen worden per eenheid insuline.' } @@ -7890,16 +8980,18 @@ function init() { ,fr: 'Facteur de sensibilité à l\'insuline (ISF)' ,el: 'Ευαισθησία στην Ινοσυλίνη (ISF)' ,sv: 'Insulinkänslighetsfaktor (ISF)' + ,dk: 'Insulinfølsomhedsfaktor (ISF)' ,nb: 'Insulinfølsomhetsfaktor' ,fi: 'Insuliiniherkkyys (ISF)' ,bg: 'Фактор на инсулинова чувствителност ISF ' ,pl: 'Współczynnik wrażliwosci na insulinę (ISF)' ,pt: 'Fator de Sensibilidade da Insulina (ISF)' - ,ru: 'Фактор чувствительности к инсулину' + ,ru: 'Фактор чувствительности к инсулину ISF' ,sk: 'Citlivosť na inzulín (ISF)' ,nl: 'Insuline gevoeligheid (ISF)' ,ko: '인슐린 민감도(ISF)' ,it: 'Fattore di Sensibilità Insulinica (ISF)' + ,tr: '(ISF) İnsülin Duyarlılık Faktörü' ,zh_cn: '胰岛素敏感系数（ISF）' } ,'mg/dL or mmol/L per U insulin. The ratio of how much BG changes with each U of corrective insulin.' : { @@ -7911,6 +9003,7 @@ function init() { ,de: 'mg/dL oder mmol/L pro Einheit Insulin. Verhältnis von BG-Veränderung je Einheit Korrekturinsulin.' ,es: 'mg/dl o mmol/L por unidad Insulina. La relación de la caída de glucosa y cada unidad de insulina de corrección administrada.' ,sv: 'mg/dl eller mmol per enhet insulin. Hur varje enhet insulin sänker blodsockret' + ,dk: 'mg/dl eller mmol per enhed insulin. Beskriver hvor mange mmol eller mg/dl blodsukkeret sænkes per enhed insulin (Insulinfølsomheden)' ,nb: 'mg/dl eller mmol/l per enhet insulin. Beskriver hvor mye blodsukkeret senkes per enhet insulin.' ,fi: 'mg/dL tai mmol/L / 1 yksikkö insuliinia. Suhde, joka kertoo montako yksikköä verensokeria yksi yksikkö insuliinia laskee.' ,bg: 'мг/дл или ммол към 1 единица инсулин. Съотношението как се променя кръвната захар със всяка единица инсулинова корекция' @@ -7921,6 +9014,7 @@ function init() { ,nl: 'mg/dL of mmol/L per E insuline. Ratio daling BG waarde per eenheid correctie' ,ko: '인슐린 단위당 mg/dL 또는 mmol/L. 인슐린 단위당 얼마나 많은 혈당 변화가 있는지의 비율을 나타냅니다.' ,it: 'mg/dL o mmol/L per U insulina. Il rapporto di quanto la glicemia varia per ogni U di correzione insulinica.' + ,tr: 'Ünite insülin başına mg/dL veya mmol/L. Her bir Ünite düzeltme insülin ile KŞ\'nin ne kadar değiştiğini gösteren orandır.' ,zh_cn: 'mg/dL或mmol/L每单位胰岛素。每单位输入胰岛素导致血糖变化的比例' } ,'Carbs activity / absorption rate' : { @@ -7932,6 +9026,7 @@ function init() { ,de: 'Kohlenhydrataktivität / Aufnahme Kohlenhydrate' ,es: 'Actividad de carbohidratos / tasa de absorción' ,sv: 'Kolhydratstid' + ,dk: 'Kulhydrattid / optagelsestid' ,nb: 'Karbohydrattid' ,fi: 'Hiilihydraattiaktiivisuus / imeytymisnopeus' ,bg: 'Активност на въглехидратите / време за абсорбиране' @@ -7942,6 +9037,7 @@ function init() { ,nl: 'Koolhydraat opname snelheid' ,ko: '활성 탄수화물/흡수율' ,it: 'Attività carboidrati / Velocità di assorbimento' + ,tr: 'Karbonhidrat aktivitesi / emilim oranı' ,zh_cn: '碳水化合物活性/吸收率' } ,'grams peUr unit time. Represents both the change in COB per unit of time, as well as the amount of carbs that should take effect over that time. Carb absorption / activity curves are less well understood than insulin activity, but can be approximated using an initial delay followed by a constant rate of absorption (g/hr).' : { @@ -7951,6 +9047,7 @@ function init() { ,fr: 'grammes par unité de temps. Représente l\'augmentation de COB par unité de temps et la quantité de glucides agissant durant cette période. L\'absorption des glucides est imprécise et est évaluée en moyenne. L\'unité est grammes par heure (g/h).' ,ro: 'grame pe unitatea de timp. Reprezintă atât schimbarea COB pe unitatea de timp, cât și cantitatea de carbohidrați care ar influența în perioada de timp. Graficele ratei de absorbție sunt mai puțin înțelese decât senzitivitatea la insulină, dar se poate aproxima folosind o întârziere implicită și apoi o rată constantă de aborbție (g/h).' ,sv: 'gram per tidsenhet. Representerar både ändring i aktiva kolhydrater per tidsenhet som mängden kolhydrater som tas upp under denna tid. Kolhydratsupptag / aktivitetskurvor är svårare att förutspå än aktivt insulin men kan beräknas genom att använda en startfördröjning följd av en konstant absorbtionsgrad (g/timme) ' + ,dk: 'gram per tidsenhed. Repræsentere både ændring i aktive kulhydrater per tidsenhed, samt mængden af kulhydrater der indtages i dette tidsrum. Kulhydratsoptag / aktivitetskurver er svære at forudse i forhold til aktiv insulin, men man kan lave en tilnærmet beregning, ved at inkludere en forsinkelse i beregningen, sammen med en konstant absorberingstid (g/time).' ,de: 'Gramm pro Zeiteinheit. Bedeutet sowohl die Änderung in COB je Zeiteinheit, als auch die Menge an Kohlenhydraten die über diese Zeit wirken sollten. Kohlenhydrat-Absorption / Aktivitätskurven werden weniger genau verstanden als Insulinaktivität, aber sie können angenähert werden indem eine Anfangsverzögerung mit konstanter Aufnahme (g/Std.) verwendet wird.' ,es: 'gramos por unidad de tiempo. Representa tanto el cambio en carbohidratos activos por unidad de tiempo como la cantidad de carbohidratos absorbidos durante este tiempo. Las curvas de captación / actividad de carbohidratos son más difíciles de predecir que la insulina activa, pero se pueden calcular utilizando un retraso de inicio seguido de una tasa de absorción constante (gr/h)' ,nb: 'gram per tidsenhet. Representerer både endringen i COB per tidsenhet, såvel som mengden av karbohydrater som blir tatt opp i løpet av den tiden. Carb absorpsjon / virkningskurver er mindre forstått enn insulinaktivitet, men kan tilnærmes ved hjelp av en forsinkelse fulgt av en konstant hastighet av absorpsjon ( g / time ) .' @@ -7962,6 +9059,7 @@ function init() { ,sk: 'gramy za jednotku času. Reprezentuje súčasne zmenu COB za jednotku času, ako aj množstvo sacharidov ktoré sa za tú dobu prejavili. Krivka vstrebávania sacharidov je omnoho menej pochopiteľná ako pôsobenie inzulínu (IOB), ale môže byť približne s použitím počiatočného oneskorenia a následne s konštantným vstrebávaním (g/hod). ' ,ko: '단위 시간당 그램. 시간당 작용하는 탄수화물의 총량 뿐 아니라 시간 단위당 COB의 변화를 나타냅니다. 탄수화물 흡수율/활성도 곡선은 인슐린 활성도보다 이해가 잘 되지는 않지만 지속적인 흡수율(g/hr)에 따른 초기 지연을 사용하여 근사치를 구할 수 있습니다.' ,it: 'grammi per unità di tempo. Rappresentano sia il cambio di COB per unità di tempo, sia la quantità di carboidrati che faranno effetto nel tempo. Assorbimento di carboidrati / curva di attività sono meno conosciute rispetto all\'attività insulinica, ma possono essere approssimate usando un ritardo iniziale seguito da un rapporto costante di assorbimento (g/hr).' + ,tr: 'Ur birim zaman başına gram. Birim zamanda (COB) Aktif Krabonhidratdaki değişimin yanı sıra o zaman üzerinde etki etmesi gereken karbonhidrat miktarını ifade eder. Karbonhidrat emme/aktivite eğrileri, insülin aktivitesinden daha zor anlaşılmaktadır, ancak bir başlangıç gecikmesi ve ardından sabit bir emilim oranı (g/hr) kullanılarak yaklaşık olarak tahmin edilebilmektedir.' ,zh_cn: '克每单位时间。表示每单位时间COB（活性碳水化合物）的变化，以及在该时间应该生效的碳水化合物的量。碳水化合物活性/吸收曲线比胰岛素活性难理解，但可以使用初始延迟，接着恒定吸收速率（克/小时）来近似模拟。' ,nl: 'grammen per tijdseenheid. Geeft de wijzigingen in COB per tijdseenheid alsookde hoeveelheid KH dat impact zou moeten hebben over deze tijdspanne. KH absorbtie / activiteits curveszijn minder eenvoudig uitzetbaar, maar kunnen geschat worden door gebruik te maken van een startvertreging en daarna een constante curve van absorbtie (g/u).' } @@ -7980,11 +9078,12 @@ function init() { ,bg: 'Базална стойност [единица/час]' ,pl: 'Dawka podstawowa [j/h]' ,pt: 'Taxas de basal [unidades/hora]' - ,ru: 'Стойкость базала ед/час' + ,ru: 'Базал ед/час' ,sk: 'Bazál [U/hod]' ,nl: 'Basaal snelheid [eenheden/uur]' ,ko: 'Basal 비율[unit/hour]' ,it: 'Basale [unità/ora]' + ,tr: 'Bazal oranı [ünite/saat]' ,zh_cn: '基础率 [U/小时]' } ,'Target BG range [mg/dL,mmol/L]' : { @@ -7993,7 +9092,7 @@ function init() { ,ro: 'Intervalul țintă al glicemiei [mg/dL, mmol/L]' ,el: 'Στόχος Γλυκόζης Αίματος [mg/dl , mmol/l]' ,de: 'Blutzucker-Zielbereich [mg/dL, mmol/L]' - ,dk: 'Ønskbart blodsukkerinterval [mg/dl,mmol]' + ,dk: 'Ønsket blodsukkerinterval [mg/dl,mmol]' ,es: 'Intervalo glucemia dentro del objetivo [mg/dL,mmol/L]' ,fr: 'Cible d\'intervalle de glycémie' ,sv: 'Önskvärt blodsockerintervall [mg/dl,mmol]' @@ -8007,6 +9106,7 @@ function init() { ,nl: 'Doel BG waarde in [mg/dl,mmol/L' ,ko: '목표 혈당 범위 [mg/dL,mmol/L]' ,it: 'Obiettivo d\'intervallo glicemico [mg/dL,mmol/L]' + ,tr: 'Hedef KŞ aralığı [mg / dL, mmol / L]' ,zh_cn: '目标血糖范围 [mg/dL,mmol/L]' } ,'Start of record validity' : { @@ -8017,18 +9117,19 @@ function init() { ,el: 'Ισχύει από' ,sv: 'Starttid för händelse' ,de: 'Beginn der Aufzeichnungsgültigkeit' - ,dk: 'Starttid for hændelse' + ,dk: 'Starttid for gyldighed' ,es: 'Inicio de validez de datos' ,nb: 'Starttidspunkt for gyldighet' ,fi: 'Merkinnän alkupäivämäärä' ,bg: 'Начало на записа' ,pl: 'Początek ważnych rekordów' ,pt: 'Início da validade dos dados' - ,ru: 'Начало записей' + ,ru: 'Начало валидности записей' ,sk: 'Začiatok platnosti záznamu' ,nl: 'Start geldigheid' ,ko: '기록 유효기간의 시작일' ,it: 'Inizio di validità del dato' + ,tr: 'Kayıt geçerliliği başlangıcı' ,zh_cn: '有效记录开始' } ,'Icicle' : { @@ -8050,6 +9151,7 @@ function init() { ,ru: 'Силуэт сосульки' ,sk: 'Inverzne' ,ko: '고드름 방향' + ,tr: 'Buzsaçağı' //Sarkıt ,zh_cn: 'Icicle' ,zh_tw: 'Icicle' } @@ -8069,10 +9171,11 @@ function init() { ,bg: 'Базал' ,pl: 'Zmiana dawki bazowej' ,pt: 'Renderizar basal' - ,ru: 'Дать базал' + ,ru: 'показывать базал' ,sk: 'Zobrazenie bazálu' ,nl: 'Toon basaal' ,ko: 'Basal 사용하기' + ,tr: 'Bazal Grafik' ,zh_cn: '使用基础率' ,zh_tw: '使用基礎率' } @@ -8096,6 +9199,7 @@ function init() { ,nl: 'Gebruikt profiel' ,ko: '프로파일이 사용됨' ,it: 'Profilo usato' + ,tr: 'Kullanılan profil' ,zh_cn: '配置文件已使用' } ,'Calculation is in target range.' : { @@ -8105,7 +9209,7 @@ function init() { ,fr: 'La valeur calculée est dans l\'intervalle cible' ,el: 'Ο υπολογισμός είναι εντός στόχου' ,de: 'Berechnung ist innerhalb des Zielbereichs' - ,dk: 'Inden i intervalområde' + ,dk: 'Beregning er i målområdet' ,es: 'El cálculo está dentro del rango objetivo' ,sv: 'Inom intervallområde' ,nb: 'Innenfor målområde' @@ -8118,6 +9222,7 @@ function init() { ,nl: 'Berekening valt binnen doelwaards' ,ko: '계산은 목표 범위 안에 있습니다.' ,it: 'Calcolo all\'interno dell\'intervallo' + ,tr: 'Hesaplama hedef aralıktadır.' ,zh_cn: '预计在目标范围内' } ,'Loading profile records ...' : { @@ -8140,6 +9245,7 @@ function init() { ,nl: 'Laden profiel gegevens' ,ko: '프로파일 기록 로딩' ,it: 'Caricamento dati del profilo ...' + ,tr: 'Profil kayıtları yükleniyor ...' ,zh_cn: '载入配置文件记录...' } ,'Values loaded.' : { @@ -8162,6 +9268,7 @@ function init() { ,nl: 'Gegevens geladen' ,ko: '값이 로드됨' ,it: 'Valori caricati.' + ,tr: 'Değerler yüklendi.' ,zh_cn: '已载入数值' } ,'Default values used.' : { @@ -8184,6 +9291,7 @@ function init() { ,nl: 'Standaard waardes gebruikt' ,ko: '초기 설정 값이 사용됨' ,it: 'Valori standard usati.' + ,tr: 'Varsayılan değerler kullanıldı.' ,zh_cn: '已使用默认值' } ,'Error. Default values used.' : { @@ -8206,6 +9314,7 @@ function init() { ,nl: 'FOUT: Standaard waardes gebruikt' ,ko: '에러. 초기 설정 값이 사용됨' ,it: 'Errore. Valori standard usati.' + ,tr: 'Hata. Varsayılan değerler kullanıldı.' ,zh_cn: '错误，已使用默认值' } ,'Time ranges of target_low and target_high don\'t match. Values are restored to defaults.' : { @@ -8215,7 +9324,7 @@ function init() { ,fr: 'Les intervalles de temps pour la cible glycémique supérieure et inférieure diffèrent. Les valeurs par défault sont restaurées.' ,el: 'Το χρονικό διάστημα του χαμηλού ορίου/στόχου και του υψηλού, δεν συμπίπτουν. Γίνεται επαναφορά στις προκαθορισμένες τιμές.' ,de: 'Zeitspanne vom untersten und obersten Wert wird nicht berücksichtigt. Werte auf Standard zurückgesetzt.' - ,dk: 'Tidsinterval for målområde for lav og høj stemmer ikke overens' + ,dk: 'Tidsinterval for målområde lav og høj stemmer ikke overens. Standardværdier er brugt' ,es: 'Los marcos temporales para objetivo inferior y objetivo superior no coinciden. Los valores predeterminados son usados.' ,ro: 'Intervalele temporale pentru țintă_inferioară și țintă_superioară nu se potrivesc. Se folosesc valorile implicite.' ,sv: 'Tidsintervall för målområde låg och hög stämmer ej' @@ -8228,6 +9337,7 @@ function init() { ,ko: '설정한 저혈당과 고혈당의 시간 범위와 일치하지 않습니다. 값은 초기 설정값으로 다시 저장 될 것입니다.' ,it: 'Intervalli di tempo della glicemia obiettivo inferiore e superiore non corretti. Valori ripristinati a quelli standard.' ,nl: 'Tijdspanne van laag en hoog doel zijn niet correct. Standaard waarden worden gebruikt' + ,tr: 'Target_low ve target_high öğelerinin zaman aralıkları eşleşmiyor. Değerler varsayılanlara geri yüklendi.' ,zh_cn: '时间范围内的目标高低血糖值不匹配。已恢复使用默认值。' } ,'Valid from:' : { @@ -8250,6 +9360,7 @@ function init() { ,nl: 'Geldig van:' ,ko: '유효' ,it: 'Valido da:' + ,tr: 'Tarihinden itibaren geçerli' ,zh_cn: '生效从：' } ,'Save current record before switching to new?' : { @@ -8272,6 +9383,7 @@ function init() { ,nl: 'Opslaan voor verder te gaan?' ,ko: '새 데이터로 변환하기 전에 현재의 기록을 저장하겠습니까?' ,it: 'Salvare il dato corrente prima di passare ad uno nuovo?' + ,tr: 'Yenisine geçmeden önce mevcut kaydı kaydet' ,zh_cn: '切换至新记录前保存当前记录？' } ,'Add new interval before' : { @@ -8294,6 +9406,7 @@ function init() { ,nl: 'Voeg interval toe voor' ,ko: '새로운 구간을 추가하세요' ,it: 'Aggiungere prima un nuovo intervallo' + ,tr: 'Daha önce yeni aralık ekle' ,zh_cn: '在此前新增区间' } ,'Delete interval' : { @@ -8303,7 +9416,7 @@ function init() { ,fr: 'Effacer l\'intervalle' ,el: 'Διαγραφή διαστήματος' ,de: 'Intervall löschen' - ,dk: 'Fjern interval' + ,dk: 'Slet interval' ,es: 'Borrar intervalo' ,ro: 'Șterge interval' ,sv: 'Ta bort intervall' @@ -8316,6 +9429,7 @@ function init() { ,nl: 'Verwijder interval' ,ko: '구간을 지우세요.' ,it: 'Elimina intervallo' + ,tr: 'Aralığı sil' ,zh_cn: '删除区间' } ,'I:C' : { @@ -8337,6 +9451,7 @@ function init() { ,nl: 'I:C' ,ko: 'I:C' ,it: 'I:C' + ,tr: 'İ:K' ,zh_cn: 'ICR' } ,'ISF' : { @@ -8354,10 +9469,11 @@ function init() { ,pl: 'ISF' ,pt: 'ISF' ,nl: 'ISF' - ,ru: 'Чувствительность к инсулину' + ,ru: 'Чувствительность к инсулину ISF' ,sk: 'ISF' ,ko: 'ISF' ,it: 'ISF' + ,tr: 'ISF' ,zh_cn: 'ISF' } ,'Combo Bolus' : { @@ -8365,7 +9481,7 @@ function init() { ,he: 'בולוס קומבו ' ,pl: 'Bolus złożony' ,de: 'Verzögerter Bolus' - ,dk: 'Kombo-bolus' + ,dk: 'Kombineret bolus' ,es: 'Combo-Bolo' ,fr: 'Bolus Duo/Combo' ,el: '' @@ -8380,6 +9496,7 @@ function init() { ,nl: 'Pizza Bolus' ,ko: 'Combo Bolus' ,it: 'Combo Bolo' + ,tr: 'Kombo (Yayma) Bolus' ,zh_cn: '双波' } ,'Difference' : { @@ -8402,6 +9519,7 @@ function init() { ,nl: 'Verschil' ,ko: '차이' ,it: 'Differenza' + ,tr: 'fark' ,zh_cn: '差别' } ,'New time' : { @@ -8424,6 +9542,7 @@ function init() { ,nl: 'Nieuwe tijd' ,ko: '새로운 시간' ,it: 'Nuovo Orario' + ,tr: 'Yeni zaman' ,zh_cn: '新时间' } ,'Edit Mode' : { @@ -8432,7 +9551,7 @@ function init() { ,ro: 'Mod editare' ,fr: 'Mode Édition' ,de: 'Bearbeitungsmodus' - ,dk: 'Redigerings mode' + ,dk: 'Redigerings tilstand' ,es: 'Modo edición' ,sv: 'Editeringsläge' ,el: 'Λειτουργία Επεξεργασίας' @@ -8445,7 +9564,9 @@ function init() { ,pt: 'Modo de edição' ,ko: '편집 모드' ,it: 'Modalità di Modifica' + ,ja: '編集モード' ,nl: 'Wijzigen uitvoeren' + ,tr: 'Düzenleme Modu' ,zh_cn: '编辑模式' ,zh_tw: '編輯模式' } @@ -8469,6 +9590,7 @@ function init() { ,nl: 'Als geactiveerd is Wijzigen modus beschikbaar' ,ko: '편집모드를 시작하기 위해 아이콘을 활성화하면 볼 수 있습니다.' ,it: 'Quando abilitata, l\'icona della Modalità di Modifica è visibile' + ,tr: 'Etkinleştirildiğinde düzenleme modunun başında simgesi görünecektir.' ,zh_cn: '启用后开始编辑模式图标可见' ,zh_tw: '啟用後開始編輯模式圖標可見' } @@ -8492,6 +9614,7 @@ function init() { ,nl: 'Operatie' ,ko: '동작' ,it: 'Operazione' + ,tr: 'İşlem' //Operasyon ,zh_cn: '操作' } ,'Move' : { @@ -8514,6 +9637,7 @@ function init() { ,nl: 'Verplaats' ,ko: '이동' ,it: 'Muovi' + ,tr: 'Taşı' ,zh_cn: '移动' } ,'Delete' : { @@ -8536,6 +9660,8 @@ function init() { ,nl: 'Verwijder' ,ko: '삭제' ,it: 'Elimina' + ,ja: '削除' + ,tr: 'Sil' ,zh_cn: '删除' } ,'Move insulin' : { @@ -8558,6 +9684,7 @@ function init() { ,nl: 'Verplaats insuline' ,ko: '인슐린을 이동하세요.' ,it: 'Muovi Insulina' + ,tr: 'İnsülini taşı' ,zh_cn: '移动胰岛素' } ,'Move carbs' : { @@ -8580,6 +9707,7 @@ function init() { ,nl: 'Verplaats KH' ,ko: '탄수화물을 이동하세요.' ,it: 'Muovi carboidrati' + ,tr: 'Karbonhidratları taşı' ,zh_cn: '移动碳水' } ,'Remove insulin' : { @@ -8602,6 +9730,7 @@ function init() { ,nl: 'Verwijder insuline' ,ko: '인슐린을 지우세요.' ,it: 'Rimuovi insulina' + ,tr: 'İnsülini kaldır' ,zh_cn: '去除胰岛素' } ,'Remove carbs' : { @@ -8624,6 +9753,7 @@ function init() { ,nl: 'Verwijder KH' ,ko: '탄수화물을 지우세요.' ,it: 'Rimuovi carboidrati' + ,tr: 'Karbonhidratları kaldır' ,zh_cn: '去除碳水' } ,'Change treatment time to %1 ?' : { @@ -8646,6 +9776,7 @@ function init() { ,nl: 'Wijzig behandel tijdstip naar %1' ,ko: '%1 treatment을 변경하세요.' ,it: 'Cambiare tempo alla somministrazione a %1 ?' + ,tr: 'Tedavi tarihini %1 e değiştirilsin mi?' ,zh_cn: '修改操作时间到%1？' } ,'Change carbs time to %1 ?' : { @@ -8668,6 +9799,7 @@ function init() { ,nl: 'Wijzig KH tijdstip naar %1' ,ko: '%1로 탄수화물 시간을 변경하세요.' ,it: 'Cambiare durata carboidrati a %1 ?' + ,tr: 'Karbonhidrat zamanını %1 e değiştirilsin mi?' ,zh_cn: '修改碳水时间到%1？' } ,'Change insulin time to %1 ?' : { @@ -8690,6 +9822,7 @@ function init() { ,nl: 'Wijzig insuline tijdstip naar %1' ,ko: '%1로 인슐린 시간을 변경하세요.' ,it: 'Cambiare durata insulina a %1 ?' + ,tr: 'İnsülin tarihini %1 e değiştirilsin mi?' // zamanı ,zh_cn: '修改胰岛素时间到%1？' } ,'Remove treatment ?' : { @@ -8712,6 +9845,7 @@ function init() { ,nl: 'Verwijder behandeling' ,ko: 'Treatment를 지우세요.' ,it: 'Rimuovere somministrazione ?' + ,tr: 'Tedavi kaldırılsın mı? ' ,zh_cn: '去除操作？' } ,'Remove insulin from treatment ?' : { @@ -8734,6 +9868,7 @@ function init() { ,nl: 'Verwijder insuline van behandeling' ,ko: 'Treatment에서 인슐린을 지우세요.' ,it: 'Rimuovere insulina dalla somministrazione ?' + ,tr: 'İnsülini tedaviden çıkartılsın mı?' ,zh_cn: '从操作中去除胰岛素？' } ,'Remove carbs from treatment ?' : { @@ -8756,6 +9891,7 @@ function init() { ,nl: 'Verwijder KH van behandeling' ,ko: 'Treatment에서 탄수화물을 지우세요.' ,it: 'Rimuovere carboidrati dalla somministrazione ?' + ,tr: 'Karbonhidratları tedaviden çıkartılsın mı ?' // kaldırılsın mı ,zh_cn: '从操作中去除碳水化合物？' } ,'Rendering' : { @@ -8778,6 +9914,7 @@ function init() { ,nl: 'Renderen' ,ko: '랜더링' ,it: 'Traduzione' + ,tr: 'Grafik oluşturuluyor...' ,zh_cn: '渲染' } ,'Loading OpenAPS data of' : { @@ -8793,13 +9930,14 @@ function init() { ,nb: 'Laster OpenAPS data for' ,bg: 'Зареждане на OpenAPS данни от' ,fi: 'Lataan OpenAPS tietoja' - ,ru: 'Загрузка данных OpenAPS' + ,ru: 'Загрузка данных OpenAPS от' ,sk: 'Nahrávam OpenAPS dáta z' ,pl: 'Ładuję dane OpenAPS z' ,pt: 'Carregando dados de OpenAPS de' ,ko: 'OpenAPS 데이터 로딩' ,it: 'Caricamento in corso dati OpenAPS' ,nl: 'OpenAPS gegevens opladen van' + ,tr: 'dan OpenAPS verileri yükleniyor' ,zh_cn: '载入OpenAPS数据从' } ,'Loading profile switch data' : { @@ -8822,6 +9960,7 @@ function init() { ,ko: '프로파일 변환 데이터 로딩' ,it: 'Caricamento in corso dati cambio profilo' ,nl: 'Ophalen van data om profiel te wisselen' + ,tr: 'Veri profili değişikliği yükleniyor' ,zh_cn: '载入配置文件交换数据' } ,'Profile is going to be saved in newer format used in Nightscout 0.9.0 and above and will not be usable in older versions anymore.\nAre you sure?' : { @@ -8844,6 +9983,7 @@ function init() { ,ko: '프로파일은 Nightscout 0.9.0 에서 새로운 형식으로 저장될 예정입니다. 구버전은 더이상 사용되지 않을 예정입니다. 확인 하셨습니까?' ,it: 'Profilo sta per essere salvato nel formato più recente utilizzato in Nightscout 0.9.0 e/o superiori e non sarà più possibile utilizzarlo nelle versioni precedenti. \nSei sicuro?' ,nl: 'Profiel wordt opgeslagen in een nieuw formaat dat gebruikt wordt vanaf Nightscout 0.9.0 hierdoor is deze niet meer bruikbaar voor oudere versies. \nWil je doorgaan?' + ,tr: 'Profil, Nightscout 0.9.0 ve sonraki sürümlerinde kullanılan daha yeni bir formatta kaydedilecek ve artık eski sürümlerde kullanılamayacaktır.\nemin misiniz?' ,zh_cn: '配置文件将使用0.9.0版本之后的新格式保存，旧版本程序将无法使用。\n你确定吗？' } ,'Wrong profile setting.\nNo profile defined to displayed time.\nRedirecting to profile editor to create new profile.' : { @@ -8852,7 +9992,7 @@ function init() { ,el: 'Λάθος προφίλ. Παρακαλώ δημιουργήστε ένα νέο προφίλ' ,fr: 'Erreur de réglage de profil. \nAucun profil défini pour indiquer l\'heure. \nRedirection vers la création d\'un nouveau profil. ' ,de: 'Falsche Profileinstellung.\nKein Profil festgelegt zur angezeigten Zeit.\n Weiter zum Profileditor, um ein neues Profil zu erstellen.' - ,dk: 'Forkert profilindstilling.\nIngen profil defineret til at vise tid.\nOmdirigerar til profil editoren for at lave en ny profil.' + ,dk: 'Forkert profilindstilling.\nIngen profil defineret til at vise tid.\nOmdirigere til profil editoren for at lave en ny profil.' ,es: 'Configuración incorrecta del perfil. \n No establecido ningún perfil en el tiempo mostrado. \n Continuar en editor de perfil para crear perfil nuevo.' ,bg: 'Грешни настройки на профила. \nНяма определен профил към избраното време. \nПрепращане към редактора на профила, за създаване на нов профил.' ,ro: 'Setare de profil eronată.\nNu este definit niciun profil pentru perioada afișată.\nMergeți la editorul de profiluri pentru a defini unul nou.' @@ -8866,6 +10006,7 @@ function init() { ,ko: '잘못된 프로파일 설정. \n프로파일이 없어서 표시된 시간으로 정의됩니다. 새 프로파일을 생성하기 위해 프로파일 편집기로 리다이렉팅' ,it: 'Impostazione errata del profilo. \nNessun profilo definito per visualizzare l\'ora. \nReindirizzamento al profilo editor per creare un nuovo profilo.' ,nl: 'Verkeerde profiel instellingen.\ngeen profiel beschibaar voor getoonde tijd.\nVerder naar profiel editor om een profiel te maken.' + ,tr: 'Yanlış profil ayarı.\nGörüntülenen zamana göre profil tanımlanmamış.\nYeni profil oluşturmak için profil düzenleyicisine yönlendiriliyor.' ,zh_cn: '配置文件设置错误。\n没有配置文件定义为显示时间。\n返回配置文件编辑器以新建配置文件。' } ,'Pump' : { @@ -8887,6 +10028,7 @@ function init() { ,fi: 'Pumppu' ,pt: 'Bomba' ,it: 'Pompa' + ,tr: 'Pompa' ,zh_cn: '胰岛素泵' ,pl: 'Pompa' } @@ -8899,16 +10041,17 @@ function init() { ,el: 'Ημέρες χρήσης αισθητήρα (SAGE)' ,nb: 'Sensoralder (SAGE)' ,de: 'Sensor-Alter' - ,dk: 'Sensoralder (SAGE)' + ,dk: 'Sensor alder (SAGE)' ,es: 'Días uso del sensor' ,bg: 'Възраст на сензора (ВС)' ,ro: 'Vechimea senzorului' - ,ru: 'Возраст сенсора' + ,ru: 'Сенсор проработал' ,nl: 'Sensor leeftijd' ,ko: '센서 사용 기간' ,fi: 'Sensorin ikä' ,pt: 'Idade do sensor' ,it: 'SAGE - Durata Sensore' + ,tr: '(SAGE) Sensör yaşı ' ,zh_cn: '探头使用时间（SAGE）' ,zh_tw: '探頭使用時間（SAGE）' ,pl: 'Wiek sensora' @@ -8932,6 +10075,7 @@ function init() { ,pt: 'Idade da insulina' ,it: 'IAGE - Durata Insulina' ,nl: 'Insuline ouderdom (IAGE)' + ,tr: '(IAGE) İnsülin yaşı' ,zh_cn: '胰岛素使用时间（IAGE）' ,zh_tw: '胰島素使用時間（IAGE）' ,pj: 'Wiek insuliny' @@ -8955,6 +10099,7 @@ function init() { ,fi: 'Tilapäinen tavoite' ,pt: 'Meta temporária' ,it: 'Obiettivo Temporaneo' + ,tr: 'Geçici hedef' ,zh_cn: '临时目标' } ,'Reason' : { @@ -8976,6 +10121,7 @@ function init() { ,fi: 'Syy' ,pt: 'Razão' ,it: 'Ragionare' + ,tr: 'Neden' // Gerekçe ,zh_cn: '原因' ,pl: 'Powód' } @@ -8997,6 +10143,7 @@ function init() { ,fi: 'Syödään pian' ,pt: 'Refeição em breve' ,it: 'Mangiare prossimamente' + ,tr: 'Yakında yemek' // Kısa zamanda yemek yenecek ,zh_cn: '接近用餐时间' ,pl: 'Zjedz wkrótce' } @@ -9019,6 +10166,7 @@ function init() { ,fi: 'Ylä' ,pt: 'Superior' ,it: 'Superiore' + ,tr: 'Üst' ,zh_cn: '顶部' ,pl: 'Góra' } @@ -9041,6 +10189,7 @@ function init() { ,fi: 'Ala' ,pt: 'Inferior' ,it: 'Inferiore' + ,tr: 'Alt' //aşağı, alt, düşük ,zh_cn: '底部' ,pl: "Dół" } @@ -9063,6 +10212,7 @@ function init() { ,fi: 'Aktiviteetti' ,pt: 'Atividade' ,it: 'Attività' + ,tr: 'Aktivite' ,zh_cn: '有效的' ,pl: 'Aktywność' } @@ -9085,6 +10235,7 @@ function init() { ,fi: 'Tavoitteet' ,pt: 'Metas' ,it: 'Obiettivi' + ,tr: 'Hedefler' ,zh_cn: '目标' ,pl: 'Cele' } @@ -9107,6 +10258,7 @@ function init() { ,sk: 'Bolusový inzulín:' ,it: 'Insulina Bolo' ,nl: 'Bolus insuline' + ,tr: 'Bolus insülin:' ,zh_cn: '大剂量胰岛素' ,pl: 'Bolus insuliny' } @@ -9129,6 +10281,7 @@ function init() { ,sk: 'Základný bazálny inzulín:' ,it: 'Insulina Basale:' ,nl: 'Basis basaal insuline' + ,tr: 'Temel bazal insülin' ,zh_cn: '基础率胰岛素' ,pl: 'Bazowa dawka insuliny' } @@ -9146,11 +10299,12 @@ function init() { ,ko: '초과된 임시 basal 인슐린' ,fi: 'Positiivinen tilapäisbasaali:' ,de: 'Positives temporäres Basal Insulin:' - ,dk: 'Positiv tempbasal insulin:' + ,dk: 'Positiv midlertidig basalinsulin:' ,pt: 'Insulina basal temporária positiva:' ,sk: 'Pozitívny dočasný bazálny inzulín:' ,it: 'Insulina basale temp positiva:' ,nl: 'Extra tijdelijke basaal insuline' + ,tr: 'Pozitif geçici bazal insülin:' ,zh_cn: '实际临时基础率胰岛素' , pl: 'Zwiększona bazowa dawka insuliny' } @@ -9168,11 +10322,12 @@ function init() { ,ko: '남은 임시 basal 인슐린' ,fi: 'Negatiivinen tilapäisbasaali:' ,de: 'Negatives temporäres Basal Insulin:' - ,dk: 'Negativ tempbasal insulin:' + ,dk: 'Negativ midlertidig basalinsulin:' ,pt: 'Insulina basal temporária negativa:' ,sk: 'Negatívny dočasný bazálny inzulín:' ,it: 'Insulina basale Temp negativa:' ,nl: 'Negatieve tijdelijke basaal insuline' + ,tr: 'Negatif geçici bazal insülin:' ,zh_cn: '其余临时基础率胰岛素' , pl: 'Zmniejszona bazowa dawka insuliny' } @@ -9190,11 +10345,12 @@ function init() { ,ko: '전체 basal 인슐린' ,fi: 'Basaali yhteensä:' ,de: 'Gesamt Basal Insulin:' - ,dk: 'Total basalinsulin:' + ,dk: 'Total daglig basalinsulin:' ,pt: 'Insulina basal total:' ,sk: 'Celkový bazálny inzulín:' ,it: 'Insulina Basale Totale:' ,nl: 'Totaal basaal insuline' + ,tr: 'Toplam bazal insülin:' ,zh_cn: '基础率胰岛素合计' , pl: 'Całkowita ilość bazowej dawki insuliny' } @@ -9205,7 +10361,7 @@ function init() { ,fr: 'Insuline totale journalière' ,ro: 'Insulina totală zilnică:' ,el: 'Συνολική Ημερήσια Ινσουλίνη' - ,ru: 'Всего ежедн базал инсулина' + ,ru: 'Всего суточн базал инсулина' ,sv: 'Total dagsdos insulin' ,nb: 'Total daglig insulin' ,ko: '하루 인슐린 총량' @@ -9217,6 +10373,7 @@ function init() { ,sk: 'Celkový denný inzulín:' ,it: 'Totale giornaliero d\'insulina:' ,nl: 'Totaal dagelijkse insuline' + ,tr: 'Günlük toplam insülin:' ,zh_cn: '每日胰岛素合计' ,pl: 'Całkowita dzienna ilość insuliny' } @@ -9232,12 +10389,13 @@ function init() { ,nb: 'Kan ikke %1 rolle' ,fi: '%1 operaatio roolille opäonnistui' ,de: 'Unpassend zu %1 Rolle' - ,dk: 'Kan ikke fjerne %1 rolle' + ,dk: 'Kan ikke slette %1 rolle' ,pt: 'Função %1 não foi possível' ,sk: 'Chyba volania %1 Role' ,ko: '%1로 비활성' ,it: 'Incapace di %1 Ruolo' ,nl: 'Kan %1 rol niet verwijderen' + ,tr: '%1 Rolü yapılandırılamadı' ,zh_cn: '%1角色不可用' ,pl: 'Nie można %1 roli' } @@ -9253,12 +10411,13 @@ function init() { ,nb: 'Kan ikke ta bort rolle' ,fi: 'Roolin poistaminen epäonnistui' ,de: 'Rolle nicht löschbar' - ,dk: 'Kan ikke fjerne rolle' + ,dk: 'Kan ikke slette rolle' ,pt: 'Não foi possível apagar a Função' ,sk: 'Rola sa nedá zmazať' ,ko: '삭제로 비활성' ,it: 'Incapace di eliminare Ruolo' ,nl: 'Niet mogelijk rol te verwijderen' + ,tr: 'Rol silinemedi' ,zh_cn: '无法删除角色' ,pl: 'Nie można usunąć roli' } @@ -9280,6 +10439,7 @@ function init() { ,ko: '데이터베이스가 %1 포함' ,it: 'Database contiene %1 ruolo' ,nl: 'Database bevat %1 rollen' + ,tr: 'Veritabanı %1 rol içerir' ,zh_cn: '数据库包含%1个角色' , pl: 'Baza danych zawiera %1 ról' } @@ -9301,6 +10461,7 @@ function init() { ,ko: '편집 모드' ,it: 'Modifica ruolo' ,nl: 'Pas rol aan' + ,tr: 'Rolü düzenle' ,zh_cn: '编辑角色' ,pl: 'Edycja roli' } @@ -9322,6 +10483,7 @@ function init() { ,ko: '관리자, 학교, 가족 등' ,it: 'amministrazione, scuola, famiglia, etc' ,nl: 'admin, school, familie, etc' + ,tr: 'yönetici, okul, aile, vb' ,zh_cn: '政府、学校、家庭等' ,pl: 'administrator, szkoła, rodzina, itp' } @@ -9343,6 +10505,7 @@ function init() { ,ko: '허가' ,it: 'Permessi' ,nl: 'Rechten' + ,tr: 'İzinler' ,zh_cn: '权限' ,pl: 'Uprawnienia' } @@ -9364,6 +10527,7 @@ function init() { ,ko: '정말로 삭제하시겠습니까: ' ,it: 'Sei sicuro di voler eliminare:' ,nl: 'Weet u het zeker dat u wilt verwijderen?' + ,tr: 'Silmek istediğinizden emin misiniz:' ,zh_cn: '你确定要删除：' ,pl: 'Jesteś pewien, że chcesz usunąć:' } @@ -9374,6 +10538,7 @@ function init() { ,ro: 'Fiecare rol va avea cel puțin o permisiune. Permisiunea * este totală, permisiunile sunt ierarhice utilizând : pe post de separator.' ,ru: 'Каждая роль имеет 1 или более разрешений. Разрешение * это подстановочный символ, разрешения это иерархия, использующая : как разделитель.' ,sv: 'Varje roll kommer få en eller flera rättigheter. * är en wildcard, rättigheter sätts hirarkiskt med : som avgränsare.' + ,dk: 'Hver rolle vil have en eller flere rettigheder. Rollen * fungere som wildcard / joker, rettigheder sættes hierakisk med : som skilletegn.' ,nb: 'Hver enkelt rolle vil ha en eller flere rettigheter. *-rettigheten er wildcard. Rettigheter settes hierarkisk med : som separator.' ,fi: 'Jokaisella roolilla on yksi tai useampia oikeuksia. * on jokeri (tunnistuu kaikkina oikeuksina), oikeudet ovat hierarkia joka käyttää : merkkiä erottimena.' ,de: 'Jede Rolle hat eine oder mehrere Berechtigungen. Die * Berechtigung ist ein Platzhalter, Berechtigungen sind hierachrchisch mit : als Separator.' @@ -9384,6 +10549,7 @@ function init() { ,ko: '각각은 1 또는 그 이상의 허가를 가지고 있습니다. 허가는 예측이 안되고 구분자로 : 사용한 계층이 있습니다' ,it: 'Ogni ruolo avrà un 1 o più autorizzazioni. Il * il permesso è un jolly, i permessi sono una gerarchia utilizzando : come separatore.' ,nl: 'Elke rol heeft mintens 1 machtiging. De * machtiging is een wildcard, machtigingen hebben een hyrarchie door gebruik te maken van : als scheidingsteken.' + ,tr: 'Her rolün bir veya daha fazla izni vardır.*izni bir yer tutucudur ve izinler ayırıcı olarak : ile hiyerarşiktir.' ,zh_cn: '每个角色都具有一个或多个权限。权限设置时使用*作为通配符，层次结构使用:作为分隔符。' , pl: 'Każda rola będzie mieć 1 lub więcej uprawnień. Symbol * uprawnia do wszystkiego. Uprawnienia są hierarchiczne, używając : jako separatora.' } @@ -9399,12 +10565,13 @@ function init() { ,nb: 'Legg til ny rolle' ,fi: 'Lisää uusi rooli' ,de: 'Eine neue Rolle hinzufügen' - ,dk: 'Tilføj en ny rolle' + ,dk: 'Tilføj ny rolle' ,pt: 'Adicionar novo Papel' ,sk: 'Pridať novú rolu' ,ko: '새 역할 추가' ,it: 'Aggiungere un nuovo ruolo' ,nl: 'Voeg rol toe' + ,tr: 'Yeni Rol ekle' ,zh_cn: '添加新角色' ,pl: 'Dodaj nową rolę' } @@ -9426,6 +10593,7 @@ function init() { ,ko: '역할 - 그룹, 기기, 등' ,it: 'Ruoli - gruppi di persone, dispositivi, etc' ,nl: 'Rollen - Groepen mensen apparaten etc' + ,tr: 'Roller - İnsan grupları, Cihazlar vb.' ,zh_cn: '角色 - 一组人或设备等' ,pl: 'Role - Grupy ludzi, urządzeń, itp' } @@ -9447,6 +10615,7 @@ function init() { ,ko: '이 역할 편집' ,it: 'Modifica questo ruolo' ,nl: 'Pas deze rol aan' + ,tr: 'Bu rolü düzenle' ,zh_cn: '编辑角色' ,pl: 'Edytuj rolę' } @@ -9462,12 +10631,13 @@ function init() { ,nb: 'Administratorgodkjent' ,fi: 'Ylläpitäjä valtuutettu' ,de: 'Admin Authorisierung' - ,dk: 'Administratorgodkendt' + ,dk: 'Administrator godkendt' ,pt: 'Administrador autorizado' ,sk: 'Admin autorizovaný' ,ko: '인증된 관리자' ,it: 'Amministrativo autorizzato' ,nl: 'Admin geauthoriseerd' + ,tr: 'Yönetici yetkilendirildi' ,zh_cn: '已授权' ,zh_tw: '已授權' ,pl: 'Administrator autoryzowany' @@ -9490,6 +10660,7 @@ function init() { ,ko: '주제 - 사람, 기기 등' ,it: 'Soggetti - persone, dispositivi, etc' ,nl: 'Onderwerpen - Mensen, apparaten etc' + ,tr: 'Konular - İnsanlar, Cihazlar, vb.' ,zh_cn: '用户 - 人、设备等' ,pl: 'Obiekty - ludzie, urządzenia itp' } @@ -9505,12 +10676,13 @@ function init() { ,nb: 'Hver enkelt ressurs får en unik sikkerhetsnøkkel og en eller flere roller. Klikk på sikkerhetsnøkkelen for å åpne valgte ressurs, den hemmelige lenken kan så deles.' ,fi: 'Jokaisella käyttäjällä on uniikki pääsytunniste ja yksi tai useampi rooli. Klikkaa pääsytunnistetta nähdäksesi käyttäjän, jolloin saat jaettavan osoitteen tämän käyttäjän oikeuksilla.' ,de: 'Jedes Subjekt erhält einen einzigartigen Zugriffsschlüssel und eine oder mehrere Rollen. Klicke auf den Zugriffsschlüssel, um eine neue Ansicht mit dem ausgewählten Subjekt zu erhalten. Dieser geheime Link kann geteilt werden.' - ,dk: 'Hvert emne vil have en unik sikkerhedsnøgle og en eller flere roller. Klik på sikkerhedsnøglen for at åbne et nyt view med det valgte emne, dette hemmelige link kan derefter blive delt.' + ,dk: 'Hvert emne vil have en unik sikkerhedsnøgle samt en eller flere roller. Klik på sikkerhedsnøglen for at åbne et nyt view med det valgte emne, dette hemmelige link kan derefter blive delt.' ,pt: 'Cada assunto terá um único token de acesso e uma ou mais Funções. Clique no token de acesso para abrir uma nova visualização com o assunto selecionado. Este link secreto poderá então ser compartilhado' ,sk: 'Každý objekt má svoj unikátny prístupový token a 1 alebo viac rolí. Klikni na prístupový token pre otvorenie nového okna pre tento subjekt. Tento link je možné zdielať.' ,ko: '각 주제는 유일한 access token을 가지고 1 또는 그 이상의 역할을 가질 것이다. 선택된 주제와 새로운 뷰를 열기 위해 access token을 클릭하세요. 이 비밀 링크는 공유되어질 수 있다.' ,it: 'Ogni soggetto avrà un gettone d\'accesso unico e 1 o più ruoli. Fare clic sul gettone d\'accesso per aprire una nuova vista con il soggetto selezionato, questo legame segreto può quindi essere condiviso.' ,nl: 'Elk onderwerp heeft een unieke toegangscode en 1 of meer rollen. Klik op de toegangscode om een nieu venster te openen om het onderwerp te bekijken, deze verborgen link kan gedeeld worden.' + ,tr: 'Her konu benzersiz bir erişim anahtarı ve bir veya daha fazla rol alır. Seçilen konuyla ilgili yeni bir görünüm elde etmek için erişim tuşuna tıklayın. Bu gizli bağlantı paylaşılabilinir.' ,zh_cn: '每个用户具有唯一的访问令牌和一个或多个角色。在访问令牌上单击打开新窗口查看已选择用户，此时该链接可分享。' ,pl: 'Każdy obiekt będzie miał unikalny token dostępu i jedną lub więcej ról. Kliknij token dostępu, aby otworzyć nowy widok z wybranym obiektem, ten tajny link może być następnie udostępniony' } @@ -9532,6 +10704,7 @@ function init() { ,ko: '새 주제 추가' ,it: 'Aggiungere un nuovo Soggetto' ,nl: 'Voeg onderwerp toe' + ,tr: 'Yeni konu ekle' ,zh_cn: '添加新用户' ,pl: 'Dodaj obiekt' } @@ -9553,6 +10726,7 @@ function init() { ,ko: '%1 주제 비활성화' ,it: 'Incapace di %1 sottoporre' ,nl: 'Niet in staat %1 Onderwerp' + ,tr: '%1 konu yapılamıyor' ,zh_cn: '%1用户不可用' ,pl: 'Nie można %1 obiektu' } @@ -9567,13 +10741,14 @@ function init() { ,nb: 'Kan ikke slette ressurs' ,fi: 'Käyttäjän poistaminen epäonnistui' ,de: 'Kann Subjekt nicht löschen' - ,dk: 'Kan ikke fjerne emne' + ,dk: 'Kan ikke slette emne' ,es: 'Imposible eliminar sujeto' ,pt: 'Impossível apagar assunto' ,sk: 'Subjekt sa nedá odstrániť' ,ko: '주제를 지우기 위해 비활성화' ,it: 'Impossibile eliminare Soggetto' ,nl: 'Kan onderwerp niet verwijderen' + ,tr: 'Konu silinemedi' ,zh_cn: '无法删除用户' ,pl: 'Nie można usunąć obiektu' } @@ -9595,6 +10770,7 @@ function init() { ,ko: '데이터베이스는 %1 주제를 포함' ,it: 'Database contiene %1 soggetti' ,nl: 'Database bevat %1 onderwerpen' + ,tr: 'Veritabanı %1 konu içeriyor' ,zh_cn: '数据库包含%1个用户' ,pl: 'Baza danych zawiera %1 obiektów' } @@ -9616,6 +10792,7 @@ function init() { ,ko: '주제 편집' ,it: 'Modifica Oggetto' ,nl: 'Pas onderwerp aan' + ,tr: 'Konuyu düzenle' ,zh_cn: '编辑用户' ,pl: 'Edytuj obiekt' } @@ -9637,6 +10814,7 @@ function init() { ,ko: '사람, 기기 등' ,it: 'persona, dispositivo, ecc' ,nl: 'persoon, apparaat etc' + ,tr: 'kişi, cihaz, vb' ,zh_cn: '人、设备等' ,pl: 'osoba, urządzenie, itp' } @@ -9658,6 +10836,7 @@ function init() { ,ko: '역할1, 역할2' ,it: 'ruolo1, ruolo2' ,nl: 'rol1, rol2' + ,tr: 'rol1, rol2' ,zh_cn: '角色1、角色2' ,pl: 'rola1, rola2' } @@ -9679,6 +10858,7 @@ function init() { ,ko: '이 주제 편집' ,it: 'Modifica questo argomento' ,nl: 'pas dit onderwerp aan' + ,tr: 'Bu konuyu düzenle' ,zh_cn: '编辑此用户' ,pl: 'Edytuj ten obiekt' } @@ -9700,6 +10880,7 @@ function init() { ,ko: '이 주제 삭제' ,it: 'Eliminare questo argomento' ,nl: 'verwijder dit onderwerp' + ,tr: 'Bu konuyu sil' ,zh_cn: '删除此用户' ,pl: 'Usuń ten obiekt' } @@ -9721,6 +10902,7 @@ function init() { ,ko: '역할' ,it: 'Ruoli' ,nl: 'Rollen' + ,tr: 'Roller' ,zh_cn: '角色' ,pl: 'Role' } @@ -9742,6 +10924,7 @@ function init() { ,ko: 'Access Token' ,it: 'Gettone d\'accesso' ,nl: 'toegangscode' + ,tr: 'Erişim Simgesi (Access Token)' ,zh_cn: '访问令牌' ,pl: 'Token dostępu' } @@ -9763,6 +10946,7 @@ function init() { ,ko: '시간 후' ,it: 'ora fa' ,nl: 'uur geleden' + ,tr: 'saat önce' ,zh_cn: '小时前' ,pl: 'Godzię temu' } @@ -9784,6 +10968,7 @@ function init() { ,ko: '시간 후' ,it: 'ore fa' ,nl: 'uren geleden' + ,tr: 'saatler önce' ,zh_cn: '小时前' ,pl: 'Godzin temu' } @@ -9805,6 +10990,7 @@ function init() { ,ko: '%1 분 동안 무음' ,it: 'Silenzio per %1 minuti' ,nl: 'Sluimer %1 minuten' + ,tr: '%1 dakika sürelik sessizlik' ,zh_cn: '静音%1分钟' ,zh_tw: '靜音%1分鐘' ,pl: 'Wycisz na %1 minut' @@ -9813,7 +10999,7 @@ function init() { cs:'Zkontrolovat glykémii' ,he: 'בדוק סוכר בדם ' ,de: 'BZ kontrollieren' - ,dk: 'Kontroler blodglukos' + ,dk: 'Kontroller blodsukker' ,ro: 'Verificați glicemia' ,es: 'Verificar glucemia' ,fr: 'Vérifier la glycémie' @@ -9827,6 +11013,7 @@ function init() { ,ko: '혈당 체크' ,it: 'Controllare BG' ,nl: 'Controleer BG' + ,tr: 'KŞ\'ini kontrol et' ,zh_cn: '测量血糖' ,pl: 'Sprawdź glukozę z krwi' } @@ -9848,6 +11035,7 @@ function init() { ,es: 'BASAL' ,it: 'BASALE' ,nl: 'Basaal' + ,tr: 'Bazal' ,zh_cn: '基础率' ,zh_tw: '基礎率' ,pl: 'BAZA' @@ -9870,6 +11058,7 @@ function init() { ,ko: '현재 basal' ,it: 'Basale corrente' ,nl: 'Huidige basaal' + ,tr: 'Geçerli Bazal' ,zh_cn: '当前基础率' ,pl: 'Dawka podstawowa' } @@ -9891,6 +11080,7 @@ function init() { ,ko: '인슐린 민감도(ISF)' ,it: 'ISF - sensibilità' ,nl: 'Gevoeligheid' + ,tr: 'Duyarlılık Faktörü (ISF)' ,zh_cn: '胰岛素敏感系数' ,pl: 'Wrażliwość' } @@ -9912,6 +11102,7 @@ function init() { ,ko: '현재 탄수화물 비율(ICR)' ,it: 'Attuale rapporto I:C' ,nl: 'Huidige KH ratio' + ,tr: 'Geçerli Karbonhidrat oranı I/C (ICR)' ,zh_cn: '当前碳水化合物系数' ,pl: 'Obecny przelicznik węglowodanowy' } @@ -9923,7 +11114,7 @@ function init() { ,ro: 'Fus orar pentru bazală' ,es: 'Zona horaria basal' ,fr: 'Fuseau horaire' - ,ru: 'Временная зона базала' + ,ru: 'Часовой пояс базала' ,sk: 'Časová zóna pre bazál' ,sv: 'Basal tidszon' ,nb: 'Basal tidssone' @@ -9933,6 +11124,7 @@ function init() { ,ko: 'Basal 타임존' ,it: 'fuso orario basale' ,nl: 'Basaal tijdzone' + ,tr: 'Bazal saat dilimi' ,zh_cn: '基础率时区' ,pl: 'Strefa czasowa dawki podstawowej' } @@ -9954,6 +11146,7 @@ function init() { ,ko: '활성 프로파일' ,it: 'Attiva profilo' ,nl: 'Actief profiel' + ,tr: 'Aktif profil' ,zh_cn: '当前配置文件' ,pl: 'Profil aktywny' } @@ -9961,7 +11154,7 @@ function init() { cs:'Aktivní dočasný bazál' ,he: 'רמה בזלית זמנית פעילה ' ,de: 'Aktive temp. Basalrate' - ,dk: 'Aktiv tempbasal' + ,dk: 'Aktiv midlertidig basal' ,ro: 'Bazală temporară activă' ,fr: 'Débit basal temporaire actif' ,ru: 'Активный временный базал' @@ -9975,6 +11168,7 @@ function init() { ,ko: '활성 임시 basal' ,it: 'Attiva Basale Temp' ,nl: 'Actieve tijdelijke basaal' + ,tr: 'Aktif geçici bazal oranı' ,zh_cn: '当前临时基础率' ,pl: 'Aktywa tymczasowa dawka podstawowa' } @@ -9982,7 +11176,7 @@ function init() { cs:'Začátek dočasného bazálu' ,he: 'התחלה רמה בזלית זמנית ' ,de: 'Start aktive temp. Basalrate' - ,dk: 'Aktiv tempbasal start' + ,dk: 'Aktiv midlertidig basal start' ,ro: 'Start bazală temporară activă' ,fr: 'Début du débit basal temporaire' ,ru: 'Старт активного временного базала' @@ -9996,6 +11190,7 @@ function init() { ,ko: '활성 임시 basal 시작' ,it: 'Attiva Inizio Basale temp' ,nl: 'Actieve tijdelijke basaal start' + ,tr: 'Aktif geçici bazal oranı başlangıcı' ,zh_cn: '当前临时基础率开始' ,pl: 'Start aktywnej tymczasowej dawki podstawowej' } @@ -10003,7 +11198,7 @@ function init() { cs:'Trvání dočasného bazálu' ,he: 'משך רמה בזלית זמנית ' ,de: 'Dauer aktive temp. Basalrate' - ,dk: 'Aktiv tempbasal varighed' + ,dk: 'Aktiv midlertidig basal varighed' ,ro: 'Durata bazalei temporare active' ,fr: 'Durée du débit basal temporaire' ,ru: 'Длительность активного временного базала' @@ -10019,12 +11214,13 @@ function init() { ,nl: 'Actieve tijdelijk basaal duur' ,zh_cn: '当前临时基础率期间' ,pl: 'Czas trwania aktywnej tymczasowej dawki podstawowej' + ,tr: 'Aktif geçici bazal süresi' } ,'Active temp basal remaining' : { cs:'Zbývající dočasný bazál' ,he: 'זמן שנשאר ברמה בזלית זמנית ' ,de: 'Verbleibene Dauer temp. Basalrate' - ,dk: 'Resterende aktiv tempbasal' + ,dk: 'Resterende tid for aktiv midlertidig basal' ,ro: 'Rest de bazală temporară activă' ,fr: 'Durée restante de débit basal temporaire' ,ru: 'Остаток акивного временного базала' @@ -10040,6 +11236,7 @@ function init() { ,nl: 'Actieve tijdelijke basaal resteert' ,zh_cn: '当前临时基础率剩余' ,pl: 'Pozostała aktywna tymczasowa dawka podstawowa' + ,tr: 'Aktif geçici bazal kalan' } ,'Basal profile value' : { cs: 'Základní hodnota bazálu' @@ -10047,7 +11244,7 @@ function init() { ,de: 'Basal-Profil Wert' ,dk: 'Basalprofil værdi' ,ro: 'Valoarea profilului bazalei' - ,ru: 'Значение профайла базала' + ,ru: 'значение профиля базала' ,fr: 'Valeur du débit basal' ,sv: 'Basalprofil värde' ,es: 'Valor perfil Basal' @@ -10061,6 +11258,7 @@ function init() { ,nl: 'Basaal profiel waarde' ,zh_cn: '基础率配置文件值' ,pl: 'Wartość profilu podstawowego' + ,tr: 'Bazal profil değeri' } ,'Active combo bolus' : { cs:'Aktivní kombinovaný bolus' @@ -10082,6 +11280,7 @@ function init() { ,nl: 'Actieve combo bolus' ,zh_cn: '当前双波大剂量' ,pl: 'Aktywny bolus złożony' + ,tr: 'Aktive kombo bolus' } ,'Active combo bolus start' : { cs: 'Začátek kombinovaného bolusu' @@ -10103,6 +11302,7 @@ function init() { ,nl: 'Actieve combo bolus start' ,zh_cn: '当前双波大剂量开始' ,pl: 'Start aktywnego bolusa złożonego' + ,tr: 'Aktif gecikmeli bolus başlangıcı' } ,'Active combo bolus duration' : { cs: 'Trvání kombinovaného bolusu' @@ -10124,6 +11324,7 @@ function init() { ,nl: 'Actieve combo bolus duur' ,zh_cn: '当前双波大剂量期间' ,pl: 'Czas trwania aktywnego bolusa złożonego' + ,tr: 'Active combo bolus süresi' } ,'Active combo bolus remaining' : { cs: 'Zbývající kombinovaný bolus' @@ -10145,6 +11346,7 @@ function init() { ,nl: 'Actieve combo bolus resteert' ,zh_cn: '当前双波大剂量剩余' ,pl: 'Pozostały aktywny bolus złożony' + ,tr: 'Aktif kombo (yayım) bolus kaldı' } ,'BG Delta' : { cs:'Změna glykémie' @@ -10167,6 +11369,7 @@ function init() { ,zh_cn: '血糖增量' ,zh_tw: '血糖增量' ,pl: 'Zmiana glikemii' + ,tr: 'KŞ farkı' } ,'Elapsed Time' : { cs:'Dosažený čas' @@ -10189,6 +11392,7 @@ function init() { ,zh_cn: '所需时间' ,zh_tw: '所需時間' ,pl: 'Upłynął czas' + ,tr: 'Geçen zaman' } ,'Absolute Delta' : { cs:'Absolutní rozdíl' @@ -10211,6 +11415,7 @@ function init() { ,zh_cn: '绝对增量' ,zh_tw: '絕對增量' ,pl: 'różnica absolutna' + ,tr: 'Mutlak fark' } ,'Interpolated' : { cs:'Interpolováno' @@ -10233,6 +11438,7 @@ function init() { ,zh_cn: '插值' ,zh_tw: '插值' ,pl: 'Interpolowany' + ,tr: 'Aralıklı' } ,'BWP' : { // Bolus Wizard Preview cs: 'KALK' @@ -10255,6 +11461,7 @@ function init() { ,zh_cn: 'BWP' ,zh_tw: 'BWP' ,pl: 'Kalkulator bolusa' + ,tr: 'BWP' } ,'Urgent' : { cs:'Urgentní' @@ -10273,10 +11480,12 @@ function init() { ,bg: 'Спешно' ,ko: '긴급' ,it: 'Urgente' + ,ja: '緊急' ,nl: 'Urgent' ,zh_cn: '紧急' ,zh_tw: '緊急' ,pl:'Pilny' + ,tr: 'Acil' } ,'Warning' : { cs:'Varování' @@ -10299,6 +11508,7 @@ function init() { ,zh_cn: '警告' ,zh_tw: '警告' ,pl: 'Ostrzeżenie' + ,tr: 'Uyarı' } ,'Info' : { cs: 'Informativní' @@ -10321,6 +11531,7 @@ function init() { ,zh_cn: '信息' ,zh_tw: '資訊' ,pl: 'Informacja' + ,tr: 'Info' } ,'Lowest' : { cs: 'Nejnižší' @@ -10340,6 +11551,7 @@ function init() { ,ko: '가장 낮은' ,it: 'Minore' ,nl: 'Laagste' + ,tr: 'En düşük değer' ,zh_cn: '血糖极低' ,zh_tw: '血糖極低' ,pl: 'Niski' @@ -10348,7 +11560,7 @@ function init() { cs:'Vypínání alarmu vyskoké glykémie, protože je dostatek IOB' ,he: 'נודניק את ההתראה הגבוהה מפני שיש מספיק אינסולין פעיל בגוף' ,de: 'Ignoriere Alarm hoch, da genügend aktives Bolus-Insulin (IOB) vorhanden' - ,dk: 'Snoozer høj alarm siden der er nok aktiv insulin (IOB)' + ,dk: 'Udsætter høj alarm siden der er nok aktiv insulin (IOB)' ,ro: 'Ignoră alarma de hiper deoarece este suficientă insulină activă IOB' ,fr: 'Alarme haute ignorée car suffisamment d\'insuline à bord (IOB)' ,bg: 'Изключване на аларма за висока КЗ, тъй като има достатъчно IOB' @@ -10361,6 +11573,7 @@ function init() { ,sk: 'Odloženie alarmu vysokej glykémie, pretože je dostatok IOB' ,it: 'Addormenta allarme alto poiché non vi è sufficiente IOB' ,nl: 'Snooze hoog alarm, er is genoeg IOB' + ,tr: 'Yeterli IOB(Aktif İnsülin) olduğundan KŞ yüksek uyarımını ertele' ,zh_cn: '有足够的IOB（活性胰岛素），暂停高血糖警报' ,pl: 'Wycisz alarm wysokiej glikemi, jest wystarczająco dużo aktywnej insuliny' } @@ -10381,6 +11594,7 @@ function init() { ,sk: 'Skontrolovať glykémiu, čas na bolus?' ,it: 'Controllare BG, il tempo del bolo?' ,nl: 'Controleer BG, tijd om te bolussen?' + ,tr: 'KŞine bakın, gerekirse bolus verin?' ,zh_cn: '测量血糖，该输注大剂量了？' ,pl: 'Sprawdź glikemię, czas na bolusa ?' } @@ -10401,6 +11615,7 @@ function init() { ,pt: 'Nota' ,sk: 'Poznámka' ,it: 'Preavviso' + ,tr: 'Not' ,zh_cn: '提示' ,pl: 'Uwaga' } @@ -10421,6 +11636,7 @@ function init() { ,sk: 'chýbajúca informácia' ,it: 'richiesta informazioni mancanti' ,nl: 'vereiste gegevens ontbreken' + ,tr: 'gerekli bilgi eksik' ,zh_cn: '所需信息不全' ,pl: 'brak wymaganych informacji' } @@ -10441,6 +11657,7 @@ function init() { ,sk: 'Aktívny inzulín (IOB)' ,it: 'IOB - Insulina Attiva' ,nl: 'IOB - Inuline on board' + ,tr: '(IOB) Aktif İnsülin' ,zh_cn: '活性胰岛素（IOB）' ,pl: 'Aktywna insulina' } @@ -10461,6 +11678,7 @@ function init() { ,sk: 'Aktuálny cieľ' ,it: 'Obiettivo attuale' ,nl: 'huidig doel' + ,tr: 'Mevcut hedef' ,zh_cn: '当前目标' ,pl: 'Aktualny cel' } @@ -10481,6 +11699,7 @@ function init() { ,sk: 'Očakávaný efekt' ,it: 'Effetto Previsto' ,nl: 'verwacht effect' + ,tr: 'Beklenen etki' ,zh_cn: '预期效果' ,pl: 'Oczekiwany efekt' } @@ -10501,6 +11720,7 @@ function init() { ,sk: 'Očakávaný výsledok' ,it: 'Risultato previsto' ,nl: 'Veracht resultaat' + ,tr: 'Beklenen sonuç' ,zh_cn: '预期结果' ,pl: 'Oczekowany resultat' } @@ -10521,6 +11741,7 @@ function init() { ,pt: 'Equivalente em carboidratos' ,sk: 'Sacharidový ekvivalent' ,it: 'Carb equivalenti' + ,tr: 'Karbonhidrat eşdeğeri' ,zh_cn: '碳水当量' ,pl: 'Odpowiednik w węglowodanach' } @@ -10528,12 +11749,12 @@ function init() { cs:'Nadbytek inzulínu: o %1U více, než na dosažení spodní hranice cíle. Nepočítáno se sacharidy.' ,he: 'עודף אינסולין שווה ערך ליחידה אחת%1 יותר מאשר הצורך להגיע ליעד נמוך, לא לוקח בחשבון פחמימות ' ,de: 'Überschüssiges Insulin: %1U mehr als zum Erreichen der Untergrenze notwendig, Kohlenhydrate sind unberücksichtigt' - ,dk: 'Overskud af insulin modsvarande %1U mere end nødvændigt for at nå lav målværdi, kulhydrater ikke medregnet' + ,dk: 'Overskud af insulin modsvarende %1U mere end nødvendigt for at nå lav mål, kulhydrater ikke medregnet' ,es: 'Exceso de insulina en %1U más de lo necesario para alcanzar un objetivo bajo, sin tener en cuenta los carbohidratos' ,ro: 'Insulină în exces: %1U mai mult decât este necesar pentru a atinge ținta inferioară, fără a ține cont de carbohidrați' ,fr: 'Insuline en excès: %1U de plus que nécessaire pour atteindre la cible inférieure, sans prendre en compte les glucides' ,bg: 'Излишният инсулин %1U е повече от необходимия за достигане до долната граница, ВХ не се вземат под внимание' - ,ru: 'Избыток инсулина равного %1U, необходимого для достижения нижнего целевого значения, углеводы не будут учтены' + ,ru: 'Избыток инсулина равного %1U, необходимого для достижения нижнего целевого значения, углеводы не учитываются' ,sv: 'Överskott av insulin motsvarande %1U mer än nödvändigt för att nå lågt målvärde, kolhydrater ej medräknade' ,nb: 'Insulin tilsvarende %1U mer enn det trengs for å nå lavt mål, karbohydrater ikke medregnet' ,nl: 'Insulineoverschot van %1U om laag doel te behalen (excl. koolhydraten)' @@ -10542,6 +11763,7 @@ function init() { ,sk: 'Nadbytok inzulínu o %1U viac ako je potrebné na dosiahnutie spodnej cieľovej hranice. Neráta sa so sacharidmi.' ,it: 'L\'eccesso d\'insulina equivalente %1U più che necessari per raggiungere l\'obiettivo basso, non rappresentano i carboidrati.' ,nl: 'Overschot insuline %1U meer dan nodig om het laag doel te bereiken, geen rekening gehouden met KH' + ,tr: 'Fazla insülin: Karbonhidratları dikkate alınmadan, alt hedefe ulaşmak için gerekenden %1U\'den daha fazla' //??? ,zh_cn: '胰岛素超过至血糖下限目标所需剂量%1单位，不计算碳水化合物' , pl: 'Nadmiar insuliny, %1J więcej niż potrzeba, aby osiągnąć cel dolnej granicy, nie biorąc pod uwagę węglowodanów' } @@ -10549,7 +11771,7 @@ function init() { cs:'Nadbytek inzulínu: o %1U více, než na dosažení spodní hranice cíle. UJISTĚTE SE, ŽE JE TO POKRYTO SACHARIDY' ,he: 'עודף אינסולין %1 נדרש כדי להגיע למטרה התחתונה. שים לב כי עליך לכסות אינסולין בגוף על ידי פחמימות ' ,de: 'Überschüssiges Insulin: %1U mehr als zum Erreichen der Untergrenze notwendig. SICHERSTELLEN, DASS IOB DURCH KOHLENHYDRATE ABGEDECKT WIRD' - ,dk: 'Overskud af insulin modsvarande %1U mere end nødvændigt for at nå lav målværdi, VÆR SIKKER PÅ AT IOB ER DÆKKET IND AF KULHYDRATER' + ,dk: 'Overskud af insulin modsvarande %1U mere end nødvendigt for at nå lav målværdi, VÆR SIKKER PÅ AT IOB ER DÆKKET IND AF KULHYDRATER' ,ro: 'Insulină în exces: %1U mai mult decât este necesar pentru a atinge ținta inferioară, ASIGURAȚI-VĂ CĂ INSULINA ESTE ACOPERITĂ DE CARBOHIDRAȚI' ,fr: 'Insuline en excès: %1U de plus que nécessaire pour atteindre la cible inférieure, ASSUREZ UN APPORT SUFFISANT DE GLUCIDES' ,bg: 'Излишният инсулин %1U е повече от необходимия за достигане до долната граница, ПРОВЕРИ ДАЛИ IOB СЕ ПОКРИВА ОТ ВЪГЛЕХИДРАТИТЕ' @@ -10562,6 +11784,7 @@ function init() { ,pt: 'Excesso de insulina equivalente a %1U além do necessário para atingir a meta inferior. ASSEGURE-SE DE QUE A IOB ESTEJA COBERTA POR CARBOIDRATOS' ,sk: 'Nadbytok inzulínu o %1U viac ako je potrebné na dosiahnutie spodnej cieľovej hranice. UISTITE SA, ŽE JE TO POKRYTÉ SACHARIDMI' ,it: 'L\'eccesso d\'insulina equivalente %1U più che necessario per raggiungere l\'obiettivo basso, ASSICURARSI IOB SIA COPERTO DA CARBOIDRATI' + ,tr: 'Fazla insülin: Alt KŞ hedefine ulaşmak için gerekenden %1 daha fazla insülin.IOB(Aktif İnsülin) Karbonhidrat tarafından karşılandığından emin olun.' ,zh_cn: '胰岛素超过至血糖下限目标所需剂量%1单位，确认IOB（活性胰岛素）被碳水化合物覆盖' ,pl: 'Nadmiar insuliny: o %1J więcej niż potrzeba, aby osiągnąć cel dolnej granicy. UPEWNIJ SIĘ, ŻE AKTYWNA INSULINA JEST POKRYTA WĘGLOWODANAMI' } @@ -10569,7 +11792,7 @@ function init() { cs:'Nutné snížení aktivního inzulínu o %1U k dosažení spodního cíle. Příliž mnoho bazálu?' ,he: 'צריך %1 פחות אינסולין כדי להגיע לגבול התחתון. האם הרמה הבזלית גבוהה מדי? ' ,de: 'Aktives Insulin um %1U reduzieren, um Untergrenze zu erreichen. Basal zu hoch?' - ,dk: '%1U reduktion nødventid i aktiv insulin for at nå lav værdi, for meget basal?' + ,dk: '%1U reduktion nødvendig i aktiv insulin for at nå lav mål, for meget basal?' ,ro: '%1U sunt în plus ca insulină activă pentru a atinge ținta inferioară, bazala este prea mare?' ,fr: 'Réduction d\'insuline active nécessaire pour atteindre la cible inférieure. Débit basal trop élevé ?' ,bg: '%1U намаляне е необходимо в активния инсулин до достигане до долната граница, прекалено висок базал?' @@ -10582,6 +11805,7 @@ function init() { ,nl: '%1U reductie vereist in actieve insuline om laag doel te bereiken, teveel basaal?' ,sk: 'Nutné zníženie aktívneho inzulínu o %1U pre dosiahnutie spodnej cieľovej hranice. Príliš veľa bazálu?' ,it: 'Riduzione 1U% necessaria d\'insulina attiva per raggiungere l\'obiettivo basso, troppa basale?' + ,tr: 'Alt KŞ hedefi için %1U aktif insülin azaltılmalı, bazal oranı çok mu yüksek?' ,zh_cn: '活性胰岛素已可至血糖下限目标，需减少%1单位，基础率过高？' , pl: '%1J potrzebnej redukcji w aktywnej insulinie, aby osiągnąć niski cel dolnej granicy, Za duża dawka podstawowa ?' } @@ -10589,7 +11813,7 @@ function init() { cs:'úprava změnou bazálu není možná. Podat sacharidy?' ,he: 'השינוי ברמה הבזלית גדול מדי. תן פחמימות? ' ,de: 'Basalrate geht außerhalb des Zielbereiches. Kohlenhydrate nehmen?' - ,dk: 'basalændring uden for grænseværdi, gi kulhydrater?' + ,dk: 'basalændring uden for grænseværdi, giv kulhydrater?' ,ro: 'ajustarea bazalei duce în afara intervalului țintă. Suplimentați carbohirații?' ,fr: 'ajustement de débit basal hors de limites, prenez des glucides?' ,bg: 'Корекция на базала не е възможна, добавка на въглехидрати? ' @@ -10602,6 +11826,7 @@ function init() { ,sk: 'úprava pomocou zmeny bazálu nie je možná. Podať sacharidy?' ,it: 'regolazione basale fuori campo, dare carboidrati?' ,nl: 'basaal aanpassing buiten bereik, geef KH?' + ,tr: 'Bazal oran ayarlaması limit dışı, karbonhidrat alınsın mı?' ,zh_cn: '基础率调整在范围之外，需要碳水化合物？' ,pl: 'dawka podstawowa poza zakresem, podać węglowodany?' } @@ -10609,7 +11834,7 @@ function init() { cs:'úprava změnou bazálu není možná. Podat bolus?' ,he: 'השינוי ברמה הבזלית גדול מדי. תן אינסולין? ' ,de: 'Anpassung der Basalrate außerhalb des Zielbereichs. Bolus abgeben?' - ,dk: 'basalændring udenfor grænseværdi, gi bolus?' + ,dk: 'basalændring udenfor grænseværdi, giv bolus?' ,ro: 'ajustarea bazalei duce în afara intervalului țintă. Suplimentați insulina?' ,fr: 'ajustement de débit basal hors de limites, prenez un bolus?' ,bg: 'Корекция на базала не е възможна, добавка на болус? ' @@ -10622,6 +11847,7 @@ function init() { ,sk: 'úprava pomocou zmeny bazálu nie je možná. Podať bolus?' ,it: 'regolazione basale fuori campo, dare bolo?' ,nl: 'basaal aanpassing buiten bereik, bolus?' + ,tr: 'Bazal oran ayarlaması limit dışı, bolus alınsın mı?' ,zh_cn: '基础率调整在范围之外，需要大剂量？' ,pl: 'dawka podstawowa poza zakresem, podać insulinę?' } @@ -10629,7 +11855,7 @@ function init() { cs:'nad horním' ,he: 'מעל גבוה ' ,de: 'überhalb Obergrenze' - ,dk: 'over højt niveau' + ,dk: 'over højt grænse' ,ro: 'peste ținta superioară' ,fr: 'plus haut que la limite supérieure' ,ru: 'Выше верхнего' @@ -10642,6 +11868,7 @@ function init() { ,es: 'por encima límite superior' ,it: 'sopra alto' ,nl: 'boven hoog' + ,tr: 'üzerinde yüksek' ,zh_cn: '血糖过高' ,zh_tw: '血糖過高' ,pl: 'powyżej wysokiego' @@ -10650,7 +11877,7 @@ function init() { cs:'pod spodním' ,he: 'מתחת נמוך ' ,de: 'unterhalb Untergrenze' - ,dk: 'under lavt niveau' + ,dk: 'under lavt grænse' ,ro: 'sub ținta inferioară' ,fr: 'plus bas que la limite inférieure' ,bg: 'под долната' @@ -10663,6 +11890,7 @@ function init() { ,sk: 'pod spodným' ,it: 'sotto bassa' ,nl: 'onder laag' + ,tr: 'altında düşük' ,zh_cn: '血糖过低' ,zh_tw: '血糖過低' ,pl: 'poniżej niskiego' @@ -10684,6 +11912,7 @@ function init() { ,it: 'Proiezione BG %1 obiettivo' ,es: 'Glucemia estimada %1 en objetivo' ,nl: 'Verwachte BG %1 doel' + ,tr: 'Beklenen KŞ %1 hedefi' ,zh_cn: '预计血糖%1目标' ,pl: 'Oczekiwany poziom glikemii %1' } @@ -10704,6 +11933,7 @@ function init() { ,sk: 'cieľom' ,it: 'puntare a' ,nl: 'doel is' + ,tr: 'istenen sonuç' ,zh_cn: '目标在' ,pl: 'pożądany wynik' } @@ -10724,6 +11954,7 @@ function init() { ,sk: 'Bolus %1 jednotiek' ,it: 'Bolo %1 unità' ,nl: 'Bolus %1 eenheden' + ,tr: 'Bolus %1 Ünite' ,zh_cn: '大剂量%1单位' ,pl: 'Bolus %1 jednostek' } @@ -10744,6 +11975,7 @@ function init() { ,sk: 'alebo úprava bazálu' ,it: 'o regolare basale' ,nl: 'of pas basaal aan' + ,tr: 'ya da bazal ayarlama' ,zh_cn: '或调整基础率' ,pl: 'lub dostosuj dawkę bazową' } @@ -10751,7 +11983,7 @@ function init() { cs:'Před korekcí zkontrolujte glukometrem glykémii!' ,he: 'מדוד רמת סוכר בדם באמצעות מד סוכר לפני תיקון ' ,de: 'Überprüfe deinen BZ mit dem Messgerät, bevor du eine Korrektur vornimmst!' - ,dk: 'Kontrol blodsukker med fingerprikker før der korrigeres!' + ,dk: 'Kontrollere blodsukker med fingerprikker / blodsukkermåler før der korrigeres!' ,ro: 'Verifică glicemia cu glucometrul înainte de a face o corecție!' ,fr: 'Vérifier la glycémie avec un glucomètre avant de corriger!' ,bg: 'Провери КЗ с глюкомер, преди кореция!' @@ -10766,6 +11998,7 @@ function init() { ,nl: 'Controleer BG met bloeddruppel voor correctie!' ,zh_cn: '校正前请使用血糖仪测量血糖！' ,pl: 'Sprawdź glikemię z krwi przed podaniem korekty!' + ,tr: 'Düzeltme bolusu öncesi glikometreyle parmaktan KŞini kontrol edin!' } ,'Basal reduction to account %1 units:' : { cs:'Úprava bazálu pro náhradu bolusu %1 U ' @@ -10786,12 +12019,13 @@ function init() { ,nl: 'Basaal verlaagd voor %1 eenheden' ,zh_cn: '基础率减少到%1单位' ,pl: 'Dawka bazowa zredukowana do 1% J' + ,tr: '%1 birimi telafi etmek için azaltılmış Bazaloranı:' } ,'30m temp basal' : { cs:'30ti minutový dočasný bazál' ,he: 'שלושים דקות רמה בזלית זמנית ' ,de: '30min temporäres Basal' - ,dk: '30 minuters temporer basal' + ,dk: '30 minuters midlertidig basal' ,ro: 'bazală temporară de 30 minute' ,fr: 'débit basal temporaire de 30 min' ,bg: '30м временен базал' @@ -10806,12 +12040,13 @@ function init() { ,nl: '30 minuten tijdelijke basaal' ,zh_cn: '30分钟临时基础率' ,pl: '30 minut tymczasowej dawki bazowej' + ,tr: '30 dk. geçici Bazal ' } ,'1h temp basal' : { cs:'hodinový dočasný bazál' ,he: 'שעה רמה בזלית זמנית ' ,de: '1h temporäres Basal' - ,dk: '1t temporer basal' + ,dk: '60 minutters midlertidig basal' ,ro: 'bazală temporară de 1 oră' ,fr: 'débit basal temporaire de 1 heure' ,bg: '1 час временен базал' @@ -10826,16 +12061,17 @@ function init() { ,nl: '1 uur tijdelijke basaal' ,zh_cn: '1小时临时基础率' ,pl: '1 godzina tymczasowej dawki bazowej' + ,tr: '1 sa. geçici bazal' } ,'Cannula change overdue!' : { cs:'Čas na výměnu set vypršel!' ,he: 'יש צורך בהחלפת קנולה! ' ,de: 'Kanülenwechsel überfällig!' - ,dk: 'Infusionsset, skift overskredet' + ,dk: 'Tid for skift af Infusionssæt overskredet!' ,ro: 'Depășire termen schimbare canulă!' ,bg: 'Времето за смяна на сет просрочено' ,fr: 'Dépassement de date de changement de canule!' - ,ru: 'С' + ,ru: 'Срок работы катеттера истек' ,sv: 'Infusionsset, bytestid överskriden' ,nb: 'Byttetid for infusjonssett overskredet' ,fi: 'Kanyylin ikä yli määräajan!' @@ -10846,16 +12082,17 @@ function init() { ,nl: 'Cannule te oud!' ,zh_cn: '超过更换管路的时间' ,pl: 'Przekroczono czas wymiany wkłucia!' + ,tr: 'Kanül değişimi gecikmiş!' } ,'Time to change cannula' : { cs:'Čas na výměnu setu' ,he: 'הגיע הזמן להחליף קנולה ' ,de: 'Es ist Zeit, die Kanüle zu wechseln' - ,dk: 'Tid til at skifte infusionsset' + ,dk: 'Tid til at skifte infusionssæt' ,fr: 'Le moment est venu de changer de canule' ,ro: 'Este vremea să schimbați canula' ,bg: 'Време за смяна на сет' - ,ru: 'Пора заменить канюлю' + ,ru: 'Пора заменить катеттер' ,sv: 'Dags att byta infusionsset' ,nb: 'På tide å bytte infusjonssett' ,fi: 'Aika vaihtaa kanyyli' @@ -10866,16 +12103,17 @@ function init() { ,nl: 'Verwissel canule' ,zh_cn: '已到更换管路的时间' ,pl: 'Czas do wymiany wkłucia' + ,tr: 'Kanül değiştirme zamanı' } ,'Change cannula soon' : { cs:'Blíží se čas na výměnu setu' ,he: 'החלף קנולה בקרוב ' ,de: 'Kanüle bald wechseln' - ,dk: 'Skift infusionsset snart' + ,dk: 'Skift infusionssæt snart' ,ro: 'Schimbați canula în curând' ,fr: 'Changement de canule bientòt' ,bg: 'Смени сета скоро' - ,ru: 'Подходит время замены канюли' + ,ru: 'Подходит время замены катеттера' ,sv: 'Byt infusionsset snart' ,nb: 'Bytt infusjonssett snart' ,fi: 'Vaihda kanyyli pian' @@ -10885,16 +12123,17 @@ function init() { ,nl: 'Verwissel canule binnenkort' ,zh_cn: '接近更换管路的时间' ,pl: 'Wkrótce wymiana wkłucia' + ,tr: 'Yakında kanül değiştirin' } ,'Cannula age %1 hours' : { cs:'Stáří setu %1 hodin' ,he: 'כיל הקנולה %1 שעות ' ,de: 'Kanülen Alter %1 Stunden' - ,dk: 'Infusionsset tid %1 timer' + ,dk: 'Infusionssæt tid %1 timer' ,fr: 'âge de la canule %1 heures' ,ro: 'Vechimea canulei în ore: %1' ,bg: 'Сетът е на %1 часове' - ,ru: 'Возраст канюли %1 час' + ,ru: 'Возраст катеттера %1 час' ,sv: 'Infusionsset tid %1 timmar' ,nb: 'infusjonssett alder %1 timer' ,fi: 'Kanyylin ikä %1 tuntia' @@ -10905,12 +12144,13 @@ function init() { ,nl: 'Canule leeftijd %1 uren' ,zh_cn: '管路已使用%1小时' ,pl: 'Czas od wymiany wkłucia %1 godzin' + ,tr: 'Kanül yaşı %1 saat' } ,'Inserted' : { cs:'Nasazený' ,he: 'הוכנס ' ,de: 'Eingesetzt' - ,dk: 'Indsat' + ,dk: 'Isat' ,ro: 'Inserat' ,fr: 'Insérée' ,bg: 'Поставен' @@ -10926,17 +12166,18 @@ function init() { ,zh_cn: '已植入' ,zh_tw: '已植入' ,pl: 'Zamontowano' + ,tr: 'Yerleştirilmiş' } ,'CAGE' : { cs:'SET' ,he: 'גיל הקנולה ' ,de: 'CAGE' - ,dk: 'CAGE' + ,dk: 'Indstik alder' ,ro: 'VC' ,bg: 'ВС' ,fr: 'CAGE' - ,ru: 'ВКан' + ,ru: 'ВозрКат' ,sv: 'Nål' ,nb: 'Nål alder' ,fi: 'KIKÄ' @@ -10948,6 +12189,7 @@ function init() { ,zh_cn: '管路' ,zh_tw: '管路' ,pl: 'Wiek wkłucia' + ,tr: 'CAGE' } ,'COB' : { cs:'SACH' @@ -10959,7 +12201,7 @@ function init() { ,fr: 'COB' ,ru: 'Активн углеводы' ,sv: 'COB' - ,nb: 'Aktive katbohydrater' + ,nb: 'Aktive karbohydrater' ,fi: 'AH' ,pt: 'COB' ,es: 'Carbohidratos activos' @@ -10968,6 +12210,7 @@ function init() { ,nl: 'COB' ,zh_cn: '活性碳水COB' ,pl: 'Aktywne węglowodany' + ,tr: 'COB' } ,'Last Carbs' : { cs:'Poslední sacharidy' @@ -10988,6 +12231,7 @@ function init() { ,nl: 'Laatse KH' ,zh_cn: '上次碳水' ,pl: 'Ostatnie węglowodany' + ,tr: 'Son Karbonhidrat' } ,'IAGE' : { cs:'INZ' @@ -11009,18 +12253,19 @@ function init() { ,zh_cn: '胰岛素' ,zh_tw: '胰島素' ,pl: 'Wiek insuliny' + ,tr: 'IAGE' } ,'Insulin reservoir change overdue!' : { cs:'Čas na výměnu zásobníku vypršel!' ,he: 'החלף מאגר אינסולין! ' ,de: 'Ampullenwechsel überfällig!' - ,dk: 'Insulinbyttetid overskredet!' + ,dk: 'Tid for skift af insulinreservoir overskredet!' ,fr: 'Dépassement de date de changement de réservoir d\'insuline!' ,ro: 'Termenul de schimbare a rezervorului de insulină a fost depășit' ,bg: 'Смянатата на резервоара просрочена' - ,ru: 'Срок замены тубы инсулина истек' + ,ru: 'Срок замены резервуара инсулина истек' ,sv: 'Insulinbytestid överskriden' - ,nb: 'Insulinbytestid overskrevet' + ,nb: 'Insulinbyttetid overskrevet' ,fi: 'Insuliinisäiliö vanhempi kuin määräaika!' ,pt: 'Substituição de reservatório vencida!' ,es: 'Excedido plazo del cambio depósito de insulina!' @@ -11029,6 +12274,7 @@ function init() { ,nl: 'Verwissel insulinereservoir nu!' ,zh_cn: '超过更换胰岛素储液器的时间' ,pl: 'Przekroczono czas wymiany zbiornika na insulinę!' + ,tr: 'İnsülin rezervuarı değişimi gecikmiş!' } ,'Time to change insulin reservoir' : { cs:'Čas na výměnu zásobníku' @@ -11038,7 +12284,7 @@ function init() { ,ro: 'Este timpul pentru schimbarea rezervorului de insulină' ,fr: 'Le moment est venu de changer de réservoir d\'insuline' ,bg: 'Време е за смяна на резервоара' - ,ru: 'Наступил срок замены тубы инсулина' + ,ru: 'Наступил срок замены резервуара инсулина' ,sv: 'Dags att byta insulinreservoar' ,nb: 'På tide å bytte insulinreservoar' ,fi: 'Aika vaihtaa insuliinisäiliö' @@ -11049,6 +12295,7 @@ function init() { ,nl: 'Verwissel insuline reservoir' ,zh_cn: '已到更换胰岛素储液器的时间' ,pl: 'Czas do zmiany zbiornika na insulinę!' + ,tr: 'İnsülin rezervuarını değiştirme zamanı!' } ,'Change insulin reservoir soon' : { cs:'Blíží se čas na výměnu zásobníku' @@ -11058,7 +12305,7 @@ function init() { ,ro: 'Rezervorul de insulină trebuie schimbat în curând' ,fr: 'Changement de réservoir d\'insuline bientôt' ,bg: 'Смени резервоара скоро' - ,ru: 'Наступает срок замены тубы инсулина' + ,ru: 'Наступает срок замены резервуара инсулина' ,sv: 'Byt insulinreservoar snart' ,nb: 'Bytt insulinreservoar snart' ,fi: 'Vaihda insuliinisäiliö pian' @@ -11069,6 +12316,7 @@ function init() { ,nl: 'Verwissel insuline reservoir binnenkort' ,zh_cn: '接近更换胰岛素储液器的时间' ,pl: 'Wkrótce wymiana zbiornika na insulinę!' + ,tr: 'Yakında insülin rezervuarını değiştirin' } ,'Insulin reservoir age %1 hours' : { cs:'Stáří zásobníku %1 hodin' @@ -11089,6 +12337,7 @@ function init() { ,nl: 'Insuline reservoir leeftijd %1 uren' ,zh_cn: '胰岛素储液器已使用%1小时' ,pl: 'Wiek zbiornika na insulinę %1 godzin' + ,tr: 'İnsülin rezervuar yaşı %1 saat' } ,'Changed' : { cs:'Vyměněno' @@ -11109,6 +12358,7 @@ function init() { ,nl: 'veranderd' ,zh_cn: '已更换' ,pl: 'Wymieniono' + ,tr: 'Değişmiş' } ,'IOB' : { cs:'IOB' @@ -11116,7 +12366,7 @@ function init() { ,de: 'IOB' ,dk: 'IOB' ,ro: 'IOB' - ,ru: 'Активный Инсулин' + ,ru: 'Активный Инсулин IOB' ,fr: 'IOB' ,bg: 'АИ' ,sv: 'IOB' @@ -11129,6 +12379,7 @@ function init() { ,nl: 'IOB' ,zh_cn: '活性胰岛素IOB' ,pl: 'Aktywna insulina' + ,tr: 'IOB' } ,'Careportal IOB' : { cs:'IOB z ošetření' @@ -11149,6 +12400,7 @@ function init() { ,nl: 'Careportal IOB' ,zh_cn: '服务面板IOB（活性胰岛素）' ,pl: 'Aktywna insulina z portalu' + ,tr: 'Careportal IOB (Aktif İnsülin)' } ,'Last Bolus' : { cs:'Poslední bolus' @@ -11169,6 +12421,7 @@ function init() { ,nl: 'Laatste bolus' ,zh_cn: '上次大剂量' ,pl: 'Ostatni bolus' + ,tr: 'Son Bolus' } ,'Basal IOB' : { cs:'IOB z bazálů' @@ -11176,7 +12429,7 @@ function init() { ,de: 'Basal IOB' ,dk: 'Basal IOB' ,ro: 'IOB bazală' - ,ru: 'Активн Базал' + ,ru: 'Активн Базал IOB' ,fr: 'IOB du débit basal' ,bg: 'Базален АИ' ,sv: 'Basal IOB' @@ -11189,6 +12442,7 @@ function init() { ,nl: 'Basaal IOB' ,zh_cn: '基础率IOB（活性胰岛素）' ,pl: 'Aktywna insulina z dawki bazowej' + ,tr: 'Bazal IOB' } ,'Source' : { cs:'Zdroj' @@ -11209,12 +12463,13 @@ function init() { ,nl: 'bron' ,zh_cn: '来源' ,pl: 'Źródło' + ,tr: 'Kaynak' } ,'Stale data, check rig?' : { cs:'Zastaralá data, zkontrolovat mobil?' ,he: 'מידע ישן, בדוק את המערכת? ' ,de: 'Daten sind veraltet, Übertragungsgerät prüfen?' - ,dk: 'Gammel data, kontrol uploader?' + ,dk: 'Gammel data, kontrollere uploader?' ,ro: 'Date învechite, verificați uploaderul!' ,fr: 'Valeurs trop anciennes, vérifier l\'uploadeur' ,ru: 'Устаревшие данные, проверьте загрузчик' @@ -11229,6 +12484,7 @@ function init() { ,nl: 'Geen data, controleer uploader' ,zh_cn: '数据过期，检查一下设备？' , pl: 'Dane są nieaktualne, sprawdź urządzenie transmisyjne.' + ,tr: 'Veri güncel değil, vericiyi kontrol et?' } ,'Last received:' : { cs:'Naposledy přijato:' @@ -11249,6 +12505,7 @@ function init() { ,nl: 'laatste ontvangen' ,zh_cn: '上次接收：' ,pl: 'Ostatnio odebrane:' + ,tr: 'Son alınan:' } ,'%1m ago' : { cs:'%1m zpět' @@ -11269,6 +12526,7 @@ function init() { ,nl: '%1m geleden' ,zh_cn: '%1分钟前' ,pl: '%1 minut temu' + ,tr: '%1 dk. önce' } ,'%1h ago' : { cs:'%1h zpět' @@ -11289,6 +12547,7 @@ function init() { ,nl: '%1u geleden' ,zh_cn: '%1小时前' ,pl: '%1 godzin temu' + ,tr: '%1 sa. önce' } ,'%1d ago' : { cs:'%1d zpět' @@ -11309,6 +12568,7 @@ function init() { ,nl: '%1d geleden' ,zh_cn: '%1天前' ,pl: '%1 dni temu' + ,tr: '%1 gün önce' } ,'RETRO' : { cs:'RETRO' @@ -11329,6 +12589,7 @@ function init() { ,nl: 'RETRO' ,zh_cn: '历史数据' ,pl: 'RETRO' + ,tr: 'RETRO Geçmiş' } ,'SAGE' : { cs:'SENZ' @@ -11350,12 +12611,13 @@ function init() { ,zh_cn: '探头' ,zh_tw: '探頭' ,pl: 'Wiek sensora' + ,tr: 'SAGE' } ,'Sensor change/restart overdue!' : { cs:'Čas na výměnu senzoru vypršel!' ,he: 'שנה או אתחל את הסנסור! ' ,de: 'Sensorwechsel/-neustart überfällig!' - ,dk: 'Sensor bytte/genstart overskredet!' + ,dk: 'Sensor skift/genstart overskredet!' ,ro: 'Depășire termen schimbare/restart senzor!' ,fr: 'Changement/Redémarrage du senseur dépassé!' ,ru: 'Рестарт сенсора просрочен' @@ -11370,6 +12632,7 @@ function init() { ,nl: 'Sensor vevang/hertstart tijd gepasseerd' ,zh_cn: '超过更换/重启探头的时间' ,pl: 'Przekroczono czas wymiany/restartu sensora!' + ,tr: 'Sensör değişimi/yeniden başlatma gecikti!' } ,'Time to change/restart sensor' : { cs:'Čas na výměnu senzoru' @@ -11390,12 +12653,13 @@ function init() { ,nl: 'Sensor vervangen of herstarten' ,zh_cn: '已到更换/重启探头的时间' ,pl: 'Czas do wymiany/restartu sensora' + ,tr: 'Sensörü değiştirme/yeniden başlatma zamanı' } ,'Change/restart sensor soon' : { cs:'Blíží se čas na výměnu senzoru' ,he: 'שנה או אתחל את הסנסור בקרוב ' ,de: 'Sensor bald wechseln/neustarten' - ,dk: 'Byt/genstart sensor snart' + ,dk: 'Skift eller genstart sensor snart' ,ro: 'Schimbați/restartați senzorul în curând' ,fr: 'Changement/Redémarrage du senseur bientôt' ,ru: 'Приближается срок замены/рестарта сенсора' @@ -11410,6 +12674,7 @@ function init() { ,nl: 'Herstart of vervang sensor binnenkort' ,zh_cn: '接近更换/重启探头的时间' ,pl: 'Wkrótce czas wymiany/restartu sensora' + ,tr: 'Sensörü yakında değiştir/yeniden başlat' } ,'Sensor age %1 days %2 hours' : { cs:'Stáří senzoru %1 dní %2 hodin' @@ -11430,12 +12695,13 @@ function init() { ,nl: 'Sensor leeftijd %1 dag(en) en %2 uur' ,zh_cn: '探头使用了%1天%2小时' ,pl: 'Wiek sensora: %1 dni %2 godzin' + ,tr: 'Sensör yaşı %1 gün %2 saat' } ,'Sensor Insert' : { cs: 'Výměna sensoru' ,he: 'הכנס סנסור ' ,de: 'Sensor eingesetzt' - ,dk: 'Sensor indsæt' + ,dk: 'Sensor isat' ,ro: 'Inserția senzorului' ,fr: 'Insertion du senseur' ,ru: 'Установка сенсора' @@ -11450,12 +12716,13 @@ function init() { ,nl: 'Sensor ingebracht' ,zh_cn: '植入探头' ,pl: 'Zamontuj sensor' + ,tr: 'Sensor yerleştirme' } ,'Sensor Start' : { cs: 'Znovuspuštění sensoru' ,he: 'סנסור התחיל ' ,de: 'Sensorstart' - ,dk: 'Sensorstart' + ,dk: 'Sensor start' ,ro: 'Pornirea senzorului' ,ru: 'Запуск сенсора' ,fr: 'Démarrage du senseur' @@ -11470,6 +12737,7 @@ function init() { ,nl: 'Sensor start' ,zh_cn: '启动探头' ,pl: 'Uruchom sensor' + ,tr: 'Sensör başlatma' } ,'days' : { cs: 'dní' @@ -11490,12 +12758,13 @@ function init() { ,nl: 'dagen' ,zh_cn: '天' ,pl: 'dni' + ,tr: 'Gün' } ,'Insulin distribution' : { cs: 'Rozložení inzulínu' ,he: 'התפלגות אינסולין ' ,de: 'Insulinverteilung' - ,dk: 'Insulindistribution' + ,dk: 'Insulinfordeling' ,ro: 'Distribuția de insulină' ,fr: 'Distribution de l\'insuline' ,ru: 'распределение инсулина' @@ -11504,8 +12773,10 @@ function init() { ,it: 'Distribuzione di insulina' ,es: 'Distribución de la insulina' ,nl: 'Insuline verdeling' + ,zh_cn: '胰岛素分布' ,bg: 'разпределение на инсулина' ,pl: 'podawanie insuliny' + ,tr: 'İnsülin dağılımı' } ,'To see this report, press SHOW while in this view' : { cs: 'Pro zobrazení toho výkazu stiskněte Zobraz na této záložce' @@ -11519,9 +12790,11 @@ function init() { ,it: 'Per guardare questo report, premere SHOW all\'interno della finestra' ,es: 'Presione SHOW para mostrar el informe en esta vista' ,nl: 'Om dit rapport te zien, druk op "Laat zien"' + ,zh_cn: '要查看此报告，请在此视图中按生成' ,sv: 'För att se denna rapport, klicka på "Visa"' ,bg: 'За да видите тази статистика, натиснете ПОКАЖИ' , pl: 'Aby wyświetlić ten raport, naciśnij przycisk POKAŻ w tym widoku' + ,tr: 'Bu raporu görmek için bu görünümde GÖSTER düğmesine basın.' } ,'AR2 Forecast' : { cs: 'AR2 predikci' @@ -11535,9 +12808,11 @@ function init() { ,fi: 'AR2 Ennusteet' ,it: 'Previsione AR2' ,nl: 'AR2 Voorspelling' + ,zh_cn: 'AR2 预测' ,sv: 'AR2 Förutsägelse' ,bg: 'AR2 прогнози' ,pl: 'Prognoza AR2' + ,tr: 'AR2 Tahmini' } ,'OpenAPS Forecasts' : { cs: 'OpenAPS predikci' @@ -11551,9 +12826,11 @@ function init() { ,fi: 'OpenAPS Ennusteet' ,it: 'Previsione OpenAPS' ,nl: 'OpenAPS Voorspelling' + ,zh_cn: 'OpenAPS 预测' ,sv: 'OpenAPS Förutsägelse' ,bg: 'OpenAPS прогнози' ,pl: 'Prognoza OpenAPS' + ,tr: 'OpenAPS Tahminleri' } ,'Temporary Target' : { cs: 'Dočasný cíl glykémie' @@ -11567,9 +12844,11 @@ function init() { ,es: 'Objetivo temporal' ,it: 'Obbiettivo temporaneo' ,nl: 'Tijdelijk doel' + ,zh_cn: '临时目标' ,sv: 'Tillfälligt mål' ,bg: 'временна цел' ,pl: 'Cel tymczasowy' + ,tr: 'Geçici Hedef' } ,'Temporary Target Cancel' : { cs: 'Dočasný cíl glykémie konec' @@ -11583,9 +12862,11 @@ function init() { ,es: 'Objetivo temporal cancelado' ,it: 'Obbiettivo temporaneo cancellato' ,nl: 'Annuleer tijdelijk doel' + ,zh_cn: '临时目标取消' ,sv: 'Avsluta tillfälligt mål' ,bg: 'Отмяна на временна цел' ,pl: 'Zel tymczasowy anulowany' + ,tr: 'Geçici Hedef İptal' } ,'OpenAPS Offline' : { cs: 'OpenAPS vypnuto' @@ -11599,9 +12880,11 @@ function init() { ,it: 'OpenAPS disconnesso' ,es: 'OpenAPS desconectado' ,nl: 'OpenAPS Offline' + ,zh_cn: 'OpenAPS 离线' ,sv: 'OpenAPS Offline' ,bg: 'OpenAPS спрян' ,pl: 'OpenAPS nieaktywny' + ,tr: 'OpenAPS Offline (çevrimdışı)' } ,'Profiles' : { cs: 'Profily' @@ -11615,9 +12898,11 @@ function init() { ,it: 'Profili' ,es: 'Perfil' ,nl: 'Profielen' + ,zh_cn: '配置文件' ,sv: 'Profiler' ,bg: 'Профили' ,pl: 'Profile' + ,tr: 'Profiller' } ,'Time in fluctuation' : { cs: 'Doba měnící se glykémie' @@ -11629,11 +12914,13 @@ function init() { ,es: 'Tiempo fluctuando' ,ru: 'время флуктуаций' ,nl: 'Tijd met fluctuaties' + ,zh_cn: '波动时间' ,sv: 'Tid i fluktation' ,de: 'Zeit in Fluktuation (Schwankung)' ,dk: 'Tid i fluktation' ,bg: 'Време в промяна' ,pl: 'Czas fluaktacji (odchyleń)' + ,tr: 'Dalgalanmada geçen süre' } ,'Time in rapid fluctuation' : { cs: 'Doba rychle se měnící glykémie' @@ -11645,11 +12932,13 @@ function init() { ,es: 'Tiempo fluctuando rápido' ,ru: 'время быстрых флуктуаций' ,nl: 'Tijd met grote fluctuaties' + ,zh_cn: '快速波动时间' ,sv: 'Tid i snabb fluktation' ,de: 'Zeit in starker Fluktuation (Schwankung)' ,dk: 'Tid i hurtig fluktation' ,bg: 'Време в бърза промяна' ,pl: 'Czas szybkich fluaktacji (odchyleń)' + ,tr: 'Hızlı dalgalanmalarda geçen süre' } ,'This is only a rough estimation that can be very inaccurate and does not replace actual blood testing. The formula used is taken from:' : { cs: 'Toto je pouze hrubý odhad, který může být nepřesný a nenahrazuje kontrolu z krve. Vzorec je převzatý z:' @@ -11660,12 +12949,14 @@ function init() { ,ro: 'Aceasta este doar o aproximare brută, care poate fi foarte imprecisă și nu ține loc de testare capilară. Formula matematică folosită este luată din:' ,es: 'Esto es sólo una estimación apróximada que puede ser muy inexacta y no reemplaza las pruebas de sangre reales. La fórmula utilizada está tomada de: ' ,ru: 'Это приблизительная оценка не заменяющая фактический анализ крови. Используемая формула взята из:' + ,zh_cn: '这只是一个粗略的估计，可能非常不准确，并不能取代测指血' ,nl: 'Dit is enkel een grove schatting die onjuist kan zijn welke geen bloedtest vervangt. De gebruikte formule is afkomstig van:' ,sv: 'Detta är en grov uppskattning som kan vara missvisande. Det ersätter inte blodprov. Formeln är hämtad från:' ,de: 'Dies ist lediglich eine grobe Schätzung, die sehr ungenau sein kann und eine Überprüfung des tatsächlichen Blutzuckers nicht ersetzen kann. Die verwendete Formel wurde genommen von:' ,dk: 'Dette er kun en grov estimering som kan være misvisende. Det erstatter ikke en blodprøve. Formelen er hemtet fra:' ,bg: 'Това е само грубо изчисление, което може да е много неточно и не изключва реалния кръвен тест. Формулата, кокято е използвана е взета от:' ,pl: 'To tylko przybliżona ocena, która może być bardzo niedokładna i nie może zastąpić faktycznego poziomu cukru we krwi. Zastosowano formułę:' + ,tr: 'Bu bir kaba tahmindir ve çok hata içerebilir gerçek kan şekeri testlerinin yerini tutmayacaktır. Kullanılan formülde buradandır:' } , 'Filter by hours' : { cs: ' Filtr podle hodin' @@ -11676,11 +12967,13 @@ function init() { ,es: 'Filtrar por horas' ,ru: 'почасовой фильтр' ,nl: 'Filter op uren' + ,zh_cn: '按小时过滤' ,sv: 'Filtrera per timme' ,de: 'Filtern nach Stunden' ,dk: 'Filtrer per time' ,bg: 'Филтър по часове' ,pl: 'Filtruj po godzinach' + ,tr: 'Saatlere göre filtrele' } , 'Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.' : { cs: 'Doba měnící se glykémie a rapidně se měnící glykémie měří % času ve zkoumaném období, během kterého se glykémie měnila relativně rychle nebo rapidně. Nižší hodnota je lepší.' @@ -11691,11 +12984,13 @@ function init() { ,es: 'Tiempo en fluctuación y Tiempo en fluctuación rápida miden el % de tiempo del período exáminado, durante la cual la glucosa en sangre ha estado cambiando relativamente rápido o rápidamente. Valores más bajos son mejores.' ,ru: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней' ,nl: 'Tijd met fluctuaties of grote fluctuaties in % van de geevalueerde periode, waarbij de bloed glucose relatief snel wijzigde.Lagere waarden zijn beter.' + ,zh_cn: '在检查期间血糖波动时间和快速波动时间占的时间百分比，在此期间血糖相对快速或快速地变化。百分比值越低越好。' ,sv: 'Tid i fluktuation och tid i snabb fluktuation mäter% av tiden under den undersökta perioden, under vilken blodsockret har förändrats relativt snabbt eller snabbt. Lägre värden är bättre' ,de: 'Zeit in Fluktuation und Zeit in starker Fluktuation messen den Teil der Zeit, in der sich der Blutzuckerwert relativ oder sehr schnell verändert hat. Niedrigere Werte sind besser.' ,dk: 'Tid i fluktuation og tid i hurtig fluktuation måler % af tiden i den undersøgte periode, under vilket blodsukkret har ændret sig relativt hurtigt. Lavere værdier er bedre.' ,bg: 'Време в промяна и време в бърза промяна измерват % от време в разгледания период, през който КЗ са се променяли бързо или много бързо. По-ниски стойности са по-добри.' ,pl: 'Czas fluktuacji i szybki czas fluktuacji mierzą % czasu w badanym okresie, w którym poziom glukozy we krwi zmieniał się szybko lub bardzo szybko. Preferowane są wolniejsze zmiany' + ,tr: 'Dalgalanmadaki zaman ve Hızlı dalgalanmadaki zaman, kan şekerinin nispeten hızlı veya çok hızlı bir şekilde değiştiği, incelenen dönemdeki zamanın %\'sini ölçer. Düşük değerler daha iyidir.' } , 'Mean Total Daily Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of days. Lower is better.' : { cs: 'Průměrná celková denní změna je součet absolutních hodnoty všech glykémií za sledované období, děleno počtem dní. Nižší hodnota je lepší.' @@ -11706,11 +13001,13 @@ function init() { ,ru: 'усредненное ежедневное изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество дней. Меньшая величина предпочтительней' ,es: 'El cambio medio diario total es la suma de los valores absolutos de todas las glucémias en el período examinado, dividido por el número de días. Mejor valores bajos.' ,nl: 'Gemiddelde veranderingen per dag is een som van alle waardes die uitschieten over de bekeken periode, gedeeld door het aantal dagen in deze periode. Lager is beter.' + ,zh_cn: '平均每日总变化是检查期间所有血糖偏移的绝对值之和除以天数。越低越好' ,sv: 'Medel Total Daglig Förändring är summan av absolutvärdet av alla glukosförändringar under den undersökta perioden, dividerat med antalet dagar. Lägre är bättre.' ,de: 'Die gesamte mittlere Änderung pro Tag ist die Summe der absoluten Werte aller Glukoseveränderungen im Betrachtungszeitraum geteilt durch die Anzahl der Tage. Niedrigere Werte sind besser.' ,dk: 'Middel Total Daglig Ændring er summen af absolutværdier af alla glukoseændringer i den undersøgte periode, divideret med antallet af dage. Lavere er bedre.' ,bg: 'Средната дневна промяна е сумата на всички промени в стойностите на КЗ за разгледания период, разделена на броя дни в периода. По-ниската стойност е по-добра' ,pl: 'Sednia całkowita dziennych zmian jest sumą wszystkich zmian glikemii w badanym okresie, podzielonym przez liczbę dni. Mniejsze są lepsze' + ,tr: 'Toplam Günlük Değişim, incelenen süre için, gün sayısına bölünen tüm glukoz değerlerinin mutlak değerinin toplamıdır. Düşük değer daha iyidir.' } , 'Mean Hourly Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of hours in the period. Lower is better.' : { cs: 'Průměrná hodinová změna je součet absolutní hodnoty všech glykémií za sledované období, dělených počtem hodin v daném období. Nižší hodnota je lepší.' @@ -11721,27 +13018,49 @@ function init() { ,ru: 'усредненное часовое изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество часов в этот период. Более низкое предпочтительней' ,es: 'El cambio medio por hora, es la suma del valor absoluto de todas las glucemias para el período examinado, dividido por el número de horas en el período. Más bajo es mejor.' ,nl: 'Gemiddelde veranderingen per uur is een som van alle waardes die uitschieten over de bekeken periode, gedeeld door het aantal uur in deze periode. Lager is beter.' + ,zh_cn: '平均每小时变化是检查期间所有血糖偏移的绝对值之和除以该期间的小时数。 越低越好' ,sv: 'Medelvärde per timme är summan av absolutvärdet av alla glukosförändringar under den undersökta perioden dividerat med antalet timmar under perioden. Lägre är bättre.' ,de: 'Die mittlere Änderung pro Stunde ist die Summe der absoluten Werte aller Glukoseveränderungen im Betrachtungszeitraum geteilt durch die Anzahl der Stunden. Niedrigere Werte sind besser.' ,dk: 'Middelværdier per time er summen af absolutværdier fra alle glukoseændringer i den undersøgte periode divideret med antallet af timer. Lavere er bedre.' ,bg: 'Средната промяна за час е сумата на всички промени в стойностите на КЗ за разгледания период, разделена на броя часове в периода. По-ниската стойност е по-добра' ,pl: 'Sednia całkowita godzinnych zmian jest sumą wszystkich zmian glikemii w badanym okresie, podzielonym przez liczbę godzin. Mniejsze są lepsze' - } - , 'GVI and PGS are measures developed by Dexcom, detailed here.' : { - cs: 'GVI a PGS jsou měření vyvinutá společností Dexcom, podrobněji zde.' - ,he: 'GVI and PGS are measures developed by Dexcom, detailed here. ' - ,fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää täällä..' - ,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate qui.' - ,es: 'Variabilidad de la glucosa en sangre y el estado glucémico del paciente es un valor diseñado por Dexcom, más detalles en here.' - ,fr: 'GVI et PGS sont des mesures développées par la firme Dexcom, présentées en détail ici.' - ,ro: 'GVI și PGS sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți aici.' - ,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее here.' - ,nl: 'GVI en PGS zijn maten ontworpen door Dexcom, gedetaillieerde info here.' - ,sv: 'GVI och PGS är värden utvecklade av Dexcom, detaljer här.' - ,de: 'GVI und PGS sind von Dexcom entwickelte Werte. Details hier.' - ,dk: 'GVI og PGS er værdier udviklet af Dexcom, detaljer her.' - ,bg: 'GVI и PGS са параметри разработени от Декском, повече детайли тук.' - ,pl: 'GVI i PGS są pomiarami opracowanymi przez Dexcom, szczegóły tutaj.' + ,tr: 'Saat başına ortalama değişim, gözlem periyodu üzerindeki tüm glikoz değişikliklerinin mutlak değerlerinin saat sayısına bölünmesiyle elde edilen toplam değerdir. Düşük değerler daha iyidir.' + } + , 'GVI (Glycemic Variability Index) and PGS (Patient Glycemic Status) are measures developed by Dexcom, detailed can be found here.' : { + cs: '">zde.' + ,he: '">here.' + ,fi: '">here.' + ,it: '">qui.' + ,es: '">here.' + ,fr: '">ici.' + ,ro: '">aici.' + ,ru: '">here.' + ,nl: '">is hier te vinden.' + ,zh_cn: '">here.' + ,sv: '">här.' + ,de: '">hier.' + ,dk: '">her.' + ,bg: '">тук.' + ,pl: '">tutaj.' + ,tr: '">buradan.' } , 'Mean Total Daily Change' : { cs: 'Průměrná celková denní změna' @@ -11753,11 +13072,13 @@ function init() { ,ru: 'усредненное изменение за день' ,es: 'Variación media total diaria' ,nl: 'Gemiddelde veranderingen per dag' + ,zh_cn: '平均每日总变化' ,sv: 'Medel Total Daglig Förändring' ,de: 'Gesamte mittlere Änderung pro Tag' ,dk: 'Middel Total Daglig Ændring' ,bg: 'Средна промяна за ден' ,pl: 'Średnia całkowita dziennych zmian' + ,tr: 'Günde toplam ortalama değişim' } , 'Mean Hourly Change' : { cs: 'Průměrná hodinová změna' @@ -11769,11 +13090,13 @@ function init() { ,es: 'Variación media total por horas' ,ru: 'усредненное изменение за час' ,nl: 'Gemiddelde veranderingen per uur' + ,zh_cn: '平均每小时变化' ,sv: 'Medelvärde per timme' ,de: 'Mittlere Änderung pro Stunde' ,dk: 'Middelværdier per time' ,bg: 'Средна промяна за час' ,pl: 'Średnia całkowita godzinnych zmian' + ,tr: 'Saatte ortalama değişim' } , 'FortyFiveDown': { bg: 'slightly dropping' @@ -11789,7 +13112,7 @@ function init() { , hr: 'slightly dropping' , it: 'leggera diminuzione' , ko: 'slightly dropping' - , nb: 'slightly dropping' + , nb: 'svakt fallende' , pl: 'niewielki spadek' , pt: 'slightly dropping' , ro: 'scădere ușoară' @@ -11797,14 +13120,15 @@ function init() { , sk: 'slightly dropping' , sv: 'slightly dropping' , nl: 'slightly dropping' - , zh_cn: 'slightly dropping' + , tr: 'biraz düşen' + , zh_cn: '缓慢下降' , zh_tw: 'slightly dropping' }, 'FortyFiveUp': { bg: 'slightly rising' , cs: 'lehce nahoru' - , de: 'leicht fallend' + , de: 'leicht steigend' , dk: 'svagt stigende' , el: 'slightly rising' , en: 'slightly rising' @@ -11815,7 +13139,7 @@ function init() { , hr: 'slightly rising' , it: 'leggero aumento' , ko: 'slightly rising' - , nb: 'slightly rising' + , nb: 'svakt stigende' , pl: 'niewielki wzrost' , pt: 'slightly rising' , ro: 'creștere ușoară' @@ -11823,7 +13147,8 @@ function init() { , sk: 'slightly rising' , sv: 'slightly rising' , nl: 'slightly rising' - , zh_cn: 'slightly rising' + , tr: 'biraz yükselen' + , zh_cn: '缓慢上升' , zh_tw: 'slightly rising' }, 'Flat': { @@ -11840,7 +13165,7 @@ function init() { , hr: 'holding' , it: 'stabile' , ko: 'holding' - , nb: 'holding' + , nb: 'stabilt' , pl: 'stabilny' , pt: 'holding' , ro: 'stabil' @@ -11848,7 +13173,8 @@ function init() { , sk: 'holding' , sv: 'holding' , nl: 'holding' - , zh_cn: 'holding' + , tr: 'sabit' + , zh_cn: '平' , zh_tw: 'holding' }, 'SingleUp': { @@ -11865,7 +13191,7 @@ function init() { , hr: 'rising' , it: 'aumento' , ko: 'rising' - , nb: 'rising' + , nb: 'stigende' , pl: 'wzrost' , pt: 'rising' , ro: 'creștere' @@ -11873,7 +13199,8 @@ function init() { , sk: 'rising' , sv: 'rising' , nl: 'rising' - , zh_cn: 'rising' + , tr: 'yükseliyor' + , zh_cn: '上升' , zh_tw: 'rising' }, 'SingleDown': { @@ -11890,7 +13217,7 @@ function init() { , hr: 'dropping' , it: 'diminuzione' , ko: 'dropping' - , nb: 'dropping' + , nb: 'fallende' , pl: 'spada' , pt: 'dropping' , ro: 'scădere' @@ -11898,7 +13225,8 @@ function init() { , sk: 'dropping' , sv: 'dropping' , nl: 'dropping' - , zh_cn: 'dropping' + , tr: 'düşüyor' + , zh_cn: '下降' , zh_tw: 'dropping' }, 'DoubleDown': { @@ -11915,7 +13243,7 @@ function init() { , hr: 'rapidly dropping' , it: 'rapida diminuzione' , ko: 'rapidly dropping' - , nb: 'rapidly dropping' + , nb: 'hurtig stigende' , pl: 'szybko spada' , pt: 'rapidly dropping' , ro: 'scădere bruscă' @@ -11923,7 +13251,8 @@ function init() { , sk: 'rapidly dropping' , sv: 'rapidly dropping' , nl: 'rapidly dropping' - , zh_cn: 'rapidly dropping' + , tr: 'hızlı düşen' + , zh_cn: '快速下降' , zh_tw: 'rapidly dropping' }, 'DoubleUp': { @@ -11940,15 +13269,16 @@ function init() { , hr: 'rapidly rising' , it: 'rapido aumento' , ko: 'rapidly rising' - , nb: 'rapidly rising' + , nb: 'hurtig fallende' , pl: 'szybko rośnie' , pt: 'rapidly rising' , ro: 'creștere rapidă' - , ru: 'быстро растет' + , ru: 'быстрый рост' , sk: 'rapidly rising' , sv: 'rapidly rising' , nl: 'rapidly rising' - , zh_cn: 'rapidly rising' + , tr: 'hızla yükselen' + , zh_cn: '快速上升' , zh_tw: 'rapidly rising' }, 'alexaStatus': { @@ -11973,7 +13303,8 @@ function init() { , ru: '%1 и %2 начиная с %3.' , sk: '%1 and %2 as of %3.' , sv: '%1 and %2 as of %3.' - , zh_cn: '%1 and %2 as of %3.' + , tr: '%1 ve %2 e kadar %3.' + , zh_cn: '%1 和 %2 到 %3.' , zh_tw: '%1 and %2 as of %3.' }, 'alexaBasal': { @@ -11998,7 +13329,8 @@ function init() { , sk: '%1 current basal is %2 units per hour' , sv: '%1 current basal is %2 units per hour' , nl: '%1 current basal is %2 units per hour' - , zh_cn: '%1 current basal is %2 units per hour' + , tr: '%1 geçerli bazal oranı saatte %2 ünite' + , zh_cn: '%1 当前基础率是 %2 U/小时' , zh_tw: '%1 current basal is %2 units per hour' }, 'alexaBasalTemp': { @@ -12023,7 +13355,8 @@ function init() { , sk: '%1 temp basal of %2 units per hour will end %3' , sv: '%1 temp basal of %2 units per hour will end %3' , nl: '%1 temp basal of %2 units per hour will end %3' - , zh_cn: '%1 temp basal of %2 units per hour will end %3' + , tr: '%1 geçici bazal %2 ünite %3 sona eriyor' + , zh_cn: '%1 临时基础率 %2 U/小时将会在 %3结束' , zh_tw: '%1 temp basal of %2 units per hour will end %3' }, 'alexaIob': { @@ -12048,7 +13381,8 @@ function init() { , sk: 'and you have %1 insulin on board.' , sv: 'and you have %1 insulin on board.' , nl: 'and you have %1 insulin on board.' - , zh_cn: 'and you have %1 insulin on board.' + , tr: 've Sizde %1 aktif insulin var' + , zh_cn: '并且你有 %1 的活性胰岛素.' , zh_tw: 'and you have %1 insulin on board.' }, 'alexaIobIntent': { @@ -12073,7 +13407,8 @@ function init() { , sk: 'You have %1 insulin on board' , sv: 'You have %1 insulin on board' , nl: 'You have %1 insulin on board' - , zh_cn: 'You have %1 insulin on board' + , tr: 'Sizde %1 aktif insülin var' + , zh_cn: '你有 %1 的活性胰岛素' , zh_tw: 'You have %1 insulin on board' }, 'alexaIobUnits': { @@ -12098,7 +13433,8 @@ function init() { , ru: '%1 единиц' , sk: '%1 units of' , sv: '%1 units of' - , zh_cn: '%1 units of' + , tr: 'hala %1 birim' + , zh_cn: '%1 单位' , zh_tw: '%1 units of' }, 'alexaPreamble': { @@ -12123,7 +13459,8 @@ function init() { , ru: 'ваш' , sk: 'Your' , sv: 'Your' - , zh_cn: 'Your' + , tr: 'Senin' + , zh_cn: '你的' , zh_tw: 'Your' }, 'alexaPreamble3person': { @@ -12148,7 +13485,8 @@ function init() { , ru: '%1 имеет ' , sk: '%1 has a ' , sv: '%1 has a ' - , zh_cn: '%1 has a ' + , tr: '%1 bir tane var' + , zh_cn: '%1 有一个 ' , zh_tw: '%1 has a ' }, 'alexaNoInsulin': { @@ -12173,7 +13511,8 @@ function init() { , ru: 'нет' , sk: 'no' , sv: 'no' - , zh_cn: 'no' + , tr: 'yok' + , zh_cn: '否' , zh_tw: 'no' }, 'alexaUploadBattery': { @@ -12183,10 +13522,13 @@ function init() { , de: 'Der Akku deines Uploader Handys ist bei %1' , dk: 'Din uploaders batteri er %1' , nl: 'De batterij van je mobiel is bij %l' + ,zh_cn: '你的手机电池电量是 %1 ' , sv: 'Din uppladdares batteri är %1' , fi: 'Lähettimen paristoa jäljellä %1' , ro: 'Bateria uploaderului este la %1' , pl: 'Twoja bateria ma %1' + , ru: 'батарея загрузчика %1' + , tr: 'Yükleyici piliniz %1' }, 'alexaReservoir': { bg: 'You have %1 units remaining' @@ -12195,10 +13537,13 @@ function init() { , de: 'Du hast %1 Einheiten übrig' , dk: 'Du har %1 enheder tilbage' , nl: 'Je hebt nog %l eenheden in je reservoir' + ,zh_cn: '你剩余%1 U的胰岛素' , sv: 'Du har %1 enheter kvar' , fi: '%1 yksikköä insuliinia jäljellä' , ro: 'Mai aveți %1 unități rămase' , pl: 'W zbiorniku pozostało %1 jednostek' + , ru: 'остается %1 ед' + , tr: '%1 birim kaldı' }, 'alexaPumpBattery': { bg: 'Your pump battery is at %1 %2' @@ -12207,10 +13552,13 @@ function init() { , de: 'Der Batteriestand deiner Pumpe ist bei %1 %2' , dk: 'Din pumpes batteri er %1 %2' , nl: 'Je pomp batterij is bij %1 %2' + ,zh_cn: '你的泵电池电量是%1 %2' , sv: 'Din pumps batteri är %1 %2' , fi: 'Pumppu on %1 %2' , ro: 'Bateria pompei este la %1 %2' , pl: 'Bateria pompy jest w %1 %2' + , ru: 'батарея помпы %1 %2' + , tr: 'Pompa piliniz %1 %2' }, 'alexaLastLoop': { bg: 'The last successful loop was %1' @@ -12219,10 +13567,13 @@ function init() { , de: 'Der letzte erfolgreiche Loop war %1' , dk: 'Seneste successfulde loop var %1' , nl: 'De meest recente goede loop was %1' + ,zh_cn: '最后一次成功闭环的是在%1' , sv: 'Senaste lyckade loop var %1' , fi: 'Viimeisin onnistunut loop oli %1' , ro: 'Ultima decizie loop implementată cu succes a fost %1' , pl: 'Ostatnia pomyślna pętla była %1' + , ru: 'недавний успешный цикл был %1' + , tr: 'Son başarılı döngü %1 oldu' }, 'alexaLoopNotAvailable': { bg: 'Loop plugin does not seem to be enabled' @@ -12231,10 +13582,13 @@ function init() { , de: 'Das Loop Plugin scheint nicht aktiviert zu sein' , dk: 'Loop plugin lader ikke til at være slået til' , nl: 'De Loop plugin is niet geactiveerd' + ,zh_cn: 'Loop插件看起来没有被启用' , sv: 'Loop plugin verkar inte vara aktiverad' , fi: 'Loop plugin ei ole aktivoitu' , ro: 'Extensia loop pare a fi dezactivată' , pl: 'Plugin Loop prawdopodobnie nie jest włączona' + , ru: 'плагин ЗЦ Loop не активирован ' + , tr: 'Döngü eklentisi etkin görünmüyor' }, 'alexaLoopForecast': { bg: 'According to the loop forecast you are expected to be %1 over the next %2' @@ -12243,10 +13597,13 @@ function init() { , de: 'Entsprechend der Loop Vorhersage landest du bei %1 während der nächsten %2' , dk: 'Ifølge Loops forudsigelse forventes du at blive %1 i den næste %2' , nl: 'Volgens de Loop voorspelling is je waarde %1 over de volgnede %2' + ,zh_cn: '根据loop的预测，在接下来的%2你的血糖将会是%1' , sv: 'Enligt Loops förutsägelse förväntas du bli %1 inom %2' , fi: 'Ennusteen mukaan olet %1 seuraavan %2 ajan' , ro: 'Potrivit previziunii date de loop se estiemază %1 pentru următoarele %2' , pl: 'Zgodnie z prognozą pętli, glikemia %1 będzie podczas następnego %2' + , ru: 'по прогнозу алгоритма ЗЦ ожидается $1 за последующие %2' + , tr: 'Döngü tahminine göre sonraki %2 ye göre %1 olması bekleniyor' }, 'alexaForecastUnavailable': { bg: 'Unable to forecast with the data that is available' @@ -12255,10 +13612,13 @@ function init() { , de: 'Mit den verfügbaren Daten ist eine Loop Vorhersage nicht möglich' , dk: 'Det er ikke muligt at forudsige md de tilgængelige data' , nl: 'Niet mogelijk om een voorspelling te doen met de data die beschikbaar is' + ,zh_cn: '血糖数据不可用，无法预测未来走势' , sv: 'Förutsägelse ej möjlig med tillgänlig data' , fi: 'Ennusteet eivät ole toiminnassa puuttuvan tiedon vuoksi' , ro: 'Estimarea este imposibilă pe baza datelor disponibile' , pl: 'Prognoza pętli nie jest możliwa, z dostępnymi danymi.' + , ru: 'прогноз при таких данных невозможен' + , tr: 'Mevcut verilerle tahmin edilemedi' }, 'alexaRawBG': { en: 'Your raw bg is %1' @@ -12266,11 +13626,14 @@ function init() { , de: 'Dein Rohblutzucker ist %1' , dk: 'Dit raw blodsukker er %1' , nl: 'Je raw bloedwaarde is %1' + ,zh_cn: '你的血糖是 %1' , sv: 'Ditt raw blodsocker är %1' , fi: 'Suodattamaton verensokeriarvo on %1' , ro: 'Glicemia brută este %1' , bg: 'Your raw bg is %1' , pl: 'Glikemia RAW wynosi %1' + , ru: 'ваши необработанные данные RAW $1' + , tr: 'Ham kan şekeriniz %1' }, 'alexaOpenAPSForecast': { en: 'The OpenAPS Eventual BG is %1' @@ -12278,11 +13641,14 @@ function init() { , de: 'Der von OpenAPS vorhergesagte Blutzucker ist %1' , dk: 'OpenAPS forventet blodsukker er %1' , nl: 'OpenAPS uiteindelijke bloedglucose van %1' + ,zh_cn: 'OpenAPS 预测最终血糖是 %1' , sv: 'OpenAPS slutgiltigt blodsocker är %1' , fi: 'OpenAPS verensokeriarvio on %1' , ro: 'Glicemia estimată de OpenAPS este %1' ,bg: 'The OpenAPS Eventual BG is %1' , pl: 'Glikemia prognozowana przez OpenAPS wynosi %1' + , ru: 'OpenAPS прогнозирует ваш СК как %1 ' + , tr: 'OpenAPS tarafından tahmin edilen kan şekeri %1' }, 'alexaCOB': { en: '%1 %2 carbohydrates on board' @@ -12290,11 +13656,14 @@ function init() { , de: '%1 %2 Gramm Kohlenhydrate wirkend.' , dk: '%1 %2 gram aktive kulhydrater' , nl: '%1 %2 actieve koolhydraten' + ,zh_cn: '%1 %2 活性碳水化合物' , sv: '%1 %2 gram aktiva kolhydrater' , fi: '%1 %2 aktiivista hiilihydraattia' , ro: '%1 %2 carbohidrați activi în corp' ,bg: '%1 %2 carbohydrates on board' , pl: '%1 %2 aktywnych węglowodanów' + , ru: '%1 $2 активных углеводов' + , tr: '%1 %2 aktif karbonhidrat' }, 'Fat [g]': { cs: 'Tuk [g]' @@ -12304,12 +13673,14 @@ function init() { ,fi: 'Rasva [g]' ,fr: 'Graisses [g]' ,nl: 'Vet [g]' + ,zh_cn: '脂肪[g]' ,ro: 'Grăsimi [g]' - ,ru: 'жиры' + ,ru: 'жиры [g]' ,it: 'Grassi [g]' ,sv: 'Fett [g]' ,bg: 'Мазнини [гр]' ,pl: 'Tłuszcz [g]' + ,tr: 'Yağ [g]' }, 'Protein [g]': { cs: 'Proteiny [g]' @@ -12319,12 +13690,14 @@ function init() { ,fi: 'Proteiini [g]' ,fr: 'Protéines [g]' ,nl: 'Proteine [g]' + ,zh_cn: '蛋白质[g]' ,ro: 'Proteine [g]' - ,ru: 'белки' + ,ru: 'белки [g]' ,it: 'Proteine [g]' ,sv: 'Protein [g]' ,bg: 'Протеини [гр]' ,pl: 'Białko [g]' + ,tr: 'Protein [g]' }, 'Energy [kJ]': { cs: 'Energie [kJ]' @@ -12334,12 +13707,14 @@ function init() { ,es: 'Energía [Kj]' ,fr: 'Énergie [kJ]' ,ro: 'Energie [g]' - ,ru: 'энергетика' + ,ru: 'энергия [kJ' ,it: 'Energia [kJ]' + ,zh_cn: '能量 [kJ]' ,nl: 'Energie [kJ]' ,sv: 'Energi [kJ]' ,bg: 'Енергия [kJ]' ,pl: 'Energia [kJ}' + ,tr: 'Enerji [kJ]' }, 'Clock Views:': { cs: 'Hodiny:' @@ -12350,17 +13725,20 @@ function init() { ,ro: 'Vedere tip ceas:' ,ru: 'цифры крупно:' ,it: 'Vista orologio:' + ,zh_cn: '时钟视图' ,sv: 'Visa klocka:' ,de: 'Uhr-Anzeigen' ,dk: 'Vis klokken:' ,bg: 'Часовник изглед:' ,pl: 'Widoki zegarów' + ,tr: 'Saat Görünümü' }, 'Clock': { cs: 'Hodiny' ,fr: 'L\'horloge' ,nl: 'Klok' - ,sv: 'Klocka' + ,zh_cn: '时钟' + ,sv: 'Klocka' ,de: 'Uhr' ,dk: 'Klokken' ,fi: 'Kello' @@ -12368,12 +13746,15 @@ function init() { ,it: 'Orologio' ,bg: 'Часовник' ,pl: 'Zegar' + ,ru: 'часы' + ,tr: 'Saat' }, 'Color': { cs: 'Barva' ,fr: 'Couleur' ,nl: 'Kleur' - ,sv: 'Färg' + ,zh_cn: '彩色' + ,sv: 'Färg' ,de: 'Farbe' ,dk: 'Farve' ,fi: 'Väri' @@ -12381,11 +13762,14 @@ function init() { ,it: 'Colore' ,bg: 'Цвят' ,pl: 'Kolor' + ,ru: 'цвет' + ,tr: 'Renk' }, 'Simple': { cs: 'Jednoduchý' ,fr: 'Simple' ,nl: 'Simpel' + ,zh_cn: '简单' ,sv: 'Simpel' ,de: 'Einfach' ,dk: 'Simpel' @@ -12394,11 +13778,14 @@ function init() { ,it: 'Semplice' ,bg: 'Прост' ,pl: 'Prosty' + ,ru: 'простой' + ,tr: 'Basit' }, 'TDD average': { cs: 'Průměrná denní dávka' , fi: 'Päivän kokonaisinsuliinin keskiarvo' , nl: 'Gemiddelde dagelijkse insuline (TDD)' + ,zh_cn: '日胰岛素用量平均值' , sv: 'Genomsnittlig daglig mängd insulin' , de: 'durchschnittliches Insulin pro Tag (TDD)' , dk: 'Gennemsnitlig daglig mængde insulin' @@ -12406,11 +13793,14 @@ function init() { , it: 'Totale Dose Giornaliera media (TDD)' , bg: 'Обща дневна доза средно' , pl: 'Średnia dawka dzienna' + , ru: 'средняя суточная доза инсулина' + , tr: 'Ortalama günlük Toplam Doz (TDD)' }, 'Carbs average': { cs: 'Průměrné množství sacharidů' , fi: 'Hiilihydraatit keskiarvo' , nl: 'Gemiddelde koolhydraten per dag' + ,zh_cn: '碳水化合物平均值' , sv: 'Genomsnittlig mängd kolhydrater per dag' , de: 'durchschnittliche Kohlenhydrate pro Tag' , dk: 'Gennemsnitlig mængde kulhydrater per dag' @@ -12418,11 +13808,14 @@ function init() { , it: 'Media carboidrati' , bg: 'Въглехидрати средно' , pl: 'Średnia ilość węglowodanów' + , ru: 'среднее кол-во углеводов за сутки' + , tr: 'Günde ortalama karbonhidrat' }, 'Eating Soon': { cs: 'Blížící se jídlo' , fi: 'Ruokailu pian' , nl: 'Pre-maaltijd modus' + ,zh_cn: '过会吃饭' , sv: 'Äter snart' , de: 'Bald Essen' , dk: 'Spiser snart' @@ -12430,11 +13823,14 @@ function init() { , it: 'Mangiare presto' , bg: 'Преди хранене' , pl: 'Przed jedzeniem' + , ru: 'скоро прием пищи' + , tr: 'Yakında Yenecek' }, 'Last entry {0} minutes ago': { cs: 'Poslední hodnota {0} minut zpět' , fi: 'Edellinen verensokeri {0} minuuttia sitten' , nl: 'Laatste waarde {0} minuten geleden' + ,zh_cn: '最后一个条目 {0} 分钟之前' , sv: 'Senaste värde {0} minuter sedan' , de: 'Letzter Eintrag vor {0} Minuten' , dk: 'Seneste værdi {0} minutter siden' @@ -12442,11 +13838,14 @@ function init() { , it: 'Ultimo inserimento {0} minuti fa' , bg: 'Последен запис преди {0} минути' , pl: 'Ostatni wpis przed {0} minutami' + , ru: 'предыдущая запись {0} минут назад' + , tr: 'Son giriş {0} dakika önce' }, 'change': { cs: 'změna' , fi: 'muutos' , nl: 'wijziging' + ,zh_cn: '改变' , sv: 'byta' , de: 'verändern' , dk: 'ændre' @@ -12454,11 +13853,14 @@ function init() { , it: 'cambio' , bg: 'промяна' , pl: 'zmiana' + , ru: 'замена' + , tr: 'değişiklik' }, 'Speech': { cs: 'Hlas' , fi: 'Puhe' , nl: 'Spraak' + ,zh_cn: '朗读' , sv: 'Tal' , de: 'Sprache' , dk: 'Tale' @@ -12466,6 +13868,8 @@ function init() { , it: 'Voce' , bg: 'Глас' , pl: 'Głos' + , ru: 'речь' + , tr: 'Konuş' }, 'Target Top': { cs: 'Horní cíl' @@ -12474,85 +13878,117 @@ function init() { , nl: 'Hoog tijdelijk doel' , ro: 'Țintă superioară' , it: 'Limite superiore' + ,zh_cn: '目标高值' , sv: 'Högt målvärde' , bg: 'Горна граница' , pl: 'Górny limit' + , ru: 'верхняя граница цели' + , de: 'Oberes Ziel' + , tr: 'Hedef Üst' }, 'Target Bottom': { cs: 'Dolní cíl' , dk: 'Lavt mål' , fi: 'Tavoite ala' , nl: 'Laag tijdelijk doel' + ,zh_cn: '目标低值' , ro: 'Țintă inferioară' , it: 'Limite inferiore' , sv: 'Lågt målvärde' , bg: 'Долна граница' , pl: 'Dolny limit' + , ru: 'нижняя граница цели' + , de: 'Unteres Ziel' + , tr: 'Hedef Alt' }, 'Canceled': { cs: 'Zrušený' , dk: 'Afbrudt' , fi: 'Peruutettu' , nl: 'Geannuleerd' + ,zh_cn: '被取消了' , ro: 'Anulat' , it: 'Cancellato' , sv: 'Avbruten' , bg: 'Отказан' , pl: 'Anulowane' + , ru: 'отменено' + , de: 'Abgebrochen' + , tr: 'İptal edildi' }, 'Meter BG': { cs: 'Hodnota z glukoměru' , dk: 'Blodsukkermåler BS' , fi: 'Mittarin VS' , nl: 'Bloedglucosemeter waarde' + ,zh_cn: '指血血糖值' , ro: 'Glicemie din glucometru' , it: 'Glicemia Capillare' , sv: 'Blodsockermätare BG' , bg: 'Измерена КЗ' , pl: 'Glikemia z krwi' + , ru: 'СК по глюкометру' + , de: 'Wert Blutzuckermessgerät' + , tr: 'Glikometre KŞ' }, 'predicted': { cs: 'přepověď' , dk: 'forudset' , fi: 'ennuste' , nl: 'verwachting' + ,zh_cn: '预测' , ro: 'estimat' , it: 'predetto' , sv: 'prognos' ,bg: 'прогнозна' , pl: 'prognoza' + , ru: 'прогноз' + , de: 'vorhergesagt' + , tr: 'tahmin' }, 'future': { cs: 'budoucnost' , dk: 'fremtidige' , fi: 'tulevaisuudessa' , nl: 'toekomstig' + ,zh_cn: '将来' , ro: 'viitor' , it: 'futuro' , sv: 'framtida' , bg: 'бъдеще' , pl: 'przyszłość' + , ru: 'будущее' + , de: 'Zukunft' + , tr: 'gelecek' }, 'ago': { cs: 'zpět' , dk: 'siden' , fi: 'sitten' , nl: 'geleden' + ,zh_cn: '之前' , ro: 'în trecut' , sv: 'förfluten' , bg: 'преди' , pl: 'temu' + , ru: 'назад' + , de: 'vor' + , tr: 'önce' }, 'Last data received': { cs: 'Poslední data přiajata' , dk: 'Sidste data modtaget' , fi: 'Tietoa vastaanotettu viimeksi' , nl: 'Laatste gegevens ontvangen' + ,zh_cn: '上次收到数据' , ro: 'Ultimele date primite' , it: 'Ultimo dato ricevuto' , sv: 'Data senast mottagen' , bg: 'Последни данни преди' , pl: 'Ostatnie otrzymane dane' + , ru: 'недавние данные получены' + , de: 'Zuletzt Daten empfangen' + , tr: 'Son veri alındı' }, 'Clock View': { cs: 'Hodiny' @@ -12561,13 +13997,15 @@ function init() { ,es: 'Vista del reloj' ,fr: 'Vue Horloge' ,ro: 'Vedere tip ceas' - ,ru: 'цифры крупно' + ,ru: 'вид циферблата' ,it: 'Vista orologio' ,sv: 'Visa klocka' ,bg: 'Изглед часовник' ,nl: 'Klokweergave' + ,zh_cn: '时钟视图' ,de: 'Uhr-Anzeigen' , pl: 'Widok zegara' + ,tr: 'Saat Görünümü' } }; diff --git a/lib/plugins/careportal.js b/lib/plugins/careportal.js index b30a51532af..b3149f73555 100644 --- a/lib/plugins/careportal.js +++ b/lib/plugins/careportal.js @@ -69,6 +69,10 @@ function init() { , name: 'CGM Sensor Insert' , bg: true, insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false } + , { val: 'Sensor Stop' + , name: 'CGM Sensor Stop' + , bg: true, insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false + } , { val: 'Pump Battery Change' , name: 'Pump Battery Change' , bg: true, insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false diff --git a/lib/plugins/maker-setup.md b/lib/plugins/maker-setup.md deleted file mode 100644 index a7d89084376..00000000000 --- a/lib/plugins/maker-setup.md +++ /dev/null @@ -1,88 +0,0 @@ - - -**Table of Contents** - -- [Nightscout/IFTTT Maker](#nightscoutifttt-maker) - - [Overview](#overview) - - [Events](#events) - - [Configuration](#configuration) - - [Create a recipe](#create-a-recipe) - - [Start [creating a recipe](https://ifttt.com/myrecipes/personal/new)](#start-creating-a-recipehttpsiftttcommyrecipespersonalnew) - - [1. Choose a Trigger Channel](#1-choose-a-trigger-channel) - - [2. Choose a Trigger](#2-choose-a-trigger) - - [3. Complete Trigger Fields](#3-complete-trigger-fields) - - [4. That](#4-that) - - [5. Choose an Action](#5-choose-an-action) - - [6. Complete Action Fields](#6-complete-action-fields) - - [7. Create and Connect](#7-create-and-connect) - - [Result](#result) - - - -Nightscout/IFTTT Maker -====================================== - -## Overview - - In addition to the normal web based alarms, and pushover, there is also integration for [IFTTT Maker](https://ifttt.com/maker). - - With Maker you are able to integrate with all the other [IFTTT Channels](https://ifttt.com/channels). For example you can send a tweet when there is an alarm, change the color of hue light, send an email, send and sms, and so much more. - -## Events - - Plugins can create custom events, but all events sent to maker will be prefixed with `ns-`. The core events are: - - * `ns-event` - This event is sent to the maker service for all alarms and notifications. This is good catch all event for general logging. - * `ns-allclear` - This event is sent to the maker service when an alarm has been ack'd or when the server starts up without triggering any alarms. For example, you could use this event to turn a light to green. - * `ns-info` - Plugins that generate notifications at the info level will cause this event to also be triggered. It will be sent in addition to `ns-event`. - * `ns-warning` - Alarms at the warning level with cause this event to also be triggered. It will be sent in addition to `ns-event`. - * `ns-urgent` - Alarms at the urgent level with cause this event to also be triggered. It will be sent in addition to `ns-event`. - * `ns-warning-high` - Alarms at the warning level with cause this event to also be triggered. It will be sent in addition to `ns-event` and `ns-warning`. - * `ns-urgent-high` - Alarms at the urgent level with cause this event to also be triggered. It will be sent in addition to `ns-event` and `ns-urgent`. - * `ns-warning-low` - Alarms at the warning level with cause this event to also be triggered. It will be sent in addition to `ns-event` and `ns-warning`. - * `ns-urgent-low` - Alarms at the urgent level with cause this event to also be triggered. It will be sent in addition to `ns-event` and `ns-urgent`. - * `ns-info-treatmentnotify` - When a treatment is entered into the care portal this event is triggered. It will be sent in addition to `ns-event` and `ns-info`. - * `ns-warning-bwp` - When the BWP plugin generates a warning alarm. It will be sent in addition to `ns-event` and `ns-warning`. - * `ns-urgent-bwp` - When the BWP plugin generates an urgent alarm. It will be sent in addition to `ns-event` and `ns-urget`. - -## Configuration - - 1. Setup IFTTT account: [login](https://ifttt.com/login) or [create an account](https://ifttt.com/join) - 2. Find your secret key on the [maker page](https://ifttt.com/maker) - 3. Configure Nightscout by setting these environment variables: - * `ENABLE` - `maker` should be added to the list of plugin, for example: `ENABLE="maker"`. - * `MAKER_KEY` - Set this to your secret key that you located in step 2, for example: `MAKER_KEY="abcMyExampleabc123defjt1DeNSiftttmak-XQb69p"` - -## Create a recipe - -### Start [creating a recipe](https://ifttt.com/myrecipes/personal/new) -![screen shot 2015-06-29 at 10 58 48 pm](https://cloud.githubusercontent.com/assets/751143/8425240/bab51986-1eb8-11e5-88fb-5aed311896be.png) - -### 1. Choose a Trigger Channel - ![screen shot 2015-06-29 at 10 59 01 pm](https://cloud.githubusercontent.com/assets/751143/8425243/c007ace6-1eb8-11e5-96d1-b13f9c3d071f.png) - -### 2. Choose a Trigger - ![screen shot 2015-06-29 at 10 59 18 pm](https://cloud.githubusercontent.com/assets/751143/8425246/c77c5a4e-1eb8-11e5-9084-32ae40518ee0.png) - -### 3. Complete Trigger Fields - ![screen shot 2015-06-29 at 10 59 33 pm](https://cloud.githubusercontent.com/assets/751143/8425249/ced7b450-1eb8-11e5-95a3-730f6b9b2925.png) - -### 4. That - ![screen shot 2015-06-29 at 10 59 46 pm](https://cloud.githubusercontent.com/assets/751143/8425251/d46e1dc8-1eb8-11e5-91be-8dc731e308b2.png) - -### 5. Choose an Action - ![screen shot 2015-06-29 at 11 00 12 pm](https://cloud.githubusercontent.com/assets/751143/8425254/de634844-1eb8-11e5-8f09-cd43c41ccf3f.png) - -### 6. Complete Action Fields - **Example:** `Nightscout: {{Value1}} {{Value2}} {{Value3}}` - - ![screen shot 2015-06-29 at 11 02 14 pm](https://cloud.githubusercontent.com/assets/751143/8425267/f2da6dd4-1eb8-11e5-8e4d-cad2590d111f.png) - ![screen shot 2015-06-29 at 11 02 21 pm](https://cloud.githubusercontent.com/assets/751143/8425272/f83ceb62-1eb8-11e5-8ea2-afd4dcbd391f.png) - -### 7. Create and Connect - ![screen shot 2015-06-29 at 11 02 43 pm](https://cloud.githubusercontent.com/assets/751143/8425277/fe52f618-1eb8-11e5-8d7f-e0b34eebe29a.png) - -### Result - ![cinpiqkumaa33u7](https://cloud.githubusercontent.com/assets/751143/8425925/e7d08d2c-1ebf-11e5-853c-cdc5381c4186.png) - - diff --git a/lib/plugins/rawbg.js b/lib/plugins/rawbg.js index a3853f88e11..f19e669f63b 100644 --- a/lib/plugins/rawbg.js +++ b/lib/plugins/rawbg.js @@ -13,6 +13,12 @@ function init (ctx) { , pillFlip: true }; + rawbg.getPrefs = function getPrefs (sbx) { + return { + display: (sbx && sbx.extendedSettings.display) ? sbx.extendedSettings.display : 'unsmoothed' + }; + }; + rawbg.setProperties = function setProperties (sbx) { sbx.offerProperty('rawbg', function setRawBG ( ) { var result = { }; @@ -49,14 +55,18 @@ function init (ctx) { sbx.pluginBase.updatePillText(rawbg, options); }; - rawbg.calc = function calc(sgv, cal) { + rawbg.calc = function calc(sgv, cal, sbx) { var raw = 0; var cleaned = cleanValues(sgv, cal); + var prefs = rawbg.getPrefs(sbx); + if (cleaned.slope === 0 || cleaned.unfiltered === 0 || cleaned.scale === 0) { raw = 0; - } else if (cleaned.filtered === 0 || sgv.mgdl < 40) { + } else if (cleaned.filtered === 0 || sgv.mgdl < 40 || prefs.display === 'unfiltered') { raw = cleaned.scale * (cleaned.unfiltered - cleaned.intercept) / cleaned.slope; + } else if (prefs.display === 'filtered') { + raw = cleaned.scale * (cleaned.filtered - cleaned.intercept) / cleaned.slope; } else { var ratio = cleaned.scale * (cleaned.filtered - cleaned.intercept) / cleaned.slope / sgv.mgdl; raw = cleaned.scale * (cleaned.unfiltered - cleaned.intercept) / cleaned.slope / ratio; diff --git a/lib/plugins/xdrip-js.js b/lib/plugins/xdrip-js.js index 677d2b42674..d66f112cfcf 100644 --- a/lib/plugins/xdrip-js.js +++ b/lib/plugins/xdrip-js.js @@ -172,7 +172,7 @@ function init(ctx) { result.level = levels.WARN; } - if (sensorInfo.xdripjs.voltageb && (sensorInfo.xdripjs.voltageb < prefs.warnBatV)) { + if (sensorInfo.xdripjs.voltageb && (sensorInfo.xdripjs.voltageb < (prefs.warnBatV - 10))) { sendNotification = true; message = 'CGM Battery B Low Voltage: ' + sensorInfo.xdripjs.voltageb; title = 'CGM Battery Low'; diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js index 1d6b6f84f40..b071706899b 100644 --- a/lib/report_plugins/daytoday.js +++ b/lib/report_plugins/daytoday.js @@ -31,6 +31,7 @@ daytoday.html = function html(client) { + ''+translate('Raw')+'' + ''+translate('IOB')+'' + ''+translate('COB')+'' + + ''+translate('Predictions')+'' + ''+translate('OpenAPS')+'' + ''+translate('Insulin distribution')+'' + ' '+translate('Size') @@ -39,6 +40,7 @@ daytoday.html = function html(client) { + ' ' + ' ' + ' ' + + ' ' + '' + '
' + translate('Scale') + ': ' @@ -46,6 +48,19 @@ daytoday.html = function html(client) { + translate('Linear') + '' + translate('Logarithmic') + + '' + '
' + '
' + '
' @@ -292,6 +307,115 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options) return sel; } + // PREDICTIONS START + // + function preparePredictedData() { + + var treatmentsTimestamps = []; // Only timestamps for (carbs and bolus insulin) treatments will be captured in this array + treatmentsTimestamps.push(dataRange[0]); // Create a fake timestamp at midnight so we can show predictions during night + for (var i in data.treatments) { + var treatment = data.treatments[i]; + if (undefined != treatment.carbs && null != treatment.carbs && treatment.carbs > 0) { + if (treatment.timestamp) + treatmentsTimestamps.push(treatment.timestamp); + else if (treatment.created_at) + treatmentsTimestamps.push(treatment.created_at); + } + if (undefined != treatment.insulin && null != treatment.insulin && treatment.insulin > 0) { + if (treatment.timestamp) + treatmentsTimestamps.push(treatment.timestamp); + else if (treatment.created_at) + treatmentsTimestamps.push(treatment.created_at); + } + } + + var predictions = []; + if (data && data.devicestatus) { + for (var i = data.devicestatus.length - 1; i >= 0; i--) { + if (data.devicestatus[i].loop && data.devicestatus[i].loop.predicted) { + predictions.push(data.devicestatus[i].loop.predicted); + } else if (data.devicestatus[i].openaps && data.devicestatus[i].openaps.suggested && data.devicestatus[i].openaps.suggested.predBGs) { + var entry = {}; + entry.startDate = data.devicestatus[i].openaps.suggested.timestamp; + // For OpenAPS/AndroidAPS we fall back from COB if present, to UAM, then IOB + if (data.devicestatus[i].openaps.suggested.predBGs.COB) { + entry.values = data.devicestatus[i].openaps.suggested.predBGs.COB; + } else if (data.devicestatus[i].openaps.suggested.predBGs.UAM) { + entry.values = data.devicestatus[i].openaps.suggested.predBGs.UAM; + } else entry.values = data.devicestatus[i].openaps.suggested.predBGs.IOB; + predictions.push(entry); + } + } + } + + var p = []; + if (predictions.length > 0 && treatmentsTimestamps.length > 0) { + + // Iterate over all treatments, find the predictions for each and add them to the predicted array p + for (var treatmentsIndex = 0; treatmentsIndex < treatmentsTimestamps.length; treatmentsIndex++) { + var timestamp = treatmentsTimestamps[treatmentsIndex]; + var predictedIndex = findPredicted(predictions, timestamp, predictedOffset); // Find predictions offset before or after timestamp + + if (predictedIndex != null) { + var entry = predictions[predictedIndex]; // Start entry + var d = moment(entry.startDate); + var end = moment().endOf('day'); + if (options.predictedTruncate) { + if (predictedOffset >= 0) { + // If we are looking forward we want to stop at the next treatment + if (treatmentsIndex < treatmentsTimestamps.length - 1) { + end = moment(treatmentsTimestamps[treatmentsIndex + 1]); + } + } else { + // If we are looking back, then we want to stop at "this" treatment + end = moment(treatmentsTimestamps[treatmentsIndex]); + } + } + for (var entryIndex in entry.values) { + if (!d.isAfter(end)) { + var value = {}; + value.sgv = client.utils.scaleMgdl(entry.values[entryIndex]); + value.date = d.toDate(); + value.color = 'purple'; + p.push(value); + d.add(5, 'minutes'); + } + } + } + } + } + return p; + } + + /* Find the earliest new predicted instance that has a timestamp equal to or larger than timestamp */ + /* (so if we have bolused or eaten we want to find the prediction that Loop has estimated just after that) */ + /* Returns the index into the predictions array that is the predicted we are looking for */ + function findPredicted(predictions, timestamp, offset) { + var ts = moment(timestamp).add(offset, 'minutes'); + var predicted = null; + if (offset && offset < 0) { // If offset is negative, start searching from first prediction going forward + for (var i = 0; i < predictions.length; i++) { + if (predictions[i] && predictions[i].startDate && moment(predictions[i].startDate) <= ts) { + predicted = i; + } + } + } else { // If offset is positive or zero, start searching from last prediction going backward + for (var i = predictions.length - 1; i > 0; i--) { + if (predictions[i] && predictions[i].startDate && moment(predictions[i].startDate) >= ts) { + predicted = i; + } + } + } + return predicted; + } + // + // PREDICTIONS ENDS + + + // bind up the context chart data to an array of circles + var contextData = (options.predicted ? data.sgv.concat(preparePredictedData()) : data.sgv); + var contextCircles = context.selectAll('circle').data(contextData); + // if new circle then just display prepareContextCircles(contextCircles.enter().append('circle')); @@ -899,6 +1023,9 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options) }); function appendProfileSwitch(context, treatment) { + + if (!treatment.cutting && !treatment.profile) { return; } + var sign = treatment.first ? '▲▲▲' : '▬▬▬'; var text; if (treatment.cutting) { diff --git a/lib/report_plugins/glucosedistribution.js b/lib/report_plugins/glucosedistribution.js index ad08c3084ff..e16ad104d77 100644 --- a/lib/report_plugins/glucosedistribution.js +++ b/lib/report_plugins/glucosedistribution.js @@ -32,11 +32,13 @@ glucosedistribution.html = function html(client) { '
' + '* ' + translate('This is only a rough estimation that can be very inaccurate and does not replace actual blood testing. The formula used is taken from:') + 'Nathan, David M., et al. "Translating the A1C assay into estimated average glucose values." Diabetes care 31.8 (2008): 1473-1478.' + '

' + - translate('Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.') + '

' + + translate('Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.') + '

' + translate('Mean Total Daily Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of days. Lower is better.')+ '

' + translate('Mean Hourly Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of hours in the period. Lower is better.')+ '

' + translate('Out of Range RMS is calculated by squaring the distance out of range for all glucose readings for the examined period, summing them, dividing by the count and taking the square root. This metric is similar to in-range percentage but weights readings far out of range higher. Lower values are better.')+ '

' + - translate('GVI and PGS are measures developed by Dexcom, detailed here.')+ + translate('GVI (Glycemic Variability Index) and PGS (Patient Glycemic Status) are measures developed by Dexcom, detailed can be found here.')+ '


' + translate('Filter by hours') + ':' + '
' + diff --git a/lib/report_plugins/index.js b/lib/report_plugins/index.js index 12cd024bdd2..94bc282395f 100644 --- a/lib/report_plugins/index.js +++ b/lib/report_plugins/index.js @@ -11,6 +11,7 @@ function init() { } , allPlugins = [ require('./daytoday')() + , require('./weektoweek')() , require('./dailystats')() , require('./glucosedistribution')() , require('./hourlystats')() @@ -19,6 +20,7 @@ function init() { , require('./calibrations')() , require('./treatments')() , require('./profiles')() + , require('./loopalyzer')() ]; consts.scaleYFromSettings = function scaleYFromSettings (client) { diff --git a/lib/report_plugins/loopalyzer.js b/lib/report_plugins/loopalyzer.js new file mode 100644 index 00000000000..8eb96e68102 --- /dev/null +++ b/lib/report_plugins/loopalyzer.js @@ -0,0 +1,1267 @@ +'use strict'; + +//var _ = require('lodash'); +var moment = window.moment; +//var times = require('../times'); +//var d3 = (global && global.d3) || require('d3'); + +var loopalyzer = { + name: 'loopalyzer' + , label: 'Loopalyzer' + , pluginType: 'report' +}; + +function init() { + return loopalyzer; +} + +module.exports = init; + +var laDebug = false; // If we should print console.logs +var laVersion = '2019-02-02 v6'; +var risingInterpolationGap = 6; // How large a gap in COB/IOB graph is allowed to be to be interpolated if end value is larger than start +var fallingInterpolationGap = 24; // And if less than start +var interpolationRatio = 1.25; // But do allow rising interpolation if gap larger than interpolationGap and end value is less than 10% larger than start + +loopalyzer.html = function html(client) { + var translate = client.translate; + var ret = ''; + ret += '

Loopalyzer  

'; + ret += '' + translate('The primary purpose of Loopalyzer is to visualise how the Loop closed loop system performs. It may work with other setups as well, both closed and open loop, and non loop. However depending on which uploader you use, how frequent it is able to capture your data and upload, and how it is able to backfill missing data some graphs may have gaps or even be completely empty. Always ensure the graphs look reasonable. Best is to view one day at a time and scroll through a number of days first to see.'); + ret += '

' + translate('Loopalyzer includes a time shift feature. If you for example have breakfast at 07:00 one day and at 08:00 the day after your average blood glucose curve these two days will most likely look flattened and not show the actual response after a breakfast. Time shift will compute the average time these meals were eaten and then shift all data (carbs, insulin, basal etc.) during both days the corresponding time difference so that both meals align with the average meal start time. '); + ret += '
' + translate('In this example all data from first day is pushed 30 minutes forward in time and all data from second day 30 minutes backward in time so it appears as if you had had breakfast at 07:30 both days. This allows you to see your actual average blood glucose response from a meal.'); + ret += '

' + translate('Time shift highlights the period after the average meal start time in gray, for the duration of the DIA (Duration of Insulin Action). As all data points the entire day are shifted the curves outside the gray area may not be accurate.'); + ret += '

' + translate('Note that time shift is available only when viewing multiple days.'); + ret += '

'; + ret += translate('To see this report, press SHOW while in this view'); + ret += ''; + ret += ''; + ret += '';/* loopalyzer-button */ + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + ret += '
'; + return ret; +}; + +loopalyzer.css = +'#loopalyzer-charts, #loopalyzer-profiles { padding: 20px; } ' ++ '#loopalyzer-basal, #loopalyzer-bg, #loopalyzer-tempbasal, #loopalyzer-iob, #loopalyzer-cob, #loopalyzer-profiles {' ++ ' width: 100%;' ++ ' height: 100%;' ++ '}' ++ '#loopalyzer-profiles-table table { margin: 0 10px; border-collapse: collapse; border: 0px; }' ++ '#loopalyzer-profiles-table td { vertical-align: top; }' ++ '#loopalyzer-profiles-table td table { margin: 0 10px; border-collapse: collapse; border: 0px; }' ++ '#loopalyzer-profiles-table td caption { text-align: left; font-weight: bold; }' ++ '#loopalyzer-profiles-table td th { background-color: #4CAF50; color: white; }' ++ '#loopalyzer-profiles-table td td { text-align: right; vertical-align: top; padding: 0 1px; }' ++ '#loopalyzer-profiles-table td td td { padding: 1px 8px; }' +; + +loopalyzer.prepareHtml = function loopalyzerPrepareHtml() { +// $('#loopalyzer-charts').append($('
')); +}; + +// loopalyzer.ss = require('simple-statistics'); + +// +// Functions to pull data from datastorage and prepare in bins +// +loopalyzer.getSGVs = function(datastorage, daysToShow) { + var data = datastorage.allstatsrecords; + var bins = loopalyzer.getEmptyBins(); + + // Loop thru the days to show, for each day find the matching SGVs and insert into the bins entry array + daysToShow.forEach(function(day) { + var entries = []; // Array with all SGVs for this day, we'll fill this and then insert into the bins later + for (var i=0; i<288; i++) entries.push(NaN); // Fill the array with NaNs so we have something in case we don't find an SGV + var fromDate = moment(day); + var toDate = moment(day); + fromDate.set({'hours':0, 'minutes':0, 'seconds':0, 'milliseconds':0}); + toDate.set({'hours':0, 'minutes':5, 'seconds':0, 'milliseconds':0}); // toDate is 5 mins ahead + for (var i=0; i<288; i++) { + var found = false; + data.some(function(record) { + var recDate = moment(record.displayTime); + if (!found && recDate.isAfter(fromDate) && recDate.isBefore(toDate)) { + entries[i]=record.sgv; + found = true; + } + return found; // Breaks .some loop if found is true + }) + fromDate.add(5, 'minutes'); + toDate.add(5, 'minutes'); + } + loopalyzer.addArrayToBins(bins, entries); + }); + return bins; +} + +loopalyzer.getBasals = function(datastorage, daysToShow, profile) { + var bins = loopalyzer.getEmptyBins(); + + daysToShow.forEach(function(day) { + var dayStart = moment(day).startOf('day'); + var dayEnd = moment(day).endOf('day'); + var basals = []; + for (var i=0; i<288; i++) basals.push(NaN); // Clear the basals by filling with NaNs + + var index = 0; + for (var dt=dayStart; dt < dayEnd; dt.add(5, 'minutes')) { + var basal = profile.getTempBasal(dt.toDate()); + if (basal) + basals[index++] = basal.basal; + } + if (laDebug) console.log('getBasals ' + day, basals); + loopalyzer.addArrayToBins(bins, basals); + }); + return bins; +} + +loopalyzer.getTempBasalDeltas = function(datastorage, daysToShow, profile) { + var bins = loopalyzer.getEmptyBins(); + + daysToShow.forEach(function(day) { + var dayStart = moment(day).startOf('day'); + var dayEnd = moment(day).endOf('day'); + var temps = []; + for (var i=0; i<288; i++) temps.push(NaN); // Clear the basals by filling with NaNs + + var index = 0; + for (var dt=dayStart; dt < dayEnd; dt.add(5, 'minutes')) { + var basal = profile.getTempBasal(dt.toDate()); + if (basal) + temps[index++] = basal.tempbasal - basal.basal; + } + if (laDebug) console.log('getTempBasalDeltas ' + day, temps); + loopalyzer.addArrayToBins(bins, temps); + }); + return bins; +} + +loopalyzer.getIOBs = function(datastorage, daysToShow, profile, client, treatments) { + var iobStatusAvailable = client.plugins('iob').isDeviceStatusAvailable(datastorage.devicestatus); + if (laDebug) console.log('getIOBs iobStatusAvailable=' + iobStatusAvailable); + + var bins = loopalyzer.getEmptyBins(); + + daysToShow.forEach(function(day) { + var dayStart = moment(day).startOf('day'); + var dayEnd = moment(day).endOf('day'); + var iobs = []; + if (iobStatusAvailable) { + // var dayStartMills = dayStart.milliseconds(); + for (var i=0; i<288; i++) iobs.push(NaN); // Clear the IOBs by filling with NaNs + var iobArray = client.plugins('iob').IOBDeviceStatusesInTimeRange(datastorage.devicestatus, dayStart.valueOf(), dayEnd.valueOf()); + if (laDebug) console.log('getIOBs iobArray', iobArray); + iobArray.forEach(function(entry){ + var index = Math.floor(moment(entry.mills).diff(dayStart,'minutes') / 5); + iobs[index] = entry.iob; + }); + + if (daysToShow.length===1) loopalyzer.fillNanWithTreatments(iobs, treatments); + + // Loop thru these entries and where no IOB has been found, interpolate between nearby to get a continuous array + var startIndex = 0, stopIndex = 0; + while (startIndex < iobs.length && isNaN(iobs[startIndex])) { + startIndex++; // Advance start to the first real number + } + if (startIndex < iobs.length) { + stopIndex = startIndex+1; + while (stopIndex=0 && isNaN(array[start])) {}; + while (stop++ interpolationGap || (gap < interpolationGap && array[start]= interpolationGap || array[start]==0)) ) { + var interpolate = (isNaN(array[start]) || isNaN(array[stop]) ? true : loopalyzer.canInterpolate(array,start,stop)); + if (!interpolate) { + array[index] = treatment.amount; + } + } + }) +} + +/* Returns true if we can interpolate between this start and end */ +loopalyzer.canInterpolate = function(array, start, stop) { + var interpolate = false; + if (array[stop] <= array[start]*interpolationRatio) { + // Falling + if (stop-start0}).forEach(function(treatment){ + if (moment(treatment.created_at).isBetween(startDate, endDate)) { + treatments.push({date:treatment.created_at, amount:treatment.carbs}); + } + }) + if (laDebug) console.log('Carb treatments', treatments); + return treatments; +} + +/* Returns the insulin treatments array as [date, amount] */ +loopalyzer.getInsulinTreatments = function(datastorage, daysToShow) { + var treatments = []; // Holds the treatments [date, amount] + var startDate = moment(daysToShow[0]); + var endDate = moment(daysToShow[daysToShow.length-1]).add(1, 'days'); + + datastorage.treatments.filter(function(treatment){return treatment.insulin && treatment.insulin >0}).forEach(function(treatment){ + if (moment(treatment.created_at).isBetween(startDate, endDate)) { + treatments.push({date:treatment.created_at, amount:treatment.insulin}); + } + }) + if (laDebug) console.log('Insulin treatments', treatments); + return treatments; +} + +// PREDICTIONS START +// +loopalyzer.getAllTreatmentTimestampsForADay = function(datastorage, day) { + var timestamps = []; + var dayStart = moment(day).startOf('day'); + var carbTreatments = loopalyzer.getCarbTreatments(datastorage,[day]); + var insulinTreatments = loopalyzer.getInsulinTreatments(datastorage,[day]); + carbTreatments.forEach(function(entry) { timestamps.push(entry.date)}); + insulinTreatments.forEach(function(entry) { timestamps.push(entry.date)}); + timestamps.sort(function(a,b) { return (a= 0; i--) { + if (datastorage.devicestatus[i].loop && datastorage.devicestatus[i].loop.predicted) { + var predicted = datastorage.devicestatus[i].loop.predicted; + if (moment(predicted.startDate).isSame(dayStart,'day')) + predictions.push(datastorage.devicestatus[i].loop.predicted); + } else if (datastorage.devicestatus[i].openaps && datastorage.devicestatus[i].openaps.suggested && datastorage.devicestatus[i].openaps.suggested.predBGs) { + var entry = {}; + entry.startDate = datastorage.devicestatus[i].openaps.suggested.timestamp; + // For OpenAPS/AndroidAPS we fall back from COB if present, to UAM, then IOB + if (datastorage.devicestatus[i].openaps.suggested.predBGs.COB) { + entry.values = datastorage.devicestatus[i].openaps.suggested.predBGs.COB; + } else if (datastorage.devicestatus[i].openaps.suggested.predBGs.UAM) { + entry.values = datastorage.devicestatus[i].openaps.suggested.predBGs.UAM; + } else entry.values = datastorage.devicestatus[i].openaps.suggested.predBGs.IOB; + predictions.push(entry); + } + } + // Remove duplicates before we're done + var p = []; + predictions.forEach(function(prediction) { + if (p.length === 0 || prediction.startDate !== p[p.length-1].startDate) + p.push(prediction); + }) + return p; +} + +/* Find the earliest new predicted instance that has a timestamp equal to or larger than timestamp */ +/* (so if we have bolused or eaten we want to find the prediction that Loop has estimated just after that) */ +/* Returns the index into the predictions array that is the predicted we are looking for */ +loopalyzer.findPredicted = function(predictions, timestamp, offset) { + var ts = moment(timestamp).add(offset, 'minutes'); + var predicted = null; + if (offset && offset < 0) { // If offset is negative, start searching from first prediction going forward + for (var i = 0; i < predictions.length; i++) { + if (predictions[i] && predictions[i].startDate && moment(predictions[i].startDate) <= ts) { + predicted = i; + } + } + } else { // If offset is positive or zero, start searching from last prediction going backward + for (var i = predictions.length - 1; i > 0; i--) { + if (predictions[i] && predictions[i].startDate && moment(predictions[i].startDate) >= ts) { + predicted = i; + } + } + } + return predicted; +} + + +loopalyzer.getPredictions = function(datastorage, daysToShow, client) { + + if (!datastorage.devicestatus) + return []; + + var predictedOffset = 0; + var truncatePredictions = true; + + // Fill the bins array with the timestamp, one per 5 minutes + var bins = []; + var date = moment(); + date.set({'hours':0, 'minutes':0, 'seconds':0, 'milliseconds':0}); + for (var i=0; i<288; i++) { + bins.push([date.toDate(),[]]); + date.add(5, 'minutes'); + } + + daysToShow.forEach(function(day) { + var p = []; // Array with all prediction SGVs for this day, we'll fill this and then insert into the bins later + for (var i=0; i<288; i++) p.push(NaN); + var treatmentTimestamps = loopalyzer.getAllTreatmentTimestampsForADay(datastorage, day); + var predictions = loopalyzer.getAllPredictionsForADay(datastorage, day); + + if (predictions.length > 0 && treatmentTimestamps.length > 0) { + + // Iterate over all treatments, find the predictions for each and add them to the entries array p, aligned on timestamp + for (var treatmentsIndex = 0; treatmentsIndex < treatmentTimestamps.length; treatmentsIndex++) { + var timestamp = treatmentTimestamps[treatmentsIndex]; + var predictedIndex = loopalyzer.findPredicted(predictions, timestamp, predictedOffset); // Find predictions offset before or after timestamp + + if (predictedIndex != null) { + var entry = predictions[predictedIndex]; // Start entry + var d = moment(entry.startDate); + var end = moment(day).endOf('day'); // Default to stop and end of the day + if (truncatePredictions) { + if (predictedOffset >= 0) { + // But if we are looking forward we want to stop at the next treatment + if (treatmentsIndex < treatmentTimestamps.length - 1) { + end = moment(treatmentTimestamps[treatmentsIndex + 1]); + } + } else { + // And if we are looking backward then we want to stop at "this" treatment + end = moment(treatmentTimestamps[treatmentsIndex]); + } + } + for (var entryIndex in entry.values) { + if (!d.isAfter(end)) { + var dayStart = moment(d).startOf('day'); + var minutesAfterMidnight = moment(d).diff(dayStart, 'minutes'); + var index = Math.floor(minutesAfterMidnight/5); + p[index] = client.utils.scaleMgdl(entry.values[entryIndex]); + d.add(5, 'minutes'); + } + } + } + } + } + for (var i=0; i<288; i++) { + bins[i][1].push(p[i]); + } + }) + return bins; + } + // + // PREDICTIONS ENDS + + +// VARIOUS UTILITY FUNCTIONS // + +/* Create an empty bins array with date stamps for today */ +loopalyzer.getEmptyBins = function() { + var bins=[]; + var todayStart = moment().startOf('day'); + var todayEnd = moment().endOf('day'); + for (var dt=todayStart; dt < todayEnd; dt.add(5, 'minutes')) { + bins.push([dt.toDate(), []]); + } + return bins; +} + +/* Takes an array of 288 values and adds to the bins */ +loopalyzer.addArrayToBins = function(bins, values) { + if (bins && bins.length === 288 && values && values.length === 288) { + values.forEach(function(value,index) { + bins[index][1].push(value); + }); + } else + console.log('addArrayToBins - array must have 288 items', values); +} + +/* Fill all NaNs in an array by interpolating between adjacent values */ +loopalyzer.interpolateArray = function(values, allowNegative) { + var startIndex=0, stopIndex=0, k=0, m=0; + + while (isNaN(values[startIndex])) { + startIndex++; // Advance start to the first real number + } + stopIndex = startIndex+1; + while (stopIndexmax) max = xBins[i][1]; + } + return max; +} + +/* Compute avg value in bins */ +loopalyzer.avg = function(xBins) { + var out=[]; + xBins.forEach(function(entry){ + var sum = 0; + var count = 0; + entry[1].forEach(function(value){ + if (value && value != NaN) { + sum += value; + count++; + } + }) + var avg = sum / count; + out.push([entry[0], avg]); + }) + return out; +} + +// Timeshifts a bins array with subarrays for multiple days +loopalyzer.timeShiftBins = function(bins, timeShift) { + if (bins && bins.length>0) { + timeShift.forEach(function(minutes, dayIndex){ + if (minutes !==0) { + var tempBin = []; + bins.forEach(function(){ + tempBin.push(NaN); // Fill tempBin with NaNs + }) + var minutesBy5 = Math.floor(minutes/5); + if (minutesBy5>0) { + var count = 288-minutesBy5; + // If minutes>0 it means we should shift forward in time + // Example: Shift by 15 mins = 3 buckets + // bin : 0 1 2 3 4 5 6 7 8 9 10 + // tempBin: NaN NaN NaN 0 1 2 3 4 5 6 7 + for (var i=0; i0) { + daysToShow.forEach(function(day, dayIndex){ + var minutesToAdd = timeShift[dayIndex]; + var date = moment(day); + bin.forEach(function(entry, entryIndex){ + var entryDate = moment(entry.date); + if (entryDate.isSame(date, 'day')) { + entryDate.add(minutesToAdd, 'minutes'); + bin[entryIndex].date=entryDate.toDate(); + } + }) + }) + } +} + +/* Returns true if the profile values in a is identical to values in b, false otherwise */ +loopalyzer.isSameProfileValues = function(a,b) { + // Because the order of the keys are random when stringifying we do our own custom stringify ourselves + var aString = ''; + var bString = ''; + if (a.basal) { + aString += 'basal:'; + a.basal.forEach(function(entry) { + aString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + if (a.carbratio) { + aString += 'carbratio:'; + a.carbratio.forEach(function(entry) { + aString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + if (a.sens) { + aString += 'sens:'; + a.sens.forEach(function(entry) { + aString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + if (b.basal) { + bString += 'basal:'; + b.basal.forEach(function(entry) { + bString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + if (b.carbratio) { + bString += 'carbratio:'; + b.carbratio.forEach(function(entry) { + bString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + if (b.sens) { + bString += 'sens:'; + b.sens.forEach(function(entry) { + bString += 's' + entry.timeAsSeconds + 't' + entry.time + 'v' + entry.value; + }) + } + return (aString == bString); +} + +loopalyzer.renderProfilesTable = function (datastoreProfiles, daysToShow, client) { + + // Loop thru the daysToShow and get the timestamp of the first day displayed + var beginningOfFirstDay = null; + var endOfLastDay = null; + daysToShow.forEach(function (day) { + var dayStart = moment(day).startOf('day'); + var dayEnd = moment(day).endOf('day'); + if (!beginningOfFirstDay || dayStart < beginningOfFirstDay) + beginningOfFirstDay = dayStart; + if (!endOfLastDay || dayEnd > endOfLastDay) + endOfLastDay = dayEnd; + }); + + // Now some profile juggling... We want to display only the profiles relevant to the days we are showing. + // This includes the last profile created before the first display date, and the profiles created on the display dates. + // However we don't want to show duplicate profiles and we also don't want to show more than just a few if there are many. + + // First, extract the profiles that have a startDate less than the endOfLastDay as only these are relevant, and sort + // these on ascending startDate (create a clone array so we don't modify the Store array). And only save the profiles + // that have basal, carbratio, or sens. + var profilesArray1 = []; + datastoreProfiles.forEach(function (entry) { + var newEntry = {}; + newEntry.startDate = entry.startDate; + var store=entry.store; + if (store) { + for(var key in store){ + if (laDebug) console.log('profile ' + key); + if (store.hasOwnProperty(key)){ + var defaultProfile=store[key]; + newEntry.profileName=key; + if (defaultProfile.basal) newEntry.basal = defaultProfile.basal; + if (defaultProfile.carbratio) newEntry.carbratio = defaultProfile.carbratio; + if (defaultProfile.sens) newEntry.sens = defaultProfile.sens; + if ((newEntry.basal || newEntry.carbratio || newEntry.sens) && moment(entry.startDate).isBefore(endOfLastDay)) + profilesArray1.push(newEntry); + } + } + } + }) + profilesArray1.sort(function (a, b) { return (a.startDate > b.startDate ? 1 : -1) }); // Ascending + if (laDebug) { + profilesArray1.forEach(function (entry) { + console.log('profilesArray1 - ' + entry.startDate); + }) + } + if (laDebug) console.log('profilesArray1 has ' + profilesArray1.length + ' profiles'); + + // Second, the deduplication - remove all duplicates which have a later startDate but identical data + var profilesArray2 = []; + var profileToCompareWith = profilesArray1[0]; + profilesArray2.push(profileToCompareWith); // Push the first profile, which should always be included. + profilesArray1.forEach(function (entry) { + if (laDebug) { + console.log('Comparing ' + JSON.stringify(profileToCompareWith.startDate) + ' to ' + JSON.stringify(entry.startDate)); + console.log(profileToCompareWith, entry); + } + if (!loopalyzer.isSameProfileValues(profileToCompareWith, entry)) { + profilesArray2.push(entry); + profileToCompareWith = entry; + if (laDebug) + console.log('ADDING IT'); + } else { + // Do NOT push the entry to profilesArray2, and keep comparing with the same (olders unique) profile + if (laDebug) + console.log('SKIPPING IT'); + } + }) + if (laDebug) console.log('profilesArray2 has ' + profilesArray2.length + ' profiles'); + + // Sort the newest Profile first + profilesArray2.sort(function (a, b) { return (a.startDate > b.startDate ? 1 : -1) }); // Ascending + + // Third, find the latest profile with a startDate before beginningOfFirstDay + var latestProfile = profilesArray2[0]; // This is the oldest one + profilesArray2.forEach(function (entry) { + if (laDebug) + console.log(entry.startDate + ' isBefore ' + beginningOfFirstDay + ' = ' + moment(entry.startDate).isBefore(beginningOfFirstDay)); + if (moment(entry.startDate).isBefore(beginningOfFirstDay)) + latestProfile = entry; + }); + if (laDebug) console.log('latest profile is ' + latestProfile.startDate); + + // Now create a final array with the latest profile found above and add all + // the other profiles with a startDate between beginningOfFirstDay and endOfLastDay + var profiles = []; + profiles.push(latestProfile); // Add the latest one + profilesArray2.forEach(function (entry) { + if (laDebug) + console.log(entry.startDate + ' isAfter ' + beginningOfFirstDay + ' = ' + moment(entry.startDate).isAfter(beginningOfFirstDay)); + if (moment(entry.startDate).isAfter(beginningOfFirstDay)) + profiles.push(entry); // Add the profile if it's between beginning and end of show dates + }); + + // Now we have an array of all the profiles that are relevant for the days we are displaying. + if (laDebug) { + profiles.forEach(function (entry) { + console.log('profiles - ' + entry.startDate); + }) + } + if (laDebug) console.log('profiles has ' + profiles.length + ' profiles'); + + var translate = client.translate; + var tableHtml = ''; + + profiles.forEach(function (theProfile, index) { + + if (index < 3) { + tableHtml += ''; + + } else + if (index == 3) { + // Add ellipsis if too many profiles to display, but only one ellipsis even if there are more profiles + tableHtml += ''; + } + }); + + // Close the entire table + tableHtml += '
'; + tableHtml += ''; + tableHtml += ''; + tableHtml += ''; + + // Add Basal as a table in the first td + tableHtml += ''; + + // Add Carb Ratio as a table in the second td + tableHtml += ''; + + // Add Sensitivity as a table in the third td + tableHtml += ''; + + // Close theProfile table + tableHtml += '
' + theProfile.profileName + ' (' + new Date(theProfile.startDate).toLocaleString() + ')
' + translate('Basal') + '' + translate('Carb ratio') + '' + translate('Sensitivity') + '
'; + if (theProfile.basal) { + theProfile.basal.forEach(function (entry) { + tableHtml += '' + }); + } + tableHtml += '
' + entry.time + '' + parseFloat(entry.value).toFixed(3) + '
'; + if (theProfile.carbratio) { + theProfile.carbratio.forEach(function (entry) { + tableHtml += '' + }); + } + tableHtml += '
' + entry.time + '' + parseFloat(entry.value).toFixed(1) + '
'; + if (theProfile.sens) { + theProfile.sens.forEach(function (entry) { + tableHtml += '' + }); + } + tableHtml += '
' + entry.time + '' + parseFloat(entry.value).toFixed(1) + '
.....
'; + + // And add our HTML to the view + $("#loopalyzer-profiles").html(tableHtml); + +}; + +// Main method +loopalyzer.report = function(datastorage,sorteddaystoshow,options) { + if (laDebug) console.log('Loopalyzer ' + laVersion); + + // Copy the sorteddaystoshow into new array (clone) and re-sort ascending (so we don't mess with original array) + var daysToShow = []; + sorteddaystoshow.forEach(function(day){daysToShow.push(day)}); + daysToShow.sort(function(a,b) { return (a1) dateInfo += ' - ' + moment(daysToShow[daysToShow.length-1]).format('ddd MMM D'); // .split(',')[0]; + $("#loopalyzer-dateinfo").html(dateInfo); + + loopalyzer.prepareHtml(); + $("#loopalyzer-buttons").show(); + if (daysToShow.length==1) { + // Disable and gray out timeShift if only a single day + $("#rp_loopalyzertimeshift").prop('checked', false); + $("#rp_loopalyzertimeshift").attr("disabled", true); + $("#rp_loopalyzermincarbs").attr("disabled", true); + $("#rp_loopalyzert1").attr("disabled", true); + $("#rp_loopalyzert2").attr("disabled", true); + $("#rp_loopalyzertimeshiftinput").css('color', 'gray'); + } else { + // Enable and turn the timeShift black if multiple days + $("#rp_loopalyzertimeshift").removeAttr("disabled"); + $("#rp_loopalyzermincarbs").removeAttr("disabled"); + $("#rp_loopalyzert1").removeAttr("disabled"); + $("#rp_loopalyzert2").removeAttr("disabled"); + $("#rp_loopalyzertimeshiftinput").css('color', 'black'); + } + // Check if there is data in the profiles and render the profiles table if there is + if ($("#rp_loopalyzerprofiles").is(":checked") && (datastorage.profiles && datastorage.profiles.length > 0)) { + $("#loopalyzer-profiles-table").show(); + loopalyzer.renderProfilesTable(datastorage.profiles, daysToShow, client); + } else + $("#loopalyzer-profiles-table").hide(); + + // Pull all necessary treatment information + profile.updateTreatments(datastorage.profileSwitchTreatments, datastorage.tempbasalTreatments, datastorage.combobolusTreatments); + + var carbTreatments = loopalyzer.getCarbTreatments(datastorage,daysToShow); + var insulinTreatments = loopalyzer.getInsulinTreatments(datastorage,daysToShow); + var sgvBin = loopalyzer.getSGVs(datastorage,daysToShow); + var basalsBin = loopalyzer.getBasals(datastorage,daysToShow,profile); + var tempBasalsBin = loopalyzer.getTempBasalDeltas(datastorage,daysToShow,profile); + var iobBin = loopalyzer.getIOBs(datastorage,daysToShow, profile, client, insulinTreatments); + var cobBin = loopalyzer.getCOBs(datastorage,daysToShow, profile, client, carbTreatments); + var predictionsBin = []; + + if ($("#rp_loopalyzerpredictions").is(":checked")) { + predictionsBin = loopalyzer.getPredictions(datastorage,daysToShow,client); + } + + // Prepare an array with the minutes to timeShift each day (0 as default since timeShift is off by default) + var timeShifts = []; + var firstCarbs = []; + var timeShiftStartTime = null; // If timeShifting this is the average time the meals were eaten + var timeShiftStopTime = null; // and this is the start + DIA according to profile + var doTimeShift = false; + daysToShow.forEach(function(){ timeShifts.push(0); firstCarbs.push(NaN) }); + + // Check to see if we are doing timeShift or not + if ($("#rp_loopalyzertimeshift").is(":checked") && daysToShow.length>1) { + var mealMinCarbs = $("#rp_loopalyzermincarbs").val(); + var t1 = $("#rp_loopalyzert1").val(); + var t2 = $("#rp_loopalyzert2").val(); + + if (t2>t1) { + var h1 = t1.split(':')[0]; + var m1 = t1.split(':')[1]; + var h2 = t2.split(':')[0]; + var m2 = t2.split(':')[1]; + + var timeShiftBegin = moment(); + timeShiftBegin.set({'hours':h1, 'minutes':m1, 'seconds':0}); + + var timeShiftEnd = moment(); + timeShiftEnd.set({'hours':h2, 'minutes':m2, 'seconds':0}); + + //Loop through the carb treatments and find the first meal each day + daysToShow.forEach(function(day, dayIndex){ + var timeShiftBegin = moment(day); + var timeShiftEnd = moment(day); + timeShiftBegin.set({'hours':h1, 'minutes':m1, 'seconds':0}); + timeShiftEnd.set({'hours':h2, 'minutes':m2, 'seconds':0}); + + var found = false; + carbTreatments.forEach(function(entry){ + if (!found && entry.amount >= mealMinCarbs) { + var date = moment(entry.date); + if ( (date.isSame(timeShiftBegin,'minute') || date.isAfter(timeShiftBegin,'minute')) && + (date.isSame(timeShiftEnd,'minute') || date.isBefore(timeShiftEnd,'minute')) ) { + var startOfDay = moment(entry.date); + startOfDay.set({'hours':0, 'minutes':0, 'seconds':0}); + var minutesAfterMidnight = date.diff(startOfDay, 'minutes'); + firstCarbs[dayIndex]=minutesAfterMidnight; + found = true; + doTimeShift = true; + } + } + }) + }) + + // Calculate the average starting time, in minutes after midnight + var averageMinutesAfterMidnight = 0, sum = 0, count = 0; + firstCarbs.forEach(function(minutesAfterMidnight){ + if (minutesAfterMidnight) { // Avoid NaN + sum += minutesAfterMidnight; + count++; + } + }); + var averageMinutesAfterMidnight = Math.round(sum / count); + + var dia = profile.getDIA(); + if (!dia || dia <= 0) + dia=6; // Default to 6h if DIA not set in profile + timeShiftStartTime = moment(todayJSON); + timeShiftStartTime.minutes(averageMinutesAfterMidnight); + timeShiftStopTime = moment(todayJSON); + if (averageMinutesAfterMidnight + dia*60 < 24*60) + timeShiftStopTime.minutes(averageMinutesAfterMidnight + dia*60); // If not beyond midnight, stop at end of DIA + else + timeShiftStopTime.minutes(24*60-1); // If beyond midnight, stop at midnight + + // Compute the timeShift (+ / -) that we should add to each entry (sgv, iob, carbs, etc) for each day + firstCarbs.forEach(function(minutesAfterMidnight,index){ + if (minutesAfterMidnight) { // Avoid NaN + var delta = Math.round(averageMinutesAfterMidnight - minutesAfterMidnight); + timeShifts[index]=delta; + } + }); + + if (doTimeShift) { + loopalyzer.timeShiftBins(sgvBin, timeShifts); + loopalyzer.timeShiftBins(basalsBin, timeShifts); + loopalyzer.timeShiftBins(tempBasalsBin, timeShifts); + loopalyzer.timeShiftBins(iobBin, timeShifts); + loopalyzer.timeShiftBins(cobBin, timeShifts); + loopalyzer.timeShiftBins(predictionsBin, timeShifts); + loopalyzer.timeShiftSingleBin(carbTreatments, daysToShow, timeShifts); + loopalyzer.timeShiftSingleBin(insulinTreatments, daysToShow, timeShifts); + } + } else { + console.log('Loopalyzer - Timeshift end must be later than beginning.'); + } + } + + // After timeShift code block, get the average values + var sgvAvg = loopalyzer.avg(sgvBin); + var basalsAvg = loopalyzer.avg(basalsBin); + var tempBasalsAvg = loopalyzer.avg(tempBasalsBin); + var iobAvg = loopalyzer.avg(iobBin); + var cobAvg = loopalyzer.avg(cobBin); + var predictionsAvg = loopalyzer.avg(predictionsBin); + + var high = options.targetHigh; + var low = options.targetLow; + + // Set up the charts basics + function tickFormatter(val,axis) { + if (val <= axis.min) { return ''; } + if (val >= axis.max) { return ''; } + return val + ''; + } + + var tickColor = '#DDDDDD'; + var basalColor = '#33A0FF'; + var glucoseColor = '#33AA33'; + var predictionsColor = '#8E1578'; + var glucoseRangeColor = '#D6FFD6'; + var insulinColor = '#FF7000'; + var carbColor = '#23D820'; + var timeShiftBackgroundColor = "#F3F3F3"; + var barWidth = (24 * 60 * 60 * 1000 / 288); + var borderWidth = 1; + var labelWidth = 25; + var xaxisCfg = { + mode: 'time', + timezone: 'browser', + timeformat: '%H:%M', + tickColor: tickColor, + tickSize: [1, "hour"], + font: { size: 0 } + }; + + var hiddenAxis = { + position: "right", + show: true, + labelWidth: 10, + tickColor: "#FFFFFF", + font: { size: 0} + } + + // For drawing the carbs and insulin treatments + var markings = []; + var markingColor = "#000000"; + + + // Chart 1: Basal + markings = []; + if (doTimeShift) + markings.push( { xaxis: { from: timeShiftStartTime.toDate(), to: timeShiftStopTime.toDate()}, color: timeShiftBackgroundColor } ); + var chartBasalData = [{ + data: basalsAvg, + label: translate('Basal profile'), + id: 'basals', + color: basalColor, + points: { show: false }, + bars: { show: true, fill: true, barWidth: barWidth }, + yaxis: 1 + }]; + var chartBasalOptions = { + xaxis: xaxisCfg, + yaxes: [{ + tickColor: tickColor, + labelWidth: labelWidth, + tickFormatter: function(val,axis) { return tickFormatter(val,axis); } + }, + hiddenAxis], + grid: { + borderWidth: borderWidth, + markings: markings + } + }; + $.plot( '#loopalyzer-basal', chartBasalData, chartBasalOptions ); + + + // Chart 2: Blood glucose + markings = []; + if (doTimeShift) + markings.push( { xaxis: { from: timeShiftStartTime.toDate(), to: timeShiftStopTime.toDate()}, color: timeShiftBackgroundColor } ); + markings.push({ yaxis: { from: low, to: high }, color: glucoseRangeColor }); + + var chartBGData = [{ + label: translate('Blood glucose'), + data: sgvAvg, + id: 'glucose', + color: glucoseColor, + points: { show: false }, + lines: { show: true } + }]; + if (predictionsAvg && predictionsAvg.length>0) { + chartBGData.push({ + label: translate('Predictions'), + data: predictionsAvg, + id: 'predictions', + color: predictionsColor, + points: { show: true, fill: true, radius: 0.75, fillColor: predictionsColor }, + lines: { show: false } + }); + } + var chartBGOptions = { + xaxis: xaxisCfg, + yaxes: [{ + min: 0, + max: options.units === 'mmol' ? 20 : 400, + tickColor: tickColor, + labelWidth: labelWidth, + tickFormatter: function(val,axis) { return tickFormatter(val,axis); } + }, + hiddenAxis], + grid: { + borderWidth: borderWidth, + markings: markings + } + }; + $.plot( '#loopalyzer-bg', chartBGData, chartBGOptions ); + + + // Chart 3: Delta temp basals + markings = []; + if (doTimeShift) + markings.push( { xaxis: { from: timeShiftStartTime.toDate(), to: timeShiftStopTime.toDate()}, color: timeShiftBackgroundColor } ); + markings.push( { yaxis: { from: 0, to: 0 }, color: insulinColor, lineWidth: 2 }); + + var chartTempBasalData = [{ + data: tempBasalsAvg, + label: translate('Temp basal delta'), + id: 'tempBasals', + color: insulinColor, + points: { show: false }, + bars: { show: true, barWidth: barWidth } + }]; + var chartTempBasalOptions = { + xaxis: xaxisCfg, + yaxes: [{ + tickColor: tickColor, + labelWidth: labelWidth, + tickFormatter: function(val,axis) { return tickFormatter(val,axis); } + }, + hiddenAxis], + grid: { + borderWidth: borderWidth, + markings: markings + } + }; + $.plot( '#loopalyzer-tempbasal', chartTempBasalData, chartTempBasalOptions ); + + + // Chart 4: IOB + markings = []; + if (doTimeShift) + markings.push( { xaxis: { from: timeShiftStartTime.toDate(), to: timeShiftStopTime.toDate()}, color: timeShiftBackgroundColor } ); + insulinTreatments.forEach(function(treatment){ + var startDate = moment(treatment.date); + var endDate = moment(treatment.date); + startDate.set(todayJSON); + endDate.set(todayJSON); + endDate.add(5, 'minutes'); + markings.push( { xaxis: { from: startDate.toDate(), to: endDate.toDate()}, yaxis: { from: 0, to: treatment.amount }, color: markingColor } ); + }) + + var chartIOBData = [{ + data: iobAvg, + label: translate('IOB'), + id: 'iobs', + color: insulinColor, + points: { show: false }, + bars: { show: true, fill: true, barWidth: barWidth } + }]; + var chartIOBOptions = { + xaxis: xaxisCfg, + yaxes: [{ + tickColor: tickColor, + labelWidth: labelWidth, + tickFormatter: function(val,axis) { return tickFormatter(val,axis); } + }, + hiddenAxis], + grid: { + borderWidth: borderWidth, + markings: markings + } + }; + $.plot( '#loopalyzer-iob', chartIOBData, chartIOBOptions ); + + + // Chart 5: COB + markings = []; + if (doTimeShift) + markings.push( { xaxis: { from: timeShiftStartTime.toDate(), to: timeShiftStopTime.toDate()}, color: timeShiftBackgroundColor } ); + carbTreatments.forEach(function(treatment){ + var startDate = moment(treatment.date); + var endDate = moment(treatment.date); + startDate.set(todayJSON); + endDate.set(todayJSON); + endDate.add(5, 'minutes'); + markings.push( { xaxis: { from: startDate.toDate(), to: endDate.toDate()}, yaxis: { from: 0, to: treatment.amount }, color: markingColor } ); + }) + delete xaxisCfg.font; // Remove the font config so HH:MM is shown on the last chart + + var chartCOBData = [{ + data: cobAvg, + label: translate('COB'), + id: 'cobs', + color: carbColor, + points: { show: false }, + bars: { show: true, fil: true, barWidth: barWidth } + }]; + var chartCOBOptions = { + xaxis: xaxisCfg, + yaxes: [{ + tickColor: tickColor, + labelWidth: labelWidth, + tickFormatter: function(val,axis) { return tickFormatter(val,axis); } + }, + hiddenAxis], + grid: { + borderWidth: borderWidth, + markings: markings + } + }; + $.plot( '#loopalyzer-cob', chartCOBData, chartCOBOptions ); + +}; diff --git a/lib/report_plugins/weektoweek.js b/lib/report_plugins/weektoweek.js new file mode 100644 index 00000000000..3ff84a78639 --- /dev/null +++ b/lib/report_plugins/weektoweek.js @@ -0,0 +1,333 @@ +'use strict'; + +var _ = require('lodash'); +var moment = window.moment; +var d3 = (global && global.d3) || require('d3'); + +var dayColors = [ + 'rgb(73, 22, 153)' + , 'rgb(34, 201, 228)' + , 'rgb(0, 153, 123)' + , 'rgb(135, 135, 228)' + , 'rgb(135, 49, 204)' + , 'rgb(36, 36, 228)' + , 'rgb(0, 234, 188)' +]; + +var weektoweek = { + name: 'weektoweek' + , label: 'Week to week' + , pluginType: 'report' +}; + +function init() { + return weektoweek; +} + +module.exports = init; + +weektoweek.html = function html(client) { + var translate = client.translate; + var ret = + '

' + translate('Week to week') + '

' + + '' + translate('To see this report, press SHOW while in this view') + '
' + + ' '+translate('Size') + + ' ' + + '
' + + translate('Scale') + ': ' + + '' + + translate('Linear') + + '' + + translate('Logarithmic') + + '
' + + '
' + + '
' + ; + return ret; +}; + +weektoweek.prepareHtml = function weektoweekPrepareHtml(weekstoshow) { + $('#weektoweekcharts').html(''); + + var colorIdx = 0; + + var legend = ''; + + legend += ''; + legend += ''; + legend += ''; + legend += ''; + legend += ''; + legend += ''; + legend += ''; + legend += '
SundayMondayTuesdayWednesday
ThursdayFridaySaturday
'; + + $('#weektoweekcharts').append($(legend)); + + weekstoshow.forEach(function eachWeek(d) { + $('#weektoweekcharts').append($('
')); + }); +}; + +weektoweek.report = function report_weektoweek(datastorage, sorteddaystoshow, options) { + var Nightscout = window.Nightscout; + var client = Nightscout.client; + var report_plugins = Nightscout.report_plugins; + + var TOOLTIP_TRANS_MS = 300; + + var padding = { top: 15, right: 22, bottom: 30, left: 35 }; + + var weekstoshow = [ ]; + + var startDay = moment(sorteddaystoshow[0] + ' 00:00:00'); + + sorteddaystoshow.forEach( function eachDay(day) { + var weekNum = Math.abs(moment(day + ' 00:00:00').diff(startDay, 'weeks')); + + if (typeof weekstoshow[weekNum] === 'undefined') { + weekstoshow[weekNum] = [ ]; + } + + weekstoshow[weekNum].push(day); + }); + + weekstoshow = weekstoshow.map(function orderWeek(week) { + return _.sortBy(week); + }); + + weektoweek.prepareHtml(weekstoshow); + + weekstoshow.forEach( function eachWeek(week) { + var sgvData = [ ]; + var weekStart = moment(week[0] + ' 00:00:00'); + + week.forEach( function eachDay(day) { + var dayNum = Math.abs(moment(day + ' 00:00:00').diff(weekStart, 'days')); + + datastorage[day].sgv.forEach ( function eachSgv(sgv) { + var sgvWeekday = moment(sgv.date).day(); + var sgvColor = dayColors[sgvWeekday]; + + if (sgv.color === 'gray') { + sgvColor = sgv.color; + } + + sgvData.push( { + 'color': sgvColor + , 'date': moment(sgv.date).subtract(dayNum, 'days').toDate() + , 'filtered': sgv.filtered + , 'mills': sgv.mills - dayNum * 24*60*60000 + , 'noise': sgv.noise + , 'sgv': sgv.sgv + , 'type': sgv.type + , 'unfiltered': sgv.unfiltered + , 'y': sgv.y + }); + }); + }); + + drawChart(week, sgvData, options); + }); + + function timeTicks(n, i) { + var t12 = [ + '12am', '', '2am', '', '4am', '', '6am', '', '8am', '', '10am', '', + '12pm', '', '2pm', '', '4pm', '', '6pm', '', '8pm', '', '10pm', '', '12am' + ]; + if (Nightscout.client.settings.timeFormat === 24) { + return ('00' + i).slice(-2); + } else { + return t12[i]; + } + } + + function drawChart(week, sgvData, options) { + var tickValues + , charts + , context + , xScale2, yScale2 + , xAxis2, yAxis2 + , dateFn = function (d) { return new Date(d.date); }; + + tickValues = client.ticks(client, { + scaleY: options.weekscale === report_plugins.consts.SCALE_LOG ? 'log' : 'linear' + , targetTop: options.targetHigh + , targetBottom: options.targetLow + }); + + // add defs for combo boluses + var dashWidth = 5; + d3.select('body').append('svg') + .append('defs') + .append('pattern') + .attr('id', 'hash') + .attr('patternUnits', 'userSpaceOnUse') + .attr('width', 6) + .attr('height', 6) + .attr('x', 0) + .attr('y', 0) + .append('g') + .style('fill', 'none') + .style('stroke', '#0099ff') + .style('stroke-width', 2) + .append('path').attr('d', 'M0,0 l' + dashWidth + ',' + dashWidth) + .append('path').attr('d', 'M' + dashWidth + ',0 l-' + dashWidth + ',' + dashWidth); + + // create svg and g to contain the chart contents + charts = d3.select('#weektoweekchart-' + week[0] + '-' + week[week.length-1]).html( + ''+ + report_plugins.utils.localeDate(week[0])+ + '-' + + report_plugins.utils.localeDate(week[week.length-1])+ + '
' + ).append('svg'); + + charts.append('rect') + .attr('width', '100%') + .attr('height', '100%') + .attr('fill', 'WhiteSmoke'); + + context = charts.append('g'); + + // define the parts of the axis that aren't dependent on width or height + xScale2 = d3.time.scale() + .domain(d3.extent(sgvData, dateFn)); + + if (options.weekscale === report_plugins.consts.SCALE_LOG) { + yScale2 = d3.scale.log() + .domain([client.utils.scaleMgdl(36), client.utils.scaleMgdl(420)]); + } else { + yScale2 = d3.scale.linear() + .domain([client.utils.scaleMgdl(36), client.utils.scaleMgdl(420)]); + } + + xAxis2 = d3.svg.axis() + .scale(xScale2) + .tickFormat(timeTicks) + .ticks(24) + .orient('bottom'); + + yAxis2 = d3.svg.axis() + .scale(yScale2) + .tickFormat(d3.format('d')) + .tickValues(tickValues) + .orient('left'); + + // get current data range + var dataRange = d3.extent(sgvData, dateFn); + + // get the entire container height and width subtracting the padding + var chartWidth = options.weekwidth - padding.left - padding.right; + var chartHeight = options.weekheight - padding.top - padding.bottom; + + //set the width and height of the SVG element + charts.attr('width', options.weekwidth) + .attr('height', options.weekheight); + + // ranges are based on the width and height available so reset + xScale2.range([0, chartWidth]); + yScale2.range([chartHeight,0]); + + // add target BG rect + context.append('rect') + .attr('x', xScale2(dataRange[0])+padding.left) + .attr('y', yScale2(options.targetHigh)+padding.top) + .attr('width', xScale2(dataRange[1]- xScale2(dataRange[0]))) + .attr('height', yScale2(options.targetLow)-yScale2(options.targetHigh)) + .style('fill', '#D6FFD6') + .attr('stroke', 'grey'); + + // create the x axis container + context.append('g') + .attr('class', 'x axis'); + + // create the y axis container + context.append('g') + .attr('class', 'y axis'); + + context.select('.y') + .attr('transform', 'translate(' + (padding.left) + ',' + padding.top + ')') + .style('stroke', 'black') + .style('shape-rendering', 'crispEdges') + .style('fill', 'none') + .call(yAxis2); + + // if first run then just display axis with no transition + context.select('.x') + .attr('transform', 'translate(' + padding.left + ',' + (chartHeight + padding.top) + ')') + .style('stroke', 'black') + .style('shape-rendering', 'crispEdges') + .style('fill', 'none') + .call(xAxis2); + + _.each(tickValues, function (n, li) { + context.append('line') + .attr('class', 'high-line') + .attr('x1', xScale2(dataRange[0])+padding.left) + .attr('y1', yScale2(tickValues[li])+padding.top) + .attr('x2', xScale2(dataRange[1])+padding.left) + .attr('y2', yScale2(tickValues[li])+padding.top) + .style('stroke-dasharray', ('1, 5')) + .attr('stroke', 'grey'); + }); + + // bind up the context chart data to an array of circles + var contextCircles = context.selectAll('circle') + .data(sgvData); + + function prepareContextCircles(sel) { + var badData = []; + sel.attr('cx', function (d) { + return xScale2(d.date) + padding.left; + }) + .attr('cy', function (d) { + if (isNaN(d.sgv)) { + badData.push(d); + return yScale2(client.utils.scaleMgdl(450) + padding.top); + } else { + return yScale2(d.sgv) + padding.top; + } + }) + .attr('fill', function (d) { + if (d.color === 'gray') { + return 'transparent'; + } + return d.color; + }) + .style('opacity', function () { return 0.5 }) + .attr('stroke-width', function (d) {if (d.type === 'mbg') { return 2; } else { return 0; }}) + .attr('stroke', function () { return 'black'; }) + .attr('r', function(d) { + if (d.type === 'mbg') { + return 4; + } else { + return 2 + (options.weekwidth - 800) / 400; + } + }) + .on('mouseout', hideTooltip); + + if (badData.length > 0) { + console.warn('Bad Data: isNaN(sgv)', badData); + } + return sel; + } + + // if new circle then just display + prepareContextCircles(contextCircles.enter().append('circle')); + + contextCircles.exit() + .remove(); + } + + function hideTooltip ( ) { + client.tooltip.transition() + .duration(TOOLTIP_TRANS_MS) + .style('opacity', 0); + } +}; diff --git a/lib/server/activity.js b/lib/server/activity.js index f7df9f48268..45b77e60587 100644 --- a/lib/server/activity.js +++ b/lib/server/activity.js @@ -9,6 +9,11 @@ function storage (env, ctx) { function create (obj, fn) { obj.created_at = (new Date( )).toISOString( ); api().insert(obj, function (err, doc) { + if (err != null && err.message) { + console.log('Activity data insertion error', err.message); + fn(err.message, null); + return; + } fn(null, doc.ops); }); } @@ -56,7 +61,8 @@ function storage (env, ctx) { } function remove (_id, fn) { - return api( ).remove({ '_id': new ObjectID(_id) }, fn); + var objId = new ObjectID(_id); + return api( ).remove({ '_id': objId }, fn); } function api ( ) { diff --git a/lib/server/bootevent.js b/lib/server/bootevent.js index f1580932ecd..ab8a55f18ac 100644 --- a/lib/server/bootevent.js +++ b/lib/server/bootevent.js @@ -2,10 +2,46 @@ var _ = require('lodash'); -var UPDATE_THROTTLE = 1000; +var UPDATE_THROTTLE = 5000; function boot (env, language) { + ////////////////////////////////////////////////// + // Check Node version. + // Latest Node 8 LTS and Latest Node 10 LTS are recommended and supported. + // Latest Node version on Azure is tolerated, but not recommended + // Other versions will not start + // More explicit: + // < 8 does not work, not supported + // >= 8.15.0 works, supported and recommended + // == 9.x does not work, not supported + // == 10.14.1 works, not fully supported and not recommended (Azure version) + // == 10.14.2 does not work, not supported and not recommended, + // >= 10.15.1 works, supported and recommended + // >= 11.6.0 does not work, not recommended, will not be supported. We only support Node LTS releases + /////////////////////////////////////////////////// + function checkNode (ctx, next) { + var semver = require('semver'); + var nodeVersion = process.version; + + if ( semver.satisfies(nodeVersion, '^8.15.0') || semver.satisfies(nodeVersion, '^10.15.1')) { + //Latest Node 8 LTS and Latest Node 10 LTS are recommended and supported. + console.debug('Node version ' + nodeVersion + ' is supported'); + next(); + } + else if ( semver.eq(nodeVersion, '10.14.1')) { + //Latest Node version on Azure is tolerated, but not recommended + console.log('WARNING: Node version v10.14.1 and Microsoft Azure are not recommended.'); + console.log('WARNING: Please migrate to another hosting provider. Your Node version is outdated and insecure'); + next(); + } else { + // Other versions will not start + console.log( 'ERROR: Node version ' + nodeVersion + ' is not supported. Please upgrade your Node'); + process.exit(1); + } + } + + function checkEnv (ctx, next) { ctx.language = language; if (env.err) { @@ -105,7 +141,7 @@ function boot (env, language) { if (hasBootErrors(ctx)) { return next(); } - + ctx.levels = require('../levels'); ctx.levels.translate = ctx.language.translate; @@ -179,6 +215,7 @@ function boot (env, language) { }); ctx.bus.on('data-loaded', function updatePlugins ( ) { + console.info('reloading sandbox data'); var sbx = require('../sandbox')().serverInit(env, ctx); ctx.plugins.setProperties(sbx); ctx.notifications.initRequests(); @@ -227,6 +264,7 @@ function boot (env, language) { } return require('bootevent')( ) + .acquire(checkNode) .acquire(checkEnv) .acquire(augmentSettings) .acquire(setupStorage) diff --git a/lib/server/devicestatus.js b/lib/server/devicestatus.js index 1939450adb5..e74c0124841 100644 --- a/lib/server/devicestatus.js +++ b/lib/server/devicestatus.js @@ -10,6 +10,11 @@ function storage (collection, ctx) { obj.created_at = (new Date()).toISOString(); } api().insert(obj, function (err, doc) { + if (err != null && err.message) { + console.log('Error inserting the device status object', err.message); + fn(err.message, null); + return; + } fn(null, doc.ops); ctx.bus.emit('data-received'); }); @@ -59,14 +64,8 @@ function storage (collection, ctx) { ).toArray(toArray); } - function remove (_id, fn) { - var filter; - if (_id === '*') { - filter = {}; - } else { - filter = { '_id': new ObjectID(_id) }; - } - return api( ).remove(filter, fn); + function remove (opts, fn) { + return api( ).remove(query_for(opts), fn); } function api() { diff --git a/lib/server/entries.js b/lib/server/entries.js index 72cd009f607..84f8f234bfa 100644 --- a/lib/server/entries.js +++ b/lib/server/entries.js @@ -1,7 +1,6 @@ 'use strict'; var es = require('event-stream'); -var sgvdata = require('sgvdata'); var find_options = require('./query'); var ObjectID = require('mongodb').ObjectID; @@ -46,7 +45,11 @@ function storage(env, ctx) { } function remove (opts, fn) { - api( ).remove(query_for(opts), fn); + api( ).remove(query_for(opts), function (err, stat) { + //TODO: this is triggering a read from Mongo, we can do better + ctx.bus.emit('data-received'); + fn(err, stat); + }); } // return writable stream to lint each sgv record passing through it @@ -75,8 +78,6 @@ function storage(env, ctx) { //function update (fn) { //} // - //function remove (fn) { - //} // store new documents using the storage mechanism function create (docs, fn) { @@ -121,7 +122,6 @@ function storage(env, ctx) { // Expose all the useful functions api.list = list; - api.echo = sgvdata.sync.json.echo; api.map = map; api.create = create; api.remove = remove; diff --git a/lib/server/food.js b/lib/server/food.js index 18a293690bf..92c41843f7b 100644 --- a/lib/server/food.js +++ b/lib/server/food.js @@ -6,6 +6,11 @@ function storage (env, ctx) { function create (obj, fn) { obj.created_at = (new Date( )).toISOString( ); api().insert(obj, function (err, doc) { + if (err != null && err.message) { + console.log('Data insertion error', err.message); + fn(err.message, null); + return; + } fn(null, doc.ops); }); } @@ -36,7 +41,8 @@ function storage (env, ctx) { } function remove (_id, fn) { - return api( ).remove({ '_id': new ObjectID(_id) }, fn); + var objId = new ObjectID(_id); + return api( ).remove({ '_id': objId }, fn); } diff --git a/lib/server/mqtt.js b/lib/server/mqtt.js deleted file mode 100644 index 0a4058e1a8e..00000000000 --- a/lib/server/mqtt.js +++ /dev/null @@ -1,317 +0,0 @@ -'use strict'; - -var es = require('event-stream'); -var Long = require('long'); -var decoders = require('sgvdata/lib/protobuf'); -var direction = require('sgvdata/lib/utils').direction; -var moment = require('moment'); -var url = require('url'); - -function init (env, ctx) { - - function mqtt ( ) { - return mqtt; - } - var info = url.parse(env.MQTT_MONITOR); - var username = info.auth.split(':').slice(0, -1).join(''); - var shared_topic = '/downloads/' + username + '/#'; - var alias_topic = '/downloads/' + username + '/protobuf'; - var notification_topic = '/notifications/' + username + '/json'; - env.mqtt_shared_topic = shared_topic; - - mqtt.client = connect(env); - var downloads = mqtt.downloads = downloader(); - - if (mqtt.client) { - listenForMessages(ctx); - } - - mqtt.every = every; - mqtt.entries = process(); - - //expose for tests that don't need to connect - mqtt.sgvSensorMerge = sgvSensorMerge; - - function listenForMessages ( ) { - mqtt.client.on('message', function (topic, msg) { - console.log('topic', topic); - // XXX: ugly hack - if (topic === alias_topic) { - topic = '/downloads/protobuf'; - } - - console.log(topic, 'on message', 'msg', msg.length); - switch (topic) { - case '/uploader': - console.log({type: topic, msg: msg.toString()}); - break; - case '/downloads/protobuf': - downloadProtobuf(msg, topic, downloads, ctx); - break; - - default: - console.log(topic, 'on message', 'msg', msg); - // ctx.entries.write(msg); - break; - } - }); - } - - mqtt.emitNotification = function emitNotification(notify) { - console.info('Publishing notification to mqtt: ', notify); - [notification_topic, '/notifications/json'].forEach(function iter_notify (topic) { - mqtt.client.publish(topic, JSON.stringify(notify), function mqttCallback (err) { - if (err) { - console.error('Unable to publish notification to MQTT', err); - } - }); - }); - }; - - return mqtt(); -} - -function connect (env) { - var uri = env.MQTT_MONITOR; - var shared_topic = env.mqtt_shared_topic; - if (!uri) { - return null; - } - - var opts = { - encoding: 'binary', - clean: false, - clientId: env.mqtt_client_id - }; - var client = require('mqtt').connect(uri, opts); - - function granted () { console.log('granted', arguments); } - - client.subscribe('sgvs'); - client.subscribe('published'); - client.subscribe('/downloads/protobuf', {qos: 2}, granted); - client.subscribe(shared_topic, {qos: 2}, granted); - client.subscribe('/uploader', granted); - client.subscribe('/entries/sgv', granted); - - return client; -} - -function process ( ) { - var stream = es.through( - function _write(data) { - this.push(data); - } - ); - return stream; -} - -function every (storage) { - function iter(item, next) { - storage.create(item, next); - } - - return es.map(iter); -} - -function downloader ( ) { - var opts = { - model: decoders.models.G4Download - , json: function (o) { - return o; - } - , payload: function (o) { - return o; - } - }; - return decoders(opts); -} - -function downloadProtobuf (msg, topic, downloads, ctx) { - var b = new Buffer(msg, 'binary'); - console.log('BINARY', b.length, b.toString('hex')); - var packet; - try { - packet = downloads.parse(b); - if (!packet.type) { - packet.type = topic; - - } - console.log('DOWNLOAD msg', msg.length, packet); - console.log('download SGV', packet.sgv[0]); - console.log('download_timestamp', packet.download_timestamp, new Date(Date.parse(packet.download_timestamp))); - console.log('WRITE TO MONGO'); - var download_timestamp = moment(packet.download_timestamp); - if (packet.download_status === 0) { - es.readArray(sgvSensorMerge(packet)).pipe(ctx.entries.persist(function empty(err, result) { - console.log('DONE WRITING MERGED SGV TO MONGO', err, result); - })); - - iter_mqtt_record_stream(packet, 'cal', toCal) - .pipe(ctx.entries.persist(function empty(err, result) { - console.log('DONE WRITING Cal TO MONGO', err, result.length); - })); - iter_mqtt_record_stream(packet, 'meter', toMeter) - .pipe(ctx.entries.persist(function empty(err, result) { - console.log('DONE WRITING Meter TO MONGO', err, result.length); - })); - } - packet.type = 'download'; - ctx.devicestatus.create({ - uploaderBattery: packet.uploader_battery, - created_at: download_timestamp.toISOString() - }, function empty(err, result) { - console.log('DONE WRITING TO MONGO devicestatus ', result, err); - }); - - ctx.entries.create([ packet ], function empty(err) { - if (err) { - console.log('Error writting to mongo: ', err); - } else { - console.log('Download written to mongo: ', packet); - } - }); - } catch (e) { - console.log('DID NOT PARSE', e); - } -} - -function toSGV (proto, vars) { - vars.sgv = proto.sgv_mgdl; - vars.direction = direction(proto.trend); - vars.noise = proto.noise; - vars.type = 'sgv'; - return vars; -} - -function toCal (proto, vars) { - vars.slope = proto.slope; - vars.intercept = proto.intercept; - vars.scale = proto.scale; - vars.type = 'cal'; - return vars; -} - -function toSensor (proto, vars) { - vars.filtered = new Long(proto.filtered).toInt(); - vars.unfiltered = new Long(proto.unfiltered).toInt(); - vars.rssi = proto.rssi; - vars.type = 'sensor'; - return vars; -} - -function toMeter (proto, result) { - result.type = 'mbg'; - result.mbg = proto.mbg || proto.meter_bg_mgdl; - return result; -} - -function toTimestamp (proto, receiver_time, download_time) { - var record_offset = receiver_time - proto.sys_timestamp_sec; - var record_time = download_time.clone( ).subtract(record_offset, 'second'); - var obj = { - device: 'dexcom' - , date: record_time.unix() * 1000 - , dateString: record_time.format( ) - }; - return obj; -} - -function timestampFactory (packet) { - var receiver_time = packet.receiver_system_time_sec; - var download_time = moment(packet.download_timestamp); - function timestamp (item) { - return toTimestamp(item, receiver_time, download_time.clone( )); - } - return timestamp; -} - -function timeSort (a, b) { - return a.date - b.date; -} - -function sgvSensorMerge (packet) { - var timestamp = timestampFactory(packet); - var sgvs = (packet['sgv'] || []).map(function(sgv) { - var timestamped = timestamp(sgv); - return toSGV(sgv, timestamped); - }).sort(timeSort); - - var sensors = (packet['sensor'] || []).map(function(sensor) { - var timestamped = timestamp(sensor); - return toSensor(sensor, timestamped); - }).sort(timeSort); - - //based on com.nightscout.core.dexcom.Utils#mergeGlucoseDataRecords - var merged = [] - , sgvsLength = sgvs.length - , sensorsLength = sensors.length; - - if (sgvsLength >= 0 && sensorsLength === 0) { - merged = sgvs; - } else { - var smallerLength = Math.min(sgvsLength, sensorsLength); - for (var i = 1; i <= smallerLength; i++) { - var sgv = sgvs[sgvsLength - i]; - var sensor = sensors[sensorsLength - i]; - if (sgv && sensor && Math.abs(sgv.date - sensor.date) < 10000) { - //timestamps are close so merge - sgv.filtered = sensor.filtered; - sgv.unfiltered = sensor.unfiltered; - sgv.rssi = sensor.rssi; - merged.push(sgv); - } else { - console.info('mismatch or missing, sgv: ', sgv, ' sensor: ', sensor); - //timestamps aren't close enough so add both - if (sgv) { merged.push(sgv); } - //but the sensor will become and sgv now - if (sensor) { - sensor.type = 'sgv'; - merged.push(sensor); - } - } - } - - //any extra sgvs? - if (sgvsLength > smallerLength) { - for (var j = 0; j < sgvsLength - smallerLength; j++) { - var extraSGV = sgvs[j]; - merged.push(extraSGV); - } - } - - //any extra sensors? - if (sensorsLength > smallerLength) { - for (var k = 0; k < sensorsLength - smallerLength; k++) { - var extraSensor = sensors[k]; - //from now on we consider it a sgv - extraSensor.type = 'sgv'; - merged.push(extraSensor); - } - } - - } - - return merged; -} - -function iter_mqtt_record_stream (packet, prop, sync) { - var list = packet[prop]; - console.log('incoming', prop, (list || [ ]).length); - var stream = es.readArray(list || [ ]); - var receiver_time = packet.receiver_system_time_sec; - var download_time = moment(packet.download_timestamp); - function map(item, next) { - var timestamped = toTimestamp(item, receiver_time, download_time.clone( )); - var r = sync(item, timestamped); - if (!('type' in r)) { - r.type = prop; - } - console.log('ITEM', item, 'TO', prop, r); - next(null, r); - } - return stream.pipe(es.map(map)); -} - -init.downloadProtobuf = downloadProtobuf; -module.exports = init; diff --git a/lib/server/profile.js b/lib/server/profile.js index 110f7b64e87..d456b590959 100644 --- a/lib/server/profile.js +++ b/lib/server/profile.js @@ -32,7 +32,8 @@ function storage (collection, ctx) { } function remove (_id, fn) { - api( ).remove({ '_id': new ObjectID(_id) }, fn); + var objId = new ObjectID(_id); + api( ).remove({ '_id': objId }, fn); ctx.bus.emit('data-received'); } diff --git a/lib/server/treatments.js b/lib/server/treatments.js index 0ad9f4e8451..aa8f1e0d8af 100644 --- a/lib/server/treatments.js +++ b/lib/server/treatments.js @@ -96,11 +96,12 @@ function storage (env, ctx) { return find_options(opts, storage.queryOpts); } - - function remove (_id, fn) { - api( ).remove({ '_id': new ObjectID(_id) }, fn); - - ctx.bus.emit('data-received'); + function remove (opts, fn) { + return api( ).remove(query_for(opts), function (err, stat) { + //TODO: this is triggering a read from Mongo, we can do better + ctx.bus.emit('data-received'); + fn(err, stat); + }); } function save (obj, fn) { diff --git a/lib/server/websocket.js b/lib/server/websocket.js index 8143577c48e..11451a50586 100644 --- a/lib/server/websocket.js +++ b/lib/server/websocket.js @@ -226,8 +226,9 @@ function init (env, ctx, server) { return; } + var objId = new ObjectID(data._id); ctx.store.collection(collection).update( - { '_id': new ObjectID(data._id) }, + { '_id': objId }, { $unset: data.data } ); @@ -325,8 +326,9 @@ function init (env, ctx, server) { if (err || array.length > 0) { console.log(LOG_DEDUP + 'Found similiar', array[0]); array[0].created_at = data.data.created_at; + var objId = new ObjectID(array[0]._id); ctx.store.collection(collection).update( - { '_id': new ObjectID(array[0]._id) }, + { '_id': objId }, { $set: {created_at: data.data.created_at} } ); if (callback) { @@ -338,6 +340,10 @@ function init (env, ctx, server) { // if not found create new record console.log(LOG_DEDUP + 'Adding new record'); ctx.store.collection(collection).insert(data.data, function insertResult (err, doc) { + if (err != null && err.message) { + console.log('treatments data insertion error: ', err.message); + return; + } if (callback) { callback(doc.ops); } @@ -367,6 +373,10 @@ function init (env, ctx, server) { } }); ctx.store.collection(collection).insert(data.data, function insertResult (err, doc) { + if (err != null && err.message) { + console.log('devicestatus insertion error: ', err.message); + return; + } if (callback) { callback(doc.ops); } @@ -374,6 +384,10 @@ function init (env, ctx, server) { }); } else { ctx.store.collection(collection).insert(data.data, function insertResult (err, doc) { + if (err != null && err.message) { + console.log(data.collection + ' insertion error: ', err.message); + return; + } if (callback) { callback(doc.ops); } @@ -398,8 +412,9 @@ function init (env, ctx, server) { return; } + var objId = new ObjectID(data._id); ctx.store.collection(collection).remove( - { '_id': new ObjectID(data._id) } + { '_id': objId } ); if (callback) { diff --git a/lib/settings.js b/lib/settings.js index ae5ce30e484..e4d15f99f63 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -41,7 +41,12 @@ function init ( ) { , bgTargetTop: 180 , bgTargetBottom: 80 , bgLow: 55 - } + }, + insecureUseHttp: false, + secureHstsHeader: true, + secureHstsHeaderIncludeSubdomains: false, + secureHstsHeaderPreload: false, + secureCsp: false }; var valueMappers = { @@ -59,6 +64,10 @@ function init ( ) { , alarmTimeagoUrgent: mapTruthy , alarmWarnMins: mapNumberArray , timeFormat: mapNumber + , insecureUseHttp: mapTruthy + , secureHstsHeader: mapTruthy + , secureCsp: mapTruthy + }; function mapNumberArray (value) { diff --git a/lib/storage/mongo-storage.js b/lib/storage/mongo-storage.js index b132e42dc4c..275cde6eb8a 100644 --- a/lib/storage/mongo-storage.js +++ b/lib/storage/mongo-storage.js @@ -25,7 +25,8 @@ function init (env, cb, forceNewConnection) { console.log('Setting up new connection to MongoDB'); var timeout = 30 * 1000; - var options = { reconnectInterval: 10000, reconnectTries: 500, connectTimeoutMS: timeout, socketTimeoutMS: timeout }; + var options = { reconnectInterval: 10000, reconnectTries: 500, connectTimeoutMS: timeout, + socketTimeoutMS: timeout, useNewUrlParser: true }; var connect_with_retry = function(i) { return MongoClient.connect(env.storageURI, options, function connected(err, client) { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f8d6d9b757c..faa7b310f6d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,393 +1,197 @@ { - "name": "Nightscout", - "version": "0.10.3-master-20180805", + "name": "nightscout", + "version": "0.11.1", "lockfileVersion": 1, "requires": true, "dependencies": { "@webassemblyjs/ast": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz", - "integrity": "sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz", + "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz", - "integrity": "sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz", + "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz", - "integrity": "sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz", + "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz", - "integrity": "sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==", - "dev": true, - "requires": { - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz", + "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==", + "dev": true }, "@webassemblyjs/helper-code-frame": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz", - "integrity": "sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz", + "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.5.13" + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/helper-fsm": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz", - "integrity": "sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz", + "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz", - "integrity": "sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz", + "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==", + "dev": true }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz", - "integrity": "sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz", + "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz", - "integrity": "sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz", + "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11" } }, "@webassemblyjs/ieee754": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz", - "integrity": "sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz", + "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", "dev": true, "requires": { - "ieee754": "^1.1.11" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz", - "integrity": "sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz", + "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==", "dev": true, "requires": { - "long": "4.0.0" - }, - "dependencies": { - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true - } + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/utf8": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz", - "integrity": "sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz", + "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz", - "integrity": "sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/helper-wasm-section": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "@webassemblyjs/wast-printer": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz", + "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/helper-wasm-section": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-opt": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/wasm-gen": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz", - "integrity": "sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz", + "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wasm-opt": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz", - "integrity": "sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz", + "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11" } }, "@webassemblyjs/wasm-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz", - "integrity": "sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz", + "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wast-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz", - "integrity": "sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz", + "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/floating-point-hex-parser": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-code-frame": "1.5.13", - "@webassemblyjs/helper-fsm": "1.5.13", - "long": "^3.2.0", - "mamacro": "^0.0.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/floating-point-hex-parser": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-code-frame": "1.7.11", + "@webassemblyjs/helper-fsm": "1.7.11", + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz", - "integrity": "sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz", + "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "long": "^3.2.0" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11", + "@xtuc/long": "4.2.1" } }, - "@webpack-contrib/config-loader": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@webpack-contrib/config-loader/-/config-loader-1.2.1.tgz", - "integrity": "sha512-C7XsS6bXft0aRlyt7YCLg+fm97Mb3tWd+i5fVVlEl0NW5HKy8LoXVKj3mB7ECcEHNEEdHhgzg8gxP+Or8cMj8Q==", - "dev": true, - "requires": { - "@webpack-contrib/schema-utils": "^1.0.0-beta.0", - "chalk": "^2.1.0", - "cosmiconfig": "^5.0.2", - "is-plain-obj": "^1.1.0", - "loud-rejection": "^1.6.0", - "merge-options": "^1.0.1", - "minimist": "^1.2.0", - "resolve": "^1.6.0", - "webpack-log": "^1.1.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, - "@webpack-contrib/schema-utils": { - "version": "1.0.0-beta.0", - "resolved": "https://registry.npmjs.org/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz", - "integrity": "sha512-LonryJP+FxQQHsjGBi6W786TQB1Oym+agTpY0c+Kj8alnIw+DLUJb6SI8Y1GHGhLCH1yPRrucjObUmxNICQ1pg==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chalk": "^2.3.2", - "strip-ansi": "^4.0.0", - "text-table": "^0.2.0", - "webpack-log": "^1.1.2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "@xtuc/long": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz", + "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", + "dev": true + }, + "abab": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" }, "abbrev": { "version": "1.0.9", @@ -396,88 +200,80 @@ "dev": true }, "accepts": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "requires": { - "mime-types": "~2.1.11", + "mime-types": "~2.1.18", "negotiator": "0.6.1" } }, "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", - "dev": true + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" }, "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", + "dev": true + }, + "acorn-globals": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz", + "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==", "requires": { - "acorn": "^5.0.0" + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" + }, + "dependencies": { + "acorn": { + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.7.tgz", + "integrity": "sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==" + } } }, + "acorn-walk": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz", + "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==" + }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" }, "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.8.1.tgz", + "integrity": "sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" + "uri-js": "^4.2.2" } }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - }, - "dependencies": { - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - } - } + "ajv-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", + "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", + "dev": true }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" + "ajv-keywords": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz", + "integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==", + "dev": true }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, - "requires": { - "string-width": "^2.0.0" - } + "optional": true }, "ansi-regex": { "version": "2.1.1", @@ -497,6 +293,17 @@ "requires": { "micromatch": "^3.1.4", "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } } }, "aproba": { @@ -506,9 +313,10 @@ "dev": true }, "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -534,14 +342,7 @@ "array-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, "array-flatten": { "version": "1.1.1", @@ -563,19 +364,12 @@ "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "colour": "~0.7.1", - "optjs": "~3.2.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { @@ -615,6 +409,11 @@ } } }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -643,28 +442,20 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", - "requires": { - "browserslist": "^1.7.6", - "caniuse-db": "^1.0.30000634", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^5.2.16", - "postcss-value-parser": "^3.2.3" - } + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, "babel-code-frame": { "version": "6.26.0", @@ -684,7 +475,8 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true }, "base": { "version": "0.11.2", @@ -738,12 +530,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -767,7 +553,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -790,83 +575,38 @@ "callsite": "1.0.0" } }, - "bfj-node4": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.3.1.tgz", - "integrity": "sha512-SOmOsowQWfXc7ybFARsK3C4MCOWzERaOMV/Fl3Tgjs+5dJWyzo3oa127jL44eMbQiAN17J7SvAs2TRxEScTUmg==", + "bfj": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz", + "integrity": "sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==", "dev": true, "requires": { "bluebird": "^3.5.1", "check-types": "^7.3.0", + "hoopy": "^0.1.2", "tryer": "^1.0.0" - }, - "dependencies": { - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - } } }, "big.js": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", - "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz", + "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==", "dev": true }, - "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", - "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "blob": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", - "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=" + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", + "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" }, "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", + "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", "dev": true }, "bn.js": { @@ -890,21 +630,6 @@ "qs": "6.5.2", "raw-body": "2.3.3", "type-is": "~1.6.16" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" - } } }, "bootevent": { @@ -915,68 +640,11 @@ "chainsaw": "~0.1.0" } }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -997,10 +665,9 @@ "dev": true }, "browser-process-hrtime": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz", - "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44=", - "dev": true + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", + "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" }, "browser-stdout": { "version": "1.3.1", @@ -1043,14 +710,6 @@ "des.js": "^1.0.0", "inherits": "^2.0.1", "safe-buffer": "^5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } } }, "browserify-rsa": { @@ -1087,19 +746,10 @@ "pako": "~1.0.5" } }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "requires": { - "caniuse-db": "^1.0.30000639", - "electron-to-chromium": "^1.2.7" - } - }, "bson": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz", - "integrity": "sha1-k8ENOeqltYQVy8QFLz5T5WKwtyw=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.0.tgz", + "integrity": "sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==" }, "buffer": { "version": "4.9.1", @@ -1110,6 +760,14 @@ "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + } } }, "buffer-equal-constant-time": { @@ -1118,9 +776,9 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "buffer-from": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", - "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "buffer-xor": { "version": "1.0.3", @@ -1128,63 +786,53 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, - "bufferview": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz", - "integrity": "sha1-ev10pF+Tf6QiodM4wIu/3HbNcl0=" - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, - "bytebuffer": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.1.1.tgz", - "integrity": "sha1-KGuLPxZz43kPX7K+Iu+l61uW25A=", - "requires": { - "bufferview": "~1", - "long": "~1" - }, - "dependencies": { - "long": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-1.2.3.tgz", - "integrity": "sha1-EX/i4rHEU9g+Mid2yNRwY5+qK38=" - } - } - }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", - "dev": true, - "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", + "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", + "dev": true, + "requires": { + "bluebird": "^3.5.3", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", "y18n": "^4.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "cache-base": { @@ -1204,102 +852,26 @@ "unset-value": "^1.0.0" } }, - "callback-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz", - "integrity": "sha1-RwGlEmbwbgbqpx/BcjOCLYdfSQg=", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "> 1.0.0 < 3.0.0" - } - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, - "requires": { - "callsites": "^2.0.0" - } - }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, - "requires": { - "caller-callsite": "^2.0.0" - } - }, "callsite": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true - }, "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "camelcase-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", - "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", - "dev": true, - "requires": { - "camelcase": "^4.1.0", - "map-obj": "^2.0.0", - "quick-lru": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - }, - "caniuse-api": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", - "requires": { - "browserslist": "^1.3.6", - "caniuse-db": "^1.0.30000529", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "caniuse-db": { - "version": "1.0.30000862", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000862.tgz", - "integrity": "sha1-bB4pb4u+Xl6kbwQhXouQ7Y+52o0=" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", + "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", + "dev": true }, - "capture-stack-trace": { + "camelize": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", - "dev": true + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", + "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chainsaw": { "version": "0.1.0", @@ -1335,24 +907,22 @@ "dev": true }, "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.0.tgz", + "integrity": "sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==", "dev": true, "requires": { "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", + "async-each": "^1.0.1", + "braces": "^2.3.2", "glob-parent": "^3.1.0", - "inherits": "^2.0.1", + "inherits": "^2.0.3", "is-binary-path": "^1.0.0", "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", + "normalize-path": "^3.0.0", "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "readdirp": "^2.2.1", + "upath": "^1.1.0" }, "dependencies": { "array-unique": { @@ -1391,9 +961,9 @@ } }, "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true }, "chrome-trace-event": { @@ -1405,12 +975,6 @@ "tslib": "^1.9.0" } }, - "ci-info": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", - "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", - "dev": true - }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -1421,14 +985,6 @@ "safe-buffer": "^5.0.1" } }, - "clap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", - "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", - "requires": { - "chalk": "^1.1.3" - } - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -1453,82 +1009,51 @@ } }, "clean-css": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz", - "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", - "requires": { - "source-map": "0.5.x" - } - }, - "clear-require": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clear-require/-/clear-require-2.0.0.tgz", - "integrity": "sha1-qgH1w1WJMmvVXphp6r2kj4ZEfes=", - "dev": true, - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^2.0.0" - } - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", + "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "requires": { - "restore-cursor": "^2.0.0" + "source-map": "~0.6.0" } }, - "cli-spinners": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", - "dev": true - }, "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, - "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, - "optional": true + "requires": { + "ansi-regex": "^3.0.0" + } } } }, "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" }, - "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", - "requires": { - "q": "^1.1.2" - } + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true }, "collection-visit": { "version": "1.0.0", @@ -1540,80 +1065,36 @@ "object-visit": "^1.0.0" } }, - "color": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", - "requires": { - "clone": "^1.0.2", - "color-convert": "^1.3.0", - "color-string": "^0.3.0" - } - }, "color-convert": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", - "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "requires": { - "color-name": "1.1.1" + "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=" - }, - "color-string": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", - "requires": { - "color-name": "^1.0.0" - } - }, - "colormin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", - "requires": { - "color": "^0.11.0", - "css-color-names": "0.0.4", - "has": "^1.0.1" - } + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "colour": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", - "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" + "colors": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", + "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==" }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", + "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "requires": { "delayed-stream": "~1.0.0" } }, "commander": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==" - }, - "commist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz", - "integrity": "sha1-wMNSUBz29S6RJOPvicmAbiAi6+8=", - "requires": { - "leven": "^1.0.0", - "minimist": "^1.1.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==" }, "commondir": { "version": "1.0.1", @@ -1637,18 +1118,11 @@ "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=" }, "compressible": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz", - "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", + "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", "requires": { - "mime-db": ">= 1.34.0 < 2" - }, - "dependencies": { - "mime-db": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", - "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" - } + "mime-db": ">= 1.36.0 < 2" } }, "compression": { @@ -1663,46 +1137,19 @@ "on-headers": "~1.0.1", "safe-buffer": "5.1.2", "vary": "~1.1.2" - }, - "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" - } - }, - "mime-db": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", - "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" - }, - "mime-types": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", - "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", - "requires": { - "mime-db": "~1.35.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } } }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -1710,20 +1157,6 @@ "typedarray": "^0.0.6" } }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", - "dev": true, - "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, "console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", @@ -1744,6 +1177,11 @@ "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" }, + "content-security-policy-builder": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz", + "integrity": "sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==" + }, "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", @@ -1790,17 +1228,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "cosmiconfig": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.5.tgz", - "integrity": "sha512-94j37OtvxS5w7qr7Ta6dt67tWdnOxigBVN4VnSxNXFez9o18PGQ0D33SchKP17r9LAcWVTYV72G6vDayAUBFIg==", - "dev": true, - "requires": { - "is-directory": "^0.3.1", - "js-yaml": "^3.9.0", - "parse-json": "^4.0.0" - } - }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", @@ -1811,15 +1238,6 @@ "elliptic": "^6.0.0" } }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "dev": true, - "requires": { - "capture-stack-trace": "^1.0.0" - } - }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -1848,12 +1266,14 @@ } }, "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "lru-cache": "^4.0.1", + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" } @@ -1877,49 +1297,29 @@ "randomfill": "^1.0.3" } }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" - }, "css-loader": { - "version": "0.28.11", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz", - "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz", + "integrity": "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==", "requires": { "babel-code-frame": "^6.26.0", "css-selector-tokenizer": "^0.7.0", - "cssnano": "^3.10.0", "icss-utils": "^2.1.0", "loader-utils": "^1.0.2", - "lodash.camelcase": "^4.3.0", - "object-assign": "^4.1.1", - "postcss": "^5.0.6", + "lodash": "^4.17.11", + "postcss": "^6.0.23", "postcss-modules-extract-imports": "^1.2.0", "postcss-modules-local-by-default": "^1.2.0", "postcss-modules-scope": "^1.1.0", "postcss-modules-values": "^1.3.0", "postcss-value-parser": "^3.3.0", "source-list-map": "^2.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", + "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", "requires": { "cssesc": "^0.1.0", "fastparse": "^1.1.1", @@ -1936,79 +1336,17 @@ "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz", "integrity": "sha1-yRlAd+Dr2s1pHV9ZAVudgZ840BU=" }, - "cssnano": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", - "requires": { - "autoprefixer": "^6.3.1", - "decamelize": "^1.1.2", - "defined": "^1.0.0", - "has": "^1.0.1", - "object-assign": "^4.0.1", - "postcss": "^5.0.14", - "postcss-calc": "^5.2.0", - "postcss-colormin": "^2.1.8", - "postcss-convert-values": "^2.3.4", - "postcss-discard-comments": "^2.0.4", - "postcss-discard-duplicates": "^2.0.1", - "postcss-discard-empty": "^2.0.1", - "postcss-discard-overridden": "^0.1.1", - "postcss-discard-unused": "^2.2.1", - "postcss-filter-plugins": "^2.0.0", - "postcss-merge-idents": "^2.1.5", - "postcss-merge-longhand": "^2.0.1", - "postcss-merge-rules": "^2.0.3", - "postcss-minify-font-values": "^1.0.2", - "postcss-minify-gradients": "^1.0.1", - "postcss-minify-params": "^1.0.4", - "postcss-minify-selectors": "^2.0.4", - "postcss-normalize-charset": "^1.1.0", - "postcss-normalize-url": "^3.0.7", - "postcss-ordered-values": "^2.1.0", - "postcss-reduce-idents": "^2.2.2", - "postcss-reduce-initial": "^1.0.0", - "postcss-reduce-transforms": "^1.0.3", - "postcss-svgo": "^2.1.1", - "postcss-unique-selectors": "^2.0.2", - "postcss-value-parser": "^3.2.3", - "postcss-zindex": "^2.0.1" - }, - "dependencies": { - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } - } - }, - "csso": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", - "requires": { - "clap": "^1.0.9", - "source-map": "^0.5.3" - } - }, "cssom": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", - "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=", - "dev": true + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz", + "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==" }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, + "cssstyle": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", + "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", "requires": { - "array-find-index": "^1.0.1" + "cssom": "0.3.x" } }, "cyclist": { @@ -2017,15 +1355,6 @@ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "^0.10.9" - } - }, "d3": { "version": "3.5.17", "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", @@ -2037,58 +1366,32 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, + "dasherize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", + "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg=" + }, "data-urls": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz", - "integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", "requires": { - "abab": "^1.0.4", - "whatwg-mimetype": "^2.0.0", - "whatwg-url": "^6.4.0" + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" }, "dependencies": { "abab": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz", + "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==" }, "whatwg-url": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", - "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", - "dev": true, + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", + "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", "requires": { "lodash.sortby": "^4.7.0", "tr46": "^1.0.1", @@ -2114,25 +1417,8 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "requires": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - } - } + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decode-uri-component": { "version": "0.2.0", @@ -2140,36 +1426,10 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, - "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" - } + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "define-property": { "version": "2.0.2", @@ -2209,12 +1469,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -2243,6 +1497,12 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", + "dev": true + }, "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", @@ -2260,6 +1520,11 @@ "randombytes": "^2.0.0" } }, + "dns-prefetch-control": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz", + "integrity": "sha1-YN20V3dOF48flBXwyrsOhbCzALI=" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -2270,43 +1535,25 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", - "dev": true, "requires": { "webidl-conversions": "^4.0.2" - }, - "dependencies": { - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - } } }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "^1.0.0" - } + "dont-sniff-mimetype": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz", + "integrity": "sha1-WTKJDcn04vGeXrAqIAJuXl78j1g=" }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, "duplexify": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", - "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dev": true, "requires": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", @@ -2315,12 +1562,12 @@ } }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "jsbn": "~0.1.0" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ecdsa-sig-formatter": { @@ -2341,15 +1588,10 @@ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==" }, - "electron-to-chromium": { - "version": "1.3.50", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz", - "integrity": "sha1-dDi3b5K0G5GfP73TUPvQdX2s3fc=" - }, "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", + "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -2375,14 +1617,15 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, "requires": { "once": "^1.4.0" } }, "engine.io": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz", - "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", + "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "requires": { "accepts": "~1.3.4", "base64id": "1.0.0", @@ -2392,15 +1635,6 @@ "ws": "~3.3.1" }, "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" - } - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -2409,17 +1643,14 @@ "ms": "2.0.0" } }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "requires": { - "mime-db": "~1.33.0" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } } } @@ -2449,18 +1680,28 @@ "requires": { "ms": "2.0.0" } + }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + } } } }, "engine.io-parser": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz", - "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", "requires": { "after": "0.8.2", "arraybuffer.slice": "~0.0.7", "base64-arraybuffer": "0.1.5", - "blob": "0.0.4", + "blob": "0.0.5", "has-binary2": "~1.0.2" } }, @@ -2484,15 +1725,6 @@ "prr": "~1.0.1" } }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, "errorhandler": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz", @@ -2502,62 +1734,6 @@ "escape-html": "~1.0.3" } }, - "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" - } - }, - "es5-ext": { - "version": "0.10.45", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", - "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", - "dev": true, - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -2569,25 +1745,15 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz", - "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", - "dev": true, + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz", + "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==", "requires": { "esprima": "^3.1.3", "estraverse": "^4.2.0", "esutils": "^2.0.2", "optionator": "^0.8.1", "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } } }, "eslint-scope": { @@ -2603,8 +1769,7 @@ "esprima": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" }, "esrecurse": { "version": "4.2.1", @@ -2618,8 +1783,7 @@ "estraverse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" }, "esutils": { "version": "2.0.2", @@ -2633,7 +1797,7 @@ }, "event-stream": { "version": "3.3.4", - "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "requires": { "duplexer": "~0.1.1", @@ -2646,9 +1810,9 @@ } }, "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", + "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==", "dev": true }, "evp_bytestokey": { @@ -2662,13 +1826,13 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", @@ -2730,19 +1894,34 @@ "repeat-string": "^0.2.2" } }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dev": true, + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, + "expect-ct": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.1.tgz", + "integrity": "sha512-ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg==" + }, "expose-loader": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.5.tgz", - "integrity": "sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==" + "integrity": "sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==", + "dev": true }, "express": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "version": "4.16.4", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", + "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", "requires": { "accepts": "~1.3.5", "array-flatten": "1.1.1", - "body-parser": "1.18.2", + "body-parser": "1.18.3", "content-disposition": "0.5.2", "content-type": "~1.0.4", "cookie": "0.3.1", @@ -2759,10 +1938,10 @@ "on-finished": "~2.3.0", "parseurl": "~1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.3", - "qs": "6.5.1", + "proxy-addr": "~2.0.4", + "qs": "6.5.2", "range-parser": "~1.2.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", @@ -2772,84 +1951,6 @@ "vary": "~1.1.2" }, "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" - } - }, - "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", - "requires": { - "bytes": "3.0.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.1", - "http-errors": "~1.6.2", - "iconv-lite": "0.4.19", - "on-finished": "~2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "~1.6.15" - } - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "requires": { - "mime-db": "~1.33.0" - } - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" - }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - }, - "dependencies": { - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=" - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": ">= 1.3.1 < 2" - } - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" - } - } - }, "statuses": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", @@ -2868,9 +1969,9 @@ } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "3.0.2", @@ -2961,12 +2062,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -2988,21 +2083,32 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fastparse": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", + "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==" + }, + "feature-policy": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz", + "integrity": "sha512-2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw==" + }, + "figgy-pudding": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", + "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "dev": true }, "file-loader": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", - "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", + "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", + "dev": true, "requires": { "loader-utils": "^1.0.2", - "schema-utils": "^0.4.5" + "schema-utils": "^1.0.0" } }, "filesize": { @@ -3041,6 +2147,15 @@ "kind-of": "^3.0.2" } }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -3071,29 +2186,47 @@ } }, "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", + "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "dev": true, "requires": { "commondir": "^1.0.1", "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "pkg-dir": "^3.0.0" } }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "^3.0.0" } }, - "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=" + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "dev": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } }, "flot": { "version": "0.8.0-alpha", @@ -3101,13 +2234,26 @@ "integrity": "sha1-nLvHFHwQpH0lSduQvSmH7BunhLo=" }, "flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.0.tgz", + "integrity": "sha512-6MHED/cmsyux1G4/Cek2Z776y9t7WCNd3h2h/HW91vFeU7pzMhA8XvAlDhHcanG5IWuIh/xcC7JASY4WQpG6xg==", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", + "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "for-in": { @@ -3116,37 +2262,19 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "dev": true, + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { "asynckit": "^0.4.0", - "combined-stream": "1.0.6", + "combined-stream": "^1.0.6", "mime-types": "^2.1.12" - }, - "dependencies": { - "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - } } }, "formidable": { @@ -3169,6 +2297,11 @@ "map-cache": "^0.2.2" } }, + "frameguard": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz", + "integrity": "sha1-e8rUae57lukdEs6zlZx4I1qScuk=" + }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -3204,918 +2337,206 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, - "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, - "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "is-extglob": "^2.1.0" } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + } + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "dev": true, + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, + "graceful-fs": { + "version": "4.1.15", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", + "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "dev": true + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, + "gzip-size": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz", + "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==", + "dev": true, + "requires": { + "duplexer": "^0.1.1", + "pify": "^3.0.0" + } + }, + "handlebars": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz", + "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==", + "dev": true, + "requires": { + "async": "^2.5.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "lodash": "^4.17.10" } - }, - "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", - "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "^2.1.0" - } - }, - "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "minipass": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", - "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", - "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz", - "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==", - "dev": true, - "optional": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz", - "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==", - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", - "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "yallist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true - } - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "glob-stream": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", - "requires": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" - }, - "dependencies": { - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "^1.3.4" - } - }, - "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", - "dev": true, - "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "gzip-size": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", - "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", - "dev": true, - "requires": { - "duplexer": "^0.1.1", - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, - "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", - "dev": true, - "optional": true - } - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-binary2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", - "requires": { - "isarray": "2.0.1" - }, - "dependencies": { - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" - } - } - }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" - }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "has-binary2": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", + "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", + "requires": { + "isarray": "2.0.1" + } + }, + "has-cors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { "kind-of": "^3.0.2" @@ -4154,9 +2575,9 @@ } }, "hash.js": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz", - "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -4169,17 +2590,48 @@ "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", "dev": true }, - "help-me": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz", - "integrity": "sha1-jy1QjQYAtKRW2i8IZVbn5cBWo8Y=", + "helmet": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.15.0.tgz", + "integrity": "sha512-j9JjtAnWJj09lqe/PEICrhuDaX30TeokXJ9tW6ZPhVH0+LMoihDeJ58CdWeTGzM66p6EiIODmgAaWfdeIWI4Gg==", + "requires": { + "dns-prefetch-control": "0.1.0", + "dont-sniff-mimetype": "1.0.0", + "expect-ct": "0.1.1", + "feature-policy": "0.2.0", + "frameguard": "3.0.0", + "helmet-crossdomain": "0.3.0", + "helmet-csp": "2.7.1", + "hide-powered-by": "1.0.0", + "hpkp": "2.0.0", + "hsts": "2.1.0", + "ienoopen": "1.0.0", + "nocache": "2.0.0", + "referrer-policy": "1.1.0", + "x-xss-protection": "1.1.0" + } + }, + "helmet-crossdomain": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz", + "integrity": "sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==" + }, + "helmet-csp": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz", + "integrity": "sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==", "requires": { - "callback-stream": "^1.0.2", - "glob-stream": "^6.1.0", - "through2": "^2.0.1", - "xtend": "^4.0.0" + "camelize": "1.0.0", + "content-security-policy-builder": "2.0.0", + "dasherize": "2.0.0", + "platform": "1.3.5" } }, + "hide-powered-by": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz", + "integrity": "sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys=" + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -4191,16 +2643,38 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", + "homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dev": true, + "requires": { + "parse-passwd": "^1.0.0" + } + }, + "hoopy": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", + "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", "dev": true }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=" + "hpkp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz", + "integrity": "sha1-EOFCJk52IVpdMMROxD3mTe5tFnI=" + }, + "hsts": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.1.0.tgz", + "integrity": "sha512-zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA==" + }, + "html-encoding-sniffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "requires": { + "whatwg-encoding": "^1.0.1" + } }, "http-errors": { "version": "1.6.3", @@ -4213,76 +2687,41 @@ "statuses": ">= 1.4.0 < 2" } }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=" - }, - "icss-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", - "requires": { - "postcss": "^6.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "https-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", + "dev": true + }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "icss-replace-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=" + }, + "icss-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", + "requires": { + "postcss": "^6.0.1" } }, "ieee754": { @@ -4291,25 +2730,24 @@ "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", "dev": true }, + "ienoopen": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz", + "integrity": "sha1-NGpCj0dKrI9QzzeE6i0PFvYr2ms=" + }, "iferr": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", "dev": true }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", + "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "^2.0.0", + "pkg-dir": "^3.0.0", "resolve-cwd": "^2.0.0" } }, @@ -4319,17 +2757,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" - }, "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -4339,6 +2766,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -4355,30 +2783,22 @@ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, - "ipaddr.js": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", - "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=" + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", + "dev": true }, - "irregular-plurals": { + "invert-kv": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz", - "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" + "ipaddr.js": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", + "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=" }, "is-accessor-descriptor": { "version": "0.1.6", @@ -4387,14 +2807,19 @@ "dev": true, "requires": { "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } } }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -4405,35 +2830,11 @@ } }, "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, - "is-ci": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", - "dev": true, - "requires": { - "ci-info": "^1.0.0" - } - }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -4441,14 +2842,19 @@ "dev": true, "requires": { "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } } }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -4468,12 +2874,6 @@ } } }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true - }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -4501,52 +2901,11 @@ "is-extglob": "^2.1.1" } }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, - "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" - } - }, - "is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=" - }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", - "dev": true - }, "is-number": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=" }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -4556,83 +2915,27 @@ "isobject": "^3.0.1" } }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "^1.0.1" - } - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "dev": true - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, - "is-svg": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", - "requires": { - "html-comment-regex": "^1.1.0" - } - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true - }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" }, "isexe": { "version": "2.0.0", @@ -4704,23 +3007,10 @@ "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", "dev": true }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, "source-map": { @@ -4741,12 +3031,6 @@ "requires": { "has-flag": "^1.0.0" } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true } } }, @@ -4765,11 +3049,6 @@ "resolved": "https://registry.npmjs.org/jquery.tooltips/-/jquery.tooltips-1.0.0.tgz", "integrity": "sha1-/Ko2Il0IXQ/NY71E4rAGtUGDHHI=" }, - "js-base64": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", - "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==" - }, "js-storage": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/js-storage/-/js-storage-1.0.4.tgz", @@ -4781,9 +3060,9 @@ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", - "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", + "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -4791,9 +3070,9 @@ }, "dependencies": { "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true } } @@ -4801,14 +3080,12 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsdom": { "version": "11.11.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.11.0.tgz", "integrity": "sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==", - "dev": true, "requires": { "abab": "^1.0.4", "acorn": "^5.3.0", @@ -4836,127 +3113,6 @@ "whatwg-url": "^6.4.1", "ws": "^4.0.0", "xml-name-validator": "^3.0.0" - }, - "dependencies": { - "abab": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", - "dev": true - }, - "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", - "dev": true - }, - "acorn-globals": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz", - "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==", - "dev": true, - "requires": { - "acorn": "^5.0.0" - } - }, - "cssstyle": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", - "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", - "dev": true, - "requires": { - "cssom": "0.3.x" - } - }, - "html-encoding-sniffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", - "dev": true, - "requires": { - "whatwg-encoding": "^1.0.1" - } - }, - "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", - "dev": true - }, - "pn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", - "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "request-promise-native": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", - "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", - "dev": true, - "requires": { - "request-promise-core": "1.1.1", - "stealthy-require": "^1.1.0", - "tough-cookie": ">=2.3.3" - } - }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, - "whatwg-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", - "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", - "dev": true, - "requires": { - "iconv-lite": "0.4.19" - } - }, - "whatwg-url": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", - "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, - "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0" - } - }, - "xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true - } } }, "jsesc": { @@ -4980,33 +3136,23 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "~0.0.0" - } - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } }, "jsonwebtoken": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz", - "integrity": "sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz", + "integrity": "sha512-coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg==", "requires": { "jws": "^3.1.5", "lodash.includes": "^4.3.0", @@ -5035,19 +3181,12 @@ "extsprintf": "1.3.0", "json-schema": "0.2.3", "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "jwa": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz", - "integrity": "sha512-tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz", + "integrity": "sha512-Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg==", "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", @@ -5055,113 +3194,73 @@ } }, "jws": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", - "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz", + "integrity": "sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==", "requires": { - "jwa": "^1.1.5", + "jwa": "^1.2.0", "safe-buffer": "^5.0.1" } }, "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "lcid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "package-json": "^4.0.0" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true + "invert-kv": "^2.0.0" + } }, "left-pad": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", - "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", - "dev": true - }, - "leven": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz", - "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=" + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==" }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" } }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", + "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==", "dev": true }, "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", + "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "requires": { - "big.js": "^3.1.3", + "big.js": "^5.2.2", "emojis-list": "^2.0.0", - "json5": "^0.5.0" + "json5": "^1.0.1" } }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^2.0.0", + "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, "lodash.difference": { "version": "4.5.0", @@ -5199,11 +3298,6 @@ "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" - }, "lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", @@ -5212,105 +3306,15 @@ "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "requires": { - "chalk": "^2.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "loglevelnext": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz", - "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==", - "dev": true, - "requires": { - "es6-symbol": "^3.1.1", - "object.assign": "^4.1.0" - } - }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" }, "lru-cache": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", - "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^3.0.2" } }, "make-dir": { @@ -5322,11 +3326,14 @@ "pify": "^3.0.0" } }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==", - "dev": true + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } }, "map-cache": { "version": "0.2.2", @@ -5334,12 +3341,6 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, - "map-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", - "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", - "dev": true - }, "map-stream": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", @@ -5354,32 +3355,33 @@ "object-visit": "^1.0.0" } }, - "math-expression-evaluator": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=" - }, "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, - "meant": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz", - "integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==", - "dev": true - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "mem": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", + "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^1.0.0", + "p-is-promise": "^2.0.0" + } + }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -5390,37 +3392,17 @@ "readable-stream": "^2.0.1" } }, - "meow": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz", - "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", - "dev": true, - "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0", - "yargs-parser": "^10.0.0" - } + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, - "merge-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-1.0.1.tgz", - "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==", - "dev": true, - "requires": { - "is-plain-obj": "^1.1" - } - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -5481,12 +3463,6 @@ } } } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -5501,21 +3477,21 @@ } }, "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", + "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==" }, "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" }, "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", + "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "requires": { - "mime-db": "~1.27.0" + "mime-db": "~1.37.0" } }, "mimic-fn": { @@ -5539,7 +3515,8 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6058,25 +4035,14 @@ } }, "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "minimist-options": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", - "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", - "dev": true, - "requires": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { "concat-stream": "^1.5.0", @@ -6085,22 +4051,10 @@ "flush-write-stream": "^1.0.0", "from2": "^2.1.0", "parallel-transform": "^1.1.0", - "pump": "^2.0.1", + "pump": "^3.0.0", "pumpify": "^1.3.3", "stream-each": "^1.1.0", "through2": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } } }, "mixin-deep": { @@ -6128,6 +4082,7 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, "requires": { "minimist": "0.0.8" }, @@ -6135,7 +4090,8 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true } } }, @@ -6173,11 +4129,19 @@ "ms": "2.0.0" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } }, "supports-color": { "version": "5.4.0", @@ -6191,9 +4155,9 @@ } }, "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "moment-locales-webpack-plugin": { "version": "1.0.7", @@ -6205,28 +4169,31 @@ } }, "moment-timezone": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz", - "integrity": "sha512-j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A==", + "version": "0.5.23", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz", + "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==", "requires": { "moment": ">= 2.9.0" } }, "mongodb": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.11.tgz", - "integrity": "sha512-60KV+DPW++fzaD5cYbieCRQcXiYWQdRLHBqQyuu3rJmrP8vYZgI4u5UwfsUX6nGLON69FUIu4d3tH+WL4jShuA==", + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.13.tgz", + "integrity": "sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==", "requires": { - "mongodb-core": "3.0.11" + "mongodb-core": "3.1.11", + "safe-buffer": "^5.1.2" } }, "mongodb-core": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.11.tgz", - "integrity": "sha512-agzBbSP3ahEYJyBMQicj70B+n+NNYsKaroezu5ETcImXs9nqf89/QI6e8iipg2rY3a8OWZBHWvqYxnsWasrUQA==", + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.11.tgz", + "integrity": "sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==", "requires": { - "bson": "~1.0.4", - "require_optional": "^1.0.1" + "bson": "^1.1.0", + "require_optional": "^1.0.1", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" } }, "mongomock": { @@ -6251,90 +4218,11 @@ "run-queue": "^1.0.3" } }, - "mqtt": { - "version": "2.18.3", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-2.18.3.tgz", - "integrity": "sha512-BXCUugFgA6FOWJGxhvUWtVLOdt6hYTmiMGPksEyKuuF1FQ0ji7UJBJ/0kVRMUtUWCAtPGnt4mZZZgJpzNLcuQg==", - "requires": { - "commist": "^1.0.0", - "concat-stream": "^1.6.2", - "end-of-stream": "^1.4.1", - "help-me": "^1.0.1", - "inherits": "^2.0.3", - "minimist": "^1.2.0", - "mqtt-packet": "^5.6.0", - "pump": "^3.0.0", - "readable-stream": "^2.3.6", - "reinterval": "^1.1.0", - "split2": "^2.1.1", - "websocket-stream": "^5.1.2", - "xtend": "^4.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "mqtt-packet": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.0.tgz", - "integrity": "sha512-QECe2ivqcR1LRsPobRsjenEKAC3i1a5gmm+jNKJLrsiq9PaSQ18LlKFuxvhGxWkvGEPadWv6rKd31O4ICqS1Xw==", - "requires": { - "bl": "^1.2.1", - "inherits": "^2.0.3", - "process-nextick-args": "^2.0.0", - "safe-buffer": "^5.1.0" - }, - "dependencies": { - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - } - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -6359,12 +4247,6 @@ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -6374,17 +4256,22 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, "neo-async": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", - "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", + "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", "dev": true }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "nocache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz", + "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=" + }, "node-cache": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz", @@ -6392,19 +4279,12 @@ "requires": { "clone": "2.x", "lodash": "4.x" - }, - "dependencies": { - "clone": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=" - } } }, "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz", + "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==", "dev": true, "requires": { "assert": "^1.1.1", @@ -6414,7 +4294,7 @@ "constants-browserify": "^1.0.0", "crypto-browserify": "^3.11.0", "domain-browser": "^1.1.1", - "events": "^1.0.0", + "events": "^3.0.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", "path-browserify": "0.0.0", @@ -6428,8 +4308,16 @@ "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", "url": "^0.11.0", - "util": "^0.10.3", + "util": "^0.11.0", "vm-browserify": "0.0.4" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + } } }, "nopt": { @@ -6441,49 +4329,11 @@ "abbrev": "1" } }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" - }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "npm-run-path": { "version": "2.0.2", @@ -6494,21 +4344,21 @@ "path-key": "^2.0.0" } }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true }, "nwsapi": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.4.tgz", - "integrity": "sha512-Zt6HRR6RcJkuj5/N9zeE7FN6YitRW//hK2wTOwX274IBphbY3Zf5+yn5mZ9v/SzAOTMjQNxZf9KkmPLWn0cV4g==", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.0.tgz", + "integrity": "sha512-ZG3bLAvdHmhIjaQ/Db1qvBxsGvFMLIRpQszyqbg31VJ53UP++uZX1/gf3Ut96pdwN9AuDwlMqIYLm0UPCdUeHg==" }, "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "object-component": { "version": "0.0.3", @@ -6534,34 +4384,25 @@ "requires": { "is-descriptor": "^0.1.0" } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, - "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", - "dev": true - }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "^3.0.0" - } - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" + "isobject": "^3.0.0" } }, "object.pick": { @@ -6573,18 +4414,6 @@ "isobject": "^3.0.1" } }, - "object.values": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz", - "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.6.1", - "function-bind": "^1.1.0", - "has": "^1.0.1" - } - }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -6602,39 +4431,45 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "wrappy": "1" } }, "opener": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz", - "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", + "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==", "dev": true }, - "opn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", - "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + } } }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, "requires": { "deep-is": "~0.1.3", "fast-levenshtein": "~2.0.4", @@ -6642,99 +4477,29 @@ "prelude-ls": "~1.1.2", "type-check": "~0.3.2", "wordwrap": "~1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } } }, - "optjs": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", - "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" + "os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "dev": true }, - "ora": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-2.1.0.tgz", - "integrity": "sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==", + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "chalk": "^2.3.1", - "cli-cursor": "^2.1.0", - "cli-spinners": "^1.1.0", - "log-symbols": "^2.2.0", - "strip-ansi": "^4.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "ordered-read-streams": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", - "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", - "requires": { - "readable-stream": "^2.0.1" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", "dev": true }, "p-finally": { @@ -6743,46 +4508,40 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, + "p-is-promise": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", + "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==", + "dev": true + }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", + "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.0.0" } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", "dev": true }, - "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", - "dev": true, - "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" - } - }, "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz", + "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==", "dev": true }, "parallel-transform": { @@ -6797,16 +4556,17 @@ } }, "parse-asn1": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", - "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz", + "integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==", "dev": true, "requires": { "asn1.js": "^4.0.0", "browserify-aes": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3" + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-duration": { @@ -6814,15 +4574,16 @@ "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.1.tgz", "integrity": "sha1-ExFN3JiRwezSgANiRFVN5DZHoiY=" }, - "parse-json": { + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true + }, + "parse5": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==" }, "parseqs": { "version": "0.0.5", @@ -6846,480 +4607,111 @@ "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" }, "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", - "requires": { - "through": "~2.3" - } - }, - "pbkdf2": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", - "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - }, - "plur": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/plur/-/plur-3.0.1.tgz", - "integrity": "sha512-lJl0ojUynAM1BZn58Pas2WT/TXeC1+bS+UqShl0x9+49AtOn7DixRXVzaC8qrDOIxNDmepKnLuMTH7NQmkX0PA==", - "dev": true, - "requires": { - "irregular-plurals": "^2.0.0" - } - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "requires": { - "chalk": "^1.1.3", - "js-base64": "^2.1.9", - "source-map": "^0.5.6", - "supports-color": "^3.2.3" - }, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "postcss-calc": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", - "requires": { - "postcss": "^5.0.2", - "postcss-message-helpers": "^2.0.0", - "reduce-css-calc": "^1.2.6" - } - }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", - "requires": { - "colormin": "^1.0.5", - "postcss": "^5.0.13", - "postcss-value-parser": "^3.2.3" - } - }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", - "requires": { - "postcss": "^5.0.11", - "postcss-value-parser": "^3.1.2" - } - }, - "postcss-discard-comments": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", - "requires": { - "postcss": "^5.0.14" - } - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", - "requires": { - "postcss": "^5.0.4" - } - }, - "postcss-discard-empty": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", - "requires": { - "postcss": "^5.0.14" - } - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", - "requires": { - "postcss": "^5.0.16" - } + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true }, - "postcss-discard-unused": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", - "requires": { - "postcss": "^5.0.14", - "uniqs": "^2.0.0" - } + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true }, - "postcss-filter-plugins": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz", - "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==", - "requires": { - "postcss": "^5.0.4" - } + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true }, - "postcss-merge-idents": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", - "requires": { - "has": "^1.0.1", - "postcss": "^5.0.10", - "postcss-value-parser": "^3.1.1" - } + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true }, - "postcss-merge-longhand": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", - "requires": { - "postcss": "^5.0.4" - } + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, - "postcss-merge-rules": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", - "requires": { - "browserslist": "^1.5.2", - "caniuse-api": "^1.5.2", - "postcss": "^5.0.4", - "postcss-selector-parser": "^2.2.2", - "vendors": "^1.0.0" - } + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true }, - "postcss-message-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=" + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, - "postcss-minify-font-values": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "requires": { - "object-assign": "^4.0.1", - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.2" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } + "through": "~2.3" } }, - "postcss-minify-gradients": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", + "pbkdf2": { + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", + "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", + "dev": true, "requires": { - "postcss": "^5.0.12", - "postcss-value-parser": "^3.3.0" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, - "postcss-minify-params": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", - "requires": { - "alphanum-sort": "^1.0.1", - "postcss": "^5.0.2", - "postcss-value-parser": "^3.0.2", - "uniqs": "^2.0.0" - } + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "postcss-minify-selectors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", - "requires": { - "alphanum-sort": "^1.0.2", - "has": "^1.0.1", - "postcss": "^5.0.14", - "postcss-selector-parser": "^2.0.0" - } + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true }, - "postcss-modules-extract-imports": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz", - "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", + "pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "dev": true, "requires": { - "postcss": "^6.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } + "find-up": "^3.0.0" } }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", - "requires": { - "css-selector-tokenizer": "^0.7.0", - "postcss": "^6.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } - } + "platform": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", + "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" }, - "postcss-modules-scope": { + "pn": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", - "requires": { - "css-selector-tokenizer": "^0.7.0", - "postcss": "^6.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } - } + "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==" }, - "postcss-modules-values": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true + }, + "postcss": { + "version": "6.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", + "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "requires": { - "icss-replace-symbols": "^1.1.0", - "postcss": "^6.0.1" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" }, "dependencies": { "ansi-styles": { @@ -7331,162 +4723,69 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "requires": { "has-flag": "^3.0.0" } } } }, - "postcss-normalize-charset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", - "requires": { - "postcss": "^5.0.5" - } - }, - "postcss-normalize-url": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", - "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^1.4.0", - "postcss": "^5.0.14", - "postcss-value-parser": "^3.2.3" - } - }, - "postcss-ordered-values": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", - "requires": { - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.1" - } - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", - "requires": { - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.2" - } - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", - "requires": { - "postcss": "^5.0.4" - } - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", + "postcss-modules-extract-imports": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz", + "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==", "requires": { - "has": "^1.0.1", - "postcss": "^5.0.8", - "postcss-value-parser": "^3.0.1" + "postcss": "^6.0.1" } }, - "postcss-selector-parser": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", + "postcss-modules-local-by-default": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "requires": { - "flatten": "^1.0.2", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "css-selector-tokenizer": "^0.7.0", + "postcss": "^6.0.1" } }, - "postcss-svgo": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", + "postcss-modules-scope": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "requires": { - "is-svg": "^2.0.0", - "postcss": "^5.0.14", - "postcss-value-parser": "^3.2.3", - "svgo": "^0.7.0" + "css-selector-tokenizer": "^0.7.0", + "postcss": "^6.0.1" } }, - "postcss-unique-selectors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", + "postcss-modules-values": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "requires": { - "alphanum-sort": "^1.0.1", - "postcss": "^5.0.4", - "uniqs": "^2.0.0" + "icss-replace-symbols": "^1.1.0", + "postcss": "^6.0.1" } }, "postcss-value-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=" - }, - "postcss-zindex": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", - "requires": { - "has": "^1.0.1", - "postcss": "^5.0.4", - "uniqs": "^2.0.0" - } + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, - "pretty-bytes": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.1.0.tgz", - "integrity": "sha512-wa5+qGVg9Yt7PB6rYm3kXlKzgzgivYTLRandezh43jjRqgyDyP+9YxfJpJiLs9yKD1WeU8/OvtToWpW7255FtA==", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prettyjson": { "version": "1.2.1", @@ -7495,18 +4794,6 @@ "requires": { "colors": "^1.1.2", "minimist": "^1.2.0" - }, - "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } } }, "process": { @@ -7516,9 +4803,10 @@ "dev": true }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "dev": true }, "promise-inflight": { "version": "1.0.1", @@ -7526,22 +4814,13 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "protobufjs": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-3.2.4.tgz", - "integrity": "sha1-k/kbBym7yHTtywAr3xrY+OxXAdo=", - "requires": { - "ascli": "^1.0.1", - "bytebuffer": "~3.1" - } - }, "proxy-addr": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", - "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", + "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", "requires": { "forwarded": "~0.1.2", - "ipaddr.js": "1.6.0" + "ipaddr.js": "1.8.0" } }, "prr": { @@ -7550,35 +4829,30 @@ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, "psl": { - "version": "1.1.28", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz", - "integrity": "sha512-+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==", - "dev": true + "version": "1.1.31", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", + "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==" }, "public-encrypt": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", - "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1" + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -7588,6 +4862,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", + "dev": true, "requires": { "duplexify": "^3.6.0", "inherits": "^2.0.3", @@ -7598,6 +4873,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -7606,41 +4882,19 @@ } }, "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "pushover-notifications": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/pushover-notifications/-/pushover-notifications-0.2.4.tgz", - "integrity": "sha1-icuU+RgsNqpZqaxnROSa2K/00Gc=" - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pushover-notifications/-/pushover-notifications-1.2.0.tgz", + "integrity": "sha512-Da2XgHDDq9ZU4idbIx5Y9N4kCsHVgeeHViHK2wxdtdkdP58OvrsKCqpLZnr5nS+I4/PphjTORGSVzwMV2UaPLg==" }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } - } + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "querystring": { "version": "0.2.0", @@ -7654,12 +4908,6 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, - "quick-lru": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", - "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", - "dev": true - }, "random-token": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/random-token/-/random-token-0.0.8.tgz", @@ -7698,127 +4946,47 @@ "http-errors": "1.6.3", "iconv-lite": "0.4.23", "unpipe": "1.0.0" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - } - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", + "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", + "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" - } - }, - "redent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", - "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", - "dev": true, - "requires": { - "indent-string": "^3.0.0", - "strip-indent": "^2.0.0" - } - }, - "reduce-css-calc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", - "requires": { - "balanced-match": "^0.4.2", - "math-expression-evaluator": "^1.2.14", - "reduce-function-call": "^1.0.1" }, "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true } } }, - "reduce-function-call": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, "requires": { - "balanced-match": "^0.4.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" - } + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, + "referrer-policy": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz", + "integrity": "sha1-NXdOtzW/UPtsB46DM0tHI1AgfXk=" + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -7844,25 +5012,6 @@ "regjsparser": "^0.1.4" } }, - "registry-auth-token": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", - "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", - "dev": true, - "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" - } - }, - "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", - "dev": true, - "requires": { - "rc": "^1.0.1" - } - }, "regjsgen": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", @@ -7876,164 +5025,63 @@ "jsesc": "~0.5.0" } }, - "reinterval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz", - "integrity": "sha1-M2Hs+jymwYKDOA3Qu5VG85D17Oc=" - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=" - }, - "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "1.0.6", - "mime-types": "^2.1.12" - }, - "dependencies": { - "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "requires": { - "delayed-stream": "~1.0.0" - } - } - } - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - } - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "requires": { - "mime-db": "~1.33.0" - } - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "repeat-element": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", + "dev": true + }, + "repeat-string": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", + "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=" + }, + "request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { + "psl": "^1.1.24", "punycode": "^1.4.1" } - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } } } }, @@ -8041,11 +5089,32 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", - "dev": true, "requires": { "lodash": "^4.13.1" } }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "^1.1.0", + "tough-cookie": ">=2.3.3" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -8056,13 +5125,10 @@ } }, "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true }, "resolve-cwd": { "version": "2.0.0", @@ -8081,6 +5147,16 @@ } } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "dev": true, + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", @@ -8092,16 +5168,6 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -8114,23 +5180,29 @@ "integrity": "sha1-ZCfee3/u+n02QBUH62SlOFvFjcc=", "dev": true }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" + }, + "dependencies": { + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "ripemd160": { @@ -8153,9 +5225,9 @@ } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -8171,33 +5243,35 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "saslprep": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.2.tgz", + "integrity": "sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=" + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, "requires": { "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", "ajv-keywords": "^3.1.0" } }, "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", - "dev": true, - "requires": { - "semver": "^5.0.3" - } + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" }, "send": { "version": "0.16.2", @@ -8232,9 +5306,9 @@ } }, "serialize-javascript": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", - "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", "dev": true }, "serve-static": { @@ -8248,10 +5322,10 @@ "send": "0.16.2" } }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, "set-value": { @@ -8288,38 +5362,6 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" }, - "sgvdata": { - "version": "git://github.com/ktind/sgvdata.git#150873bc92e80bf645796ee19f13c6cff79d5630", - "from": "git://github.com/ktind/sgvdata.git#wip/protobuf", - "requires": { - "event-stream": "~3.1.5", - "protobufjs": "~3.2.0" - }, - "dependencies": { - "event-stream": { - "version": "3.1.7", - "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz", - "integrity": "sha1-tMVAAS0P4UmEIPPYlGAI22OTw3o=", - "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.2", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" - } - }, - "split": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", - "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", - "requires": { - "through": "2" - } - } - } - }, "sha.js": { "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", @@ -8331,27 +5373,31 @@ } }, "share2nightscout-bridge": { - "version": "git://github.com/nightscout/share2nightscout-bridge.git#d4a0d75db30461fee3131bd4efd66326c63496e6", - "from": "git://github.com/nightscout/share2nightscout-bridge.git#wip/generalize", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/share2nightscout-bridge/-/share2nightscout-bridge-0.2.0.tgz", + "integrity": "sha512-GdM8iXueC1n0YSiopCeadiq2G7pBYMroNhpqekjtX+cBFG1bqJRxvM9OH7vp27icWKx8AF+ZHdjUfwU5xn9kQQ==", "requires": { - "request": "^2.87.0" + "request": "^2.88.0" }, "dependencies": { "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", + "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", + "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } }, "assert-plus": { "version": "1.0.0", @@ -8369,15 +5415,14 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -8387,15 +5432,10 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", + "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "requires": { "delayed-stream": "~1.0.0" } @@ -8419,12 +5459,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "jsbn": "~0.1.0" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "extend": { @@ -8438,9 +5478,9 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-json-stable-stringify": { "version": "2.0.0", @@ -8453,12 +5493,12 @@ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { "asynckit": "^0.4.0", - "combined-stream": "1.0.6", + "combined-stream": "^1.0.6", "mime-types": "^2.1.12" } }, @@ -8476,11 +5516,11 @@ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "requires": { - "ajv": "^5.1.0", + "ajv": "^6.5.5", "har-schema": "^2.0.0" } }, @@ -8507,8 +5547,7 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "json-schema": { "version": "0.2.3", @@ -8516,9 +5555,9 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stringify-safe": { "version": "5.0.1", @@ -8537,32 +5576,37 @@ } }, "mime-db": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", - "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" }, "mime-types": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", - "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", + "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "requires": { - "mime-db": "~1.35.0" + "mime-db": "~1.37.0" } }, "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "psl": { + "version": "1.1.31", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", + "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==" + }, "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "qs": { "version": "6.5.2", @@ -8570,30 +5614,30 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", + "aws4": "^1.8.0", "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" + "uuid": "^3.3.2" } }, "safe-buffer": { @@ -8607,9 +5651,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sshpk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz", + "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==", "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -8623,11 +5667,19 @@ } }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { + "psl": "^1.1.24", "punycode": "^1.4.1" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + } } }, "tunnel-agent": { @@ -8641,8 +5693,15 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } }, "uuid": { "version": "3.3.2", @@ -8677,14 +5736,14 @@ "dev": true }, "shiro-trie": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/shiro-trie/-/shiro-trie-0.3.13.tgz", - "integrity": "sha1-pKZrVJjWm5RgLnqYsAVzFbO1x0Q=" + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/shiro-trie/-/shiro-trie-0.4.8.tgz", + "integrity": "sha512-CtBcRIbueg6dnSE1XuFf03RX67GdSUFcb5+zhbTL+cESTd8Vjr42YvtHMKlOZvsLt0RmtbuLzslLix8E4nKFwg==" }, "should": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/should/-/should-13.2.2.tgz", - "integrity": "sha512-3y3b/1GsvXZU2rMVDOGtaeX8N0KhdtiaGG6IhMsVkZyjcR0PokdPS9UUmlnYj5h94+ECqUr+Z6KYTm846A/tfQ==", + "version": "13.2.3", + "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", + "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", "dev": true, "requires": { "should-equal": "^2.0.0", @@ -8779,6 +5838,12 @@ "requires": { "is-extendable": "^0.1.0" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, @@ -8830,12 +5895,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, @@ -8846,6 +5905,17 @@ "dev": true, "requires": { "kind-of": "^3.2.0" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } } }, "socket.io": { @@ -8924,31 +5994,18 @@ "requires": { "ms": "2.0.0" } - }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" } } }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "requires": { - "is-plain-obj": "^1.0.0" - } - }, "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-resolve": { "version": "0.5.2", @@ -8963,44 +6020,30 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "optional": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "memory-pager": "^1.0.2" } }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", - "dev": true - }, "split": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", @@ -9018,23 +6061,16 @@ "extend-shallow": "^3.0.0" } }, - "split2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", - "requires": { - "through2": "^2.0.2" - } - }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "sshpk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -9045,27 +6081,15 @@ "jsbn": "~0.1.0", "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" - }, - "dependencies": { - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "safe-buffer": "^5.1.1" + "figgy-pudding": "^3.5.1" } }, "static-extend": { @@ -9097,13 +6121,12 @@ "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" }, "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { "inherits": "~2.0.1", @@ -9116,19 +6139,12 @@ "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "requires": { "duplexer": "~0.1.1" - }, - "dependencies": { - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" - } } }, "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { "end-of-stream": "^1.1.0", @@ -9146,49 +6162,13 @@ "readable-stream": "^2.3.6", "to-arraybuffer": "^1.0.0", "xtend": "^4.0.0" - }, - "dependencies": { - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "stream-shift": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true }, "string-width": { "version": "2.1.1", @@ -9218,9 +6198,10 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -9233,43 +6214,26 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, - "strip-indent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", - "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, "style-loader": { - "version": "0.20.3", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz", - "integrity": "sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", + "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", + "dev": true, "requires": { "loader-utils": "^1.1.0", - "schema-utils": "^0.4.5" + "schema-utils": "^1.0.0" } }, "superagent": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", - "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { "component-emitter": "^1.2.0", @@ -9277,20 +6241,20 @@ "debug": "^3.1.0", "extend": "^3.0.0", "form-data": "^2.3.1", - "formidable": "^1.1.1", + "formidable": "^1.2.0", "methods": "^1.1.1", "mime": "^1.4.1", "qs": "^6.5.1", - "readable-stream": "^2.0.5" + "readable-stream": "^2.3.5" }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "mime": { @@ -9298,17 +6262,23 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true } } }, "supertest": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.1.0.tgz", - "integrity": "sha512-O44AMnmJqx294uJQjfUmEyYOg7d9mylNFsMw/Wkz4evKd1njyPrtCN+U6ZIC7sKtfEVQhfTqFFijlXx8KP/Czw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.4.2.tgz", + "integrity": "sha512-WZWbwceHUo2P36RoEIdXvmqfs47idNNZjCuJOqDz6rvtkk8ym56aU5oglORCpPeXGxT7l9rkJ41+O1lffQXYSA==", "dev": true, "requires": { - "methods": "~1.1.2", - "superagent": "3.8.2" + "methods": "^1.1.2", + "superagent": "^3.8.3" } }, "supports-color": { @@ -9316,67 +6286,60 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, - "svgo": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", - "requires": { - "coa": "~1.0.1", - "colors": "~1.1.2", - "csso": "~2.3.1", - "js-yaml": "~3.7.0", - "mkdirp": "~0.5.1", - "sax": "~1.2.1", - "whet.extend": "~0.9.9" - }, - "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" - }, - "js-yaml": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", - "requires": { - "argparse": "^1.0.7", - "esprima": "^2.6.0" - } - } - } + "swagger-ui-dist": { + "version": "3.20.6", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.20.6.tgz", + "integrity": "sha512-CN+2z6AP0/KR6Z7wPtBA9ZWr9z28dzA5R88VturLmDSVtYIAB3D6aTt1bCj39sUtLsVwxFVrBDbNtdXcZCvFHQ==" }, "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", - "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", - "dev": true + "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=" }, "tapable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz", - "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz", + "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==", "dev": true }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, + "terser": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz", + "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==", "requires": { - "execa": "^0.7.0" + "commander": "~2.17.1", + "source-map": "~0.6.1", + "source-map-support": "~0.5.9" } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true + "terser-webpack-plugin": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz", + "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==", + "dev": true, + "requires": { + "cacache": "^11.0.2", + "find-cache-dir": "^2.0.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.4.0", + "source-map": "^0.6.1", + "terser": "^3.16.1", + "webpack-sources": "^1.1.0", + "worker-farm": "^1.5.2" + }, + "dependencies": { + "terser": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz", + "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==", + "dev": true, + "requires": { + "commander": "~2.17.1", + "source-map": "~0.6.1", + "source-map-support": "~0.5.9" + } + } + } }, "through": { "version": "2.3.8", @@ -9384,29 +6347,15 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, "requires": { - "readable-stream": "^2.1.5", + "readable-stream": "~2.3.6", "xtend": "~4.0.1" } }, - "through2-filter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", - "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", - "requires": { - "through2": "~2.0.0", - "xtend": "~4.0.0" - } - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", - "dev": true - }, "timers-browserify": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", @@ -9416,21 +6365,6 @@ "setimmediate": "^1.0.4" } }, - "titleize": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz", - "integrity": "sha512-rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew==", - "dev": true - }, - "to-absolute-glob": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", - "requires": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" - } - }, "to-array": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", @@ -9449,6 +6383,17 @@ "dev": true, "requires": { "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } } }, "to-regex": { @@ -9482,6 +6427,15 @@ "kind-of": "^3.0.2" } }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -9491,13 +6445,20 @@ } }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "punycode": "^2.1.0" } }, "traverse": { @@ -9505,12 +6466,6 @@ "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" }, - "trim-newlines": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", - "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", - "dev": true - }, "tryer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", @@ -9529,17 +6484,23 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "~1.1.2" } @@ -9551,89 +6512,21 @@ "requires": { "media-typer": "0.3.0", "mime-types": "~2.1.18" - }, - "dependencies": { - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "requires": { - "mime-db": "~1.33.0" - } - } } }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true }, "uglify-js": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz", - "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", "requires": { - "commander": "~2.16.0", + "commander": "~2.17.1", "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz", - "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==", - "dev": true, - "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - } - } } }, "ultron": { @@ -9641,11 +6534,6 @@ "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, "union-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", @@ -9681,52 +6569,24 @@ } } }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" - }, "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { "unique-slug": "^2.0.0" } }, "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz", + "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", "dev": true, "requires": { "imurmurhash": "^0.1.4" } }, - "unique-stream": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", - "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", - "requires": { - "json-stable-stringify": "^1.0.0", - "through2-filter": "^2.0.0" - } - }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, - "requires": { - "crypto-random-string": "^1.0.0" - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -9767,91 +6627,29 @@ "has-values": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true - } - } - }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", - "dev": true - }, - "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", - "dev": true - }, - "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", - "dev": true, - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true } } }, + "upath": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", + "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "dev": true + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - } } }, "urix": { @@ -9878,15 +6676,6 @@ } } }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "dev": true, - "requires": { - "prepend-http": "^1.0.1" - } - }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -9894,9 +6683,9 @@ "dev": true }, "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", + "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", "dev": true, "requires": { "inherits": "2.0.3" @@ -9905,7 +6694,8 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "utils-merge": { "version": "1.0.1", @@ -9918,31 +6708,16 @@ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "v8-compile-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz", - "integrity": "sha512-qNdTUMaCjPs4eEnM3W9H94R3sU70YCuT+/ST7nUf+id1bVOrdjrpUaeZLqPBPRph3hsgn4a4BvwpxhHZx+oSDg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz", + "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==", "dev": true }, - "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "vendors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", - "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==" - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -9951,13 +6726,6 @@ "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "vm-browserify": { @@ -9973,7 +6741,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz", "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=", - "dev": true, "requires": { "browser-process-hrtime": "^0.1.2" } @@ -9989,28 +6756,23 @@ "neo-async": "^2.5.0" } }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, - "requires": { - "defaults": "^1.0.3" - } + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz", - "integrity": "sha512-3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/wasm-edit": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", + "version": "4.29.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.3.tgz", + "integrity": "sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/wasm-edit": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "acorn": "^6.0.5", + "acorn-dynamic-import": "^4.0.0", "ajv": "^6.1.0", "ajv-keywords": "^3.1.0", "chrome-trace-event": "^1.0.0", @@ -10024,39 +6786,41 @@ "mkdirp": "~0.5.0", "neo-async": "^2.5.0", "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.0.0", - "uglifyjs-webpack-plugin": "^1.2.4", + "schema-utils": "^1.0.0", + "tapable": "^1.1.0", + "terser-webpack-plugin": "^1.1.0", "watchpack": "^1.5.0", - "webpack-sources": "^1.0.1" + "webpack-sources": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.7.tgz", + "integrity": "sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==", + "dev": true + } } }, "webpack-bundle-analyzer": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", - "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==", - "dev": true, - "requires": { - "acorn": "^5.3.0", - "bfj-node4": "^5.2.0", - "chalk": "^2.3.0", - "commander": "^2.13.0", - "ejs": "^2.5.7", - "express": "^4.16.2", - "filesize": "^3.5.11", - "gzip-size": "^4.1.0", - "lodash": "^4.17.4", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz", + "integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==", + "dev": true, + "requires": { + "acorn": "^5.7.3", + "bfj": "^6.1.1", + "chalk": "^2.4.1", + "commander": "^2.18.0", + "ejs": "^2.6.1", + "express": "^4.16.3", + "filesize": "^3.6.1", + "gzip-size": "^5.0.0", + "lodash": "^4.17.10", "mkdirp": "^0.5.1", - "opener": "^1.4.3", - "ws": "^4.0.0" + "opener": "^1.5.1", + "ws": "^6.0.0" }, "dependencies": { - "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", - "dev": true - }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -10067,9 +6831,9 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -10077,160 +6841,49 @@ "supports-color": "^5.3.0" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "commander": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", + "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", "dev": true }, "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" } }, "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.3.tgz", + "integrity": "sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==", "dev": true, "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0" + "async-limiter": "~1.0.0" } } } }, - "webpack-command": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/webpack-command/-/webpack-command-0.4.1.tgz", - "integrity": "sha512-4u23PTUcjLJCcPqs53ugjFIp2c3I6rGZgYYwgD7LPPU745MzbS3tLXuOpKdgFNN+qDdWtzfLKZhMTQyf7jklcg==", + "webpack-cli": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz", + "integrity": "sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==", "dev": true, "requires": { - "@webpack-contrib/config-loader": "^1.2.0", - "@webpack-contrib/schema-utils": "^1.0.0-beta.0", - "camelcase": "^5.0.0", - "chalk": "^2.3.2", - "debug": "^3.1.0", - "decamelize": "^2.0.0", - "enhanced-resolve": "^4.0.0", - "import-local": "^1.0.0", - "isobject": "^3.0.1", + "chalk": "^2.4.1", + "cross-spawn": "^6.0.5", + "enhanced-resolve": "^4.1.0", + "findup-sync": "^2.0.0", + "global-modules": "^1.0.0", + "import-local": "^2.0.0", + "interpret": "^1.1.0", "loader-utils": "^1.1.0", - "log-symbols": "^2.2.0", - "loud-rejection": "^1.6.0", - "meant": "^1.0.1", - "meow": "^5.0.0", - "merge-options": "^1.0.0", - "object.values": "^1.0.4", - "opn": "^5.3.0", - "ora": "^2.1.0", - "plur": "^3.0.0", - "pretty-bytes": "^5.0.0", - "strip-ansi": "^4.0.0", - "text-table": "^0.2.0", - "titleize": "^1.0.1", - "update-notifier": "^2.3.0", - "v8-compile-cache": "^2.0.0", - "webpack-log": "^1.1.2", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "camelcase": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", - "dev": true - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", - "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", - "dev": true, - "requires": { - "xregexp": "4.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "webpack-log": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz", - "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==", - "dev": true, - "requires": { - "chalk": "^2.1.0", - "log-symbols": "^2.1.0", - "loglevelnext": "^1.0.1", - "uuid": "^3.1.0" + "supports-color": "^5.5.0", + "v8-compile-cache": "^2.0.2", + "yargs": "^12.0.4" }, "dependencies": { "ansi-styles": { @@ -10243,9 +6896,9 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -10253,16 +6906,10 @@ "supports-color": "^5.3.0" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -10271,77 +6918,67 @@ } }, "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", + "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", "dev": true, "requires": { "source-list-map": "^2.0.0", "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } } }, - "websocket-stream": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz", - "integrity": "sha512-lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw==", + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", "requires": { - "duplexify": "^3.5.1", - "inherits": "^2.0.1", - "readable-stream": "^2.3.3", - "safe-buffer": "^5.1.1", - "ws": "^3.2.0", - "xtend": "^4.0.0" + "iconv-lite": "0.4.24" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "whatwg-mimetype": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz", - "integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew==", - "dev": true + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=" + "whatwg-url": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", + "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } }, "which": { - "version": "1.2.14", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" } }, - "widest-line": { + "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", - "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", - "dev": true, - "requires": { - "string-width": "^2.1.1" - } - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true }, "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "worker-farm": { "version": "1.6.0", @@ -10352,53 +6989,73 @@ "errno": "~0.1.7" } }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write-file-atomic": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + } } }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", + "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", "requires": { "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" + "safe-buffer": "~5.1.0" } }, - "xdg-basedir": { + "x-xss-protection": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.1.0.tgz", + "integrity": "sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==" + }, + "xml-name-validator": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", - "dev": true + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" }, - "xregexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", - "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==", - "dev": true - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true }, "y18n": { "version": "4.0.0", @@ -10407,26 +7064,39 @@ "dev": true }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } }, "yeast": { diff --git a/package.json b/package.json index 517d351520b..c72a2d15341 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "Nightscout", - "version": "0.10.3-master-20180805", + "name": "nightscout", + "version": "0.11.1", "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.", "license": "AGPL-3.0", "author": "Nightscout Team", @@ -48,67 +48,66 @@ } }, "engines": { - "node": "8.11.x", - "npm": "6.x || 5.8.x || 5.7.x || 5.6.x" + "node": "^10.14.1 || ^8.15.0", + "npm": "6.x" }, "dependencies": { - "ajv": "^6.5.1", "async": "^0.9.2", "body-parser": "^1.18.3", "bootevent": "0.0.1", "compression": "^1.7.3", - "css-loader": "^0.28.11", + "css-loader": "^1.0.1", "cssmin": "^0.4.3", "d3": "^3.5.17", "ejs": "^2.6.1", "errorhandler": "^1.5.0", - "event-stream": "^3.3.4", + "event-stream": "3.3.4", "expand-braces": "^0.1.2", - "expose-loader": "^0.7.5", - "express": "^4.16.3", + "express": "^4.16.4", "express-minify": "^1.0.0", - "file-loader": "^1.1.11", "flot": "^0.8.0-alpha", + "helmet": "^3.15.0", "jquery": "^3.3.1", "jquery-ui-bundle": "^1.12.1-migrate", "jquery.tooltips": "^1.0.0", "js-storage": "^1.0.4", - "jsonwebtoken": "^8.3.0", - "lodash": "^4.17.10", - "long": "^3.2.0", - "mime": "^2.3.1", + "jsdom": "~11.11.0", + "jsonwebtoken": "^8.4.0", + "lodash": "^4.17.11", + "mime": "^2.4.0", "minimed-connect-to-nightscout": "^1.1.1", - "moment": "^2.22.2", - "moment-timezone": "^0.5.21", - "mongodb": "~3.0.11", + "moment": "^2.24.0", + "moment-timezone": "^0.5.23", + "mongodb": "^3.1.13", "mongomock": "^0.1.2", - "mqtt": "^2.18.3", "node-cache": "^4.2.0", "parse-duration": "^0.1.1", "prettyjson": "^1.2.1", - "pushover-notifications": "^0.2.4", + "pushover-notifications": "^1.2.0", "random-token": "0.0.8", - "request": "^2.87.0", - "sgvdata": "git://github.com/ktind/sgvdata.git#wip/protobuf", - "share2nightscout-bridge": "git://github.com/nightscout/share2nightscout-bridge.git#wip/generalize", - "shiro-trie": "^0.3.13", + "request": "^2.88.0", + "semver": "^5.6.0", + "share2nightscout-bridge": "^0.2.0", + "shiro-trie": "^0.4.8", "simple-statistics": "^0.7.0", - "socket.io": "^2.1.1", - "style-loader": "^0.20.2", - "traverse": "^0.6.6", - "uglify-js": "^3.4.6", - "uuid": "^3.2.1" + "socket.io": "~2.1.1", + "swagger-ui-dist": "^3.20.6", + "terser": "^3.16.1", + "traverse": "^0.6.6" }, "devDependencies": { "benv": "^3.3.0", - "clear-require": "^2.0.0", + "expose-loader": "^0.7.5", + "file-loader": "^3.0.1", "istanbul": "^0.4.5", "mocha": "^5.2.0", "moment-locales-webpack-plugin": "^1.0.7", - "should": "^13.2.2", - "supertest": "^3.1.0", - "webpack": "^4.16.3", - "webpack-bundle-analyzer": "^2.13.1", - "webpack-command": "^0.4.1" + "should": "^13.2.3", + "style-loader": "^0.23.1", + "supertest": "^3.4.2", + "terser-webpack-plugin": "^1.2.2", + "webpack": "^4.29.3", + "webpack-bundle-analyzer": "^3.0.3", + "webpack-cli": "^3.2.3" } } diff --git a/server.js b/server.js index 27d629034a2..df99724747a 100644 --- a/server.js +++ b/server.js @@ -54,12 +54,6 @@ require('./lib/server/bootevent')(env, language).boot(function booted (ctx) { return; } - if (env.MQTT_MONITOR) { - ctx.mqtt = require('./lib/server/mqtt')(env, ctx); - var es = require('event-stream'); - es.pipeline(ctx.mqtt.entries, ctx.entries.map( ), ctx.mqtt.every(ctx.entries)); - } - /////////////////////////////////////////////////// // setup socket io for data and message transmission /////////////////////////////////////////////////// @@ -71,9 +65,6 @@ require('./lib/server/bootevent')(env, language).boot(function booted (ctx) { ctx.bus.on('notification', function(notify) { websocket.emitNotification(notify); - if (ctx.mqtt) { - ctx.mqtt.emitNotification(notify); - } }); //after startup if there are no alarms send all clear diff --git a/setup.sh b/setup.sh index 605696532ff..d77c8f3d1de 100755 --- a/setup.sh +++ b/setup.sh @@ -2,8 +2,6 @@ curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - sudo apt-get update -sudo apt-get install -y nodejs -sudo apt-get install -y python-software-properties python git -sudo apt-get install -y build-essential +sudo apt-get install -y nodejs build-essential git npm install \ No newline at end of file diff --git a/static/colorbrewer/README.md b/static/colorbrewer/README.md index 9f3c8f79c07..fed63690d50 100644 --- a/static/colorbrewer/README.md +++ b/static/colorbrewer/README.md @@ -1,3 +1,11 @@ + + +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [colorbrewer](#colorbrewer) + + + colorbrewer =========== diff --git a/static/css/main.css b/static/css/main.css index 75492290675..2d45c2d081e 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -86,6 +86,18 @@ body { z-index: 2; } +button { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +.ui-button { + background-color: grey; + border: 1px solid white; + padding: 2px; +} + a, a:visited, a:link { color: #2196f3; text-decoration: none; diff --git a/static/glyphs/css/fontello-embedded.css b/static/glyphs/css/fontello-embedded.css index 1bd83157f9a..92ad1b9d889 100755 --- a/static/glyphs/css/fontello-embedded.css +++ b/static/glyphs/css/fontello-embedded.css @@ -1,15 +1,15 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?37278242'); - src: url('../font/fontello.eot?37278242#iefix') format('embedded-opentype'), - url('../font/fontello.svg?37278242#fontello') format('svg'); + src: url('../font/fontello.eot?73205958'); + src: url('../font/fontello.eot?73205958#iefix') format('embedded-opentype'), + url('../font/fontello.svg?73205958#fontello') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'fontello'; - src: url('data:application/octet-stream;base64,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') format('woff'), - url('data:application/octet-stream;base64,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LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?37278242#fontello') format('svg'); + src: url('../font/fontello.svg?73205958#fontello') format('svg'); } } */ diff --git a/static/glyphs/css/fontello.css b/static/glyphs/css/fontello.css index 777b4dc367b..6548310e8e0 100755 --- a/static/glyphs/css/fontello.css +++ b/static/glyphs/css/fontello.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?25902905'); - src: url('../font/fontello.eot?25902905#iefix') format('embedded-opentype'), - url('../font/fontello.woff2?25902905') format('woff2'), - url('../font/fontello.woff?25902905') format('woff'), - url('../font/fontello.ttf?25902905') format('truetype'), - url('../font/fontello.svg?25902905#fontello') format('svg'); + src: url('../font/fontello.eot?50735338'); + src: url('../font/fontello.eot?50735338#iefix') format('embedded-opentype'), + url('../font/fontello.woff2?50735338') format('woff2'), + url('../font/fontello.woff?50735338') format('woff'), + url('../font/fontello.ttf?50735338') format('truetype'), + url('../font/fontello.svg?50735338#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -15,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?25902905#fontello') format('svg'); + src: url('../font/fontello.svg?50735338#fontello') format('svg'); } } */ diff --git a/static/glyphs/demo.html b/static/glyphs/demo.html index eedc1ca63f0..0ec1b165923 100755 --- a/static/glyphs/demo.html +++ b/static/glyphs/demo.html @@ -229,11 +229,11 @@ } @font-face { font-family: 'fontello'; - src: url('./font/fontello.eot?94753240'); - src: url('./font/fontello.eot?94753240#iefix') format('embedded-opentype'), - url('./font/fontello.woff?94753240') format('woff'), - url('./font/fontello.ttf?94753240') format('truetype'), - url('./font/fontello.svg?94753240#fontello') format('svg'); + src: url('./font/fontello.eot?92660326'); + src: url('./font/fontello.eot?92660326#iefix') format('embedded-opentype'), + url('./font/fontello.woff?92660326') format('woff'), + url('./font/fontello.ttf?92660326') format('truetype'), + url('./font/fontello.svg?92660326#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -275,7 +275,7 @@ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } - + - - + + + + diff --git a/webpack.config.js b/webpack.config.js index 9e781a3bf77..514f83ea1af 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,105 +1,113 @@ const path = require('path'); const webpack = require('webpack'); const MomentLocalesPlugin = require('moment-locales-webpack-plugin'); +const pluginArray = []; +const sourceMapType = 'source-map'; +const TerserPlugin = require('terser-webpack-plugin'); +/*if (process.env.NODE_ENV !== 'development') { + console.log('Development environment detected, enabling Bundle Analyzer'); + const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; -var pluginArray = []; + pluginArray.push(new BundleAnalyzerPlugin({ + // Can be `server`, `static` or `disabled`. + // In `server` mode analyzer will start HTTP server to show bundle report. + // In `static` mode single HTML file with bundle report will be generated. + // In `disabled` mode you can use this plugin to just generate Webpack Stats JSON file by setting + // `generateStatsFile` to `true`. + analyzerMode: 'static', + // Host that will be used in `server` mode to start HTTP server. + analyzerHost: '127.0.0.1', + // Port that will be used in `server` mode to start HTTP server. + analyzerPort: 8888, + // Path to bundle report file that will be generated in `static` mode. + // Relative to bundles output directory. + reportFilename: 'bundle_report.html', + // Module sizes to show in report by default. + // Should be one of `stat`, `parsed` or `gzip`. + // See "Definitions" section for more information. + defaultSizes: 'parsed', + // Automatically open report in default browser + openAnalyzer: true, + // If `true`, Webpack Stats JSON file will be generated in bundles output directory + generateStatsFile: false, + // Name of Webpack Stats JSON file that will be generated if `generateStatsFile` is `true`. + // Relative to bundles output directory. + statsFilename: 'stats.json', + // Options for `stats.toJson()` method. + // For example you can exclude sources of your modules from stats file with `source: false` option. + // See more options here: https://github.com/webpack/webpack/blob/webpack-1/lib/Stats.js#L21 + statsOptions: null, + // Log level. Can be 'info', 'warn', 'error' or 'silent'. + logLevel: 'info' + })); + }*/ -var sourceMapType = 'source-map'; - -if (process.env.NODE_ENV !== 'development') { - -/* - console.log('Development environment detected, enabling Bundle Analyzer'); - - var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; - - pluginArray.push(new BundleAnalyzerPlugin({ - // Can be `server`, `static` or `disabled`. - // In `server` mode analyzer will start HTTP server to show bundle report. - // In `static` mode single HTML file with bundle report will be generated. - // In `disabled` mode you can use this plugin to just generate Webpack Stats JSON file by setting `generateStatsFile` to `true`. - analyzerMode: 'static', - // Host that will be used in `server` mode to start HTTP server. - analyzerHost: '127.0.0.1', - // Port that will be used in `server` mode to start HTTP server. - analyzerPort: 8888, - // Path to bundle report file that will be generated in `static` mode. - // Relative to bundles output directory. - reportFilename: 'bundle_report.html', - // Module sizes to show in report by default. - // Should be one of `stat`, `parsed` or `gzip`. - // See "Definitions" section for more information. - defaultSizes: 'parsed', - // Automatically open report in default browser - openAnalyzer: true, - // If `true`, Webpack Stats JSON file will be generated in bundles output directory - generateStatsFile: false, - // Name of Webpack Stats JSON file that will be generated if `generateStatsFile` is `true`. - // Relative to bundles output directory. - statsFilename: 'stats.json', - // Options for `stats.toJson()` method. - // For example you can exclude sources of your modules from stats file with `source: false` option. - // See more options here: https://github.com/webpack/webpack/blob/webpack-1/lib/Stats.js#L21 - statsOptions: null, - // Log level. Can be 'info', 'warn', 'error' or 'silent'. - logLevel: 'info' - })); -*/ - -} - -var jq = new webpack.ProvidePlugin({ - $: "jquery", - jQuery: "jquery", - "window.jQuery": "jquery'", - "window.$": "jquery" -}); - -pluginArray.push(jq); +pluginArray.push(new webpack.ProvidePlugin({ + $: 'jquery', + jQuery: 'jquery', + 'window.jQuery': 'jquery', + 'window.$': 'jquery' +})); // Strip all locales except the ones defined in lib/language.js // (“en” is built into Moment and can’t be removed, 'dk' is not defined in moment) - var momentLocales = new MomentLocalesPlugin({ - localesToKeep: ['bg', 'cs', 'de', 'el', 'es', 'fi', 'fr', 'he', 'hr', 'it', 'ko', 'nb', 'nl', 'pl', 'pt', 'ro', 'ru', 'sk', 'sv', 'zh_cn', 'zh_tw'], - }) ; -pluginArray.push(momentLocales); - +pluginArray.push(new MomentLocalesPlugin({ + localesToKeep: ['bg', 'cs', 'de', 'el', 'es', 'fi', 'fr', 'he', 'hr', 'it', 'ko', 'nb', 'nl', 'pl', 'pt', 'ro', 'ru', + 'sk', 'sv', 'zh_cn', 'zh_tw'], +})); module.exports = { - context: path.resolve(__dirname, '.'), - entry: { - app: './bundle/bundle.source.js' - }, - output: { - path: path.resolve(__dirname, './tmp'), - publicPath: '/', - filename: 'js/bundle.js', - sourceMapFilename: "js/bundle.js.map", + context: path.resolve(__dirname, '.'), + entry: { + app: './bundle/bundle.source.js' + }, + output: { + path: path.resolve(__dirname, './tmp'), + publicPath: '/', + filename: 'js/bundle.js', + sourceMapFilename: 'js/bundle.js.map', + }, + devtool: sourceMapType, + optimization: { + minimizer: [ + new TerserPlugin( { + cache: true, + parallel: true, + sourceMap: true, // Must be set to true if using source-maps in production + terserOptions: { + ie8: false, + safari10: false + // https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions + } + } ), + ], + }, + plugins: pluginArray, + module: { + rules: [{ + test: /\.(jpe?g|png|gif)$/i, + loader: 'file-loader', + query: { + name: '[name].[ext]', + outputPath: 'images/' + //the images will be emmited to public/assets/images/ folder + //the images will be put in the DOM