Jshs

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -1,6 +1,7 @@
 ---
 name: "\U0001F41BBug report"
 about: Create a report to help us improve things
+label: bug
 
 ---
 

.nvmrc

@@ -1 +1 @@
-8.11.x
+8.x

.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

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)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -50,11 +55,11 @@ 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:
@@ -71,7 +76,15 @@ If in doubt, format your code with `js-beautify --indent-size 2 --comma-first  -
 
 ## 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 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
 
@@ -82,6 +95,24 @@ This can be done by checking your code `git commit -avm 'my improvements are her
 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.
+
+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.
 
@@ -94,6 +125,7 @@ When adding new features that add confugration options, please ensure the `READM
 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.
+>>>>>>> master
 
 Please include instructions how to test the changes.
 
@@ -105,18 +137,152 @@ We encourage liberal use of the comments, including images where appropriate.
 
 Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and gitter.
 
+<<<<<<< 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](https://semver.org/) for versioning strategy.
+
+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]
+

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