Skip to content

Commit

Permalink
Merge branch 'release/0.4.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Calabrese committed Oct 1, 2014
2 parents b8bc46e + a488e52 commit 9eac447
Show file tree
Hide file tree
Showing 8 changed files with 717 additions and 25 deletions.
5 changes: 5 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

We track contributions on a per-patch basis using git.
Please see our published git log:
* https://github.com/nightscout/cgm-remote-monitor/commits/master

662 changes: 662 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

25 changes: 20 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,24 @@ Feel free to [post an issue][issues], but read the [wiki][wiki] first.
License
---------------

This is experimental software and NOT intended for treatment of any
kind. It is provided under the [MIT license][mit], so you can do with
it whatever you wish except hold me responsible if it does something
you don't like.
[agpl-3]: http://www.gnu.org/licenses/agpl-3.0.txt

cgm-remote-monitor - web app to broadcast cgm readings
Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.


[mit]: http://www.opensource.org/licenses/mit-license.php
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nightscout",
"version": "0.4.2",
"version": "0.4.3",
"dependencies": {
"angularjs": "1.3.0-beta.19",
"bootstrap": "~3.2.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "Nightscout",
"version": "0.4.2",
"version": "0.4.3",
"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": "MIT",
"license": "AGPL3",
"author": "Nightscout Team",
"homepage": "http://nightscout.github.io/",
"keywords": [
Expand Down
31 changes: 19 additions & 12 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
// NightScout server file

// NightScout is free software: you can redistribute it and/or modify it under the terms of the GNU
// General Public License as published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.

// NightScout 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 General Public License for more details.

// You should have received a copy of the GNU General Public License along with NightScout.
// If not, see <http://www.gnu.org/licenses/>.
/*
* cgm-remote-monitor - web app to broadcast cgm readings
* Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
*/

// Description: Basic web server to display data from Dexcom G4. Requires a database that contains
// the Dexcom SGV data.
Expand Down
3 changes: 2 additions & 1 deletion static/css/drawer.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
font-size: 0.75em;
}
#about .links {
margin-top: 0.5em;
margin-top: 1em;
margin-bottom: 1em;
}
#about a {
color: #fff;
Expand Down
10 changes: 6 additions & 4 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<link rel="apple-touch-icon" href="/images/logomobile.png">
<title>NightScout</title>
<link href="/images/round1.png" rel="icon" id="favicon" type="image/png" />
<link rel="stylesheet" type="text/css" href="/css/main.css?v=0.4.2" />
<link rel="stylesheet" type="text/css" href="/css/main.css?v=0.4.3" />
<link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
<link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.4.2b" />
<link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.4.3" />
<link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
</head>
<body>
Expand Down Expand Up @@ -111,6 +111,8 @@ <h1 class="customTitle">Nightscout</h1>
<a href="http://github.com/nightscout/cgm-remote-monitor">Open Source</a><br />
<a href="http://www.nightscout.info">Community</a><br />
</div>
<div>License: <a href="http://www.gnu.org/licenses/agpl.html">AGPL</a></div>
<div>Copyright © 2014 Nightscout contributors</div>
</fieldset>
</form>
</div>
Expand Down Expand Up @@ -179,8 +181,8 @@ <h1 class="customTitle">Nightscout</h1>
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
<script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
<script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
<script src="/js/ui-utils.js?v=0.4.2"></script>
<script src="/js/client.js?v=0.4.2"></script>
<script src="/js/ui-utils.js?v=0.4.3"></script>
<script src="/js/client.js?v=0.4.3"></script>
<script src="/js/experiments.js"></script>
</body>
</html>

0 comments on commit 9eac447

Please sign in to comment.