Modified Index.html to enable 2 hour alarm silence

[gregwaehner]

Added another time interval to index.html to align with Dexcom 2 hour window. Our insulin action is 2 hours and that's what we use for "at night." Plus, with longer silence, it will reduce website traffic.

[bewest]

I cherry-picked the useful bits here: brianhanifin#5 When that PR goes through, I'll close this one.

I'm considering adding the config file to the .gitignore.

[bewest]

Greg, if you can manage to:

git checkout master
git checkout 75d1c52d4441
git checkout -b restore-original-01
git push origin restore-original-01

This will create a branch I can target for upgrade on your fork. Afterwards, you can delete/rename your old master branch to something else, and call this one your new master.

Most people don't add their own commits on top of master since that creates trouble in pulling changes from elsewhere. Happy to explain in more detail.

[gregwaehner]

Hey Ben -

I can definitely do that, but one question -- when I look at Nightscout master repo, line 31, what I modified is already merged. So I think it's all done.

https://github.com/nightscout/cgm-remote-monitor/blob/master/static/index.html#L31

Two questions though:

1. line 2 in the commands you sent me... it doesn't do anything for me... can you help me understand that? All the others work fine for me... but line 2, since my forked repo doesn't have a branch "75d1c..." it doesn't work for me.
2. if I make edits, do I make a new branch in my local cgm-remote-monitor repo following some nomenclature in order to keep my "greg's forked github cgm-remote-monitor repo's local cloned working directory master branch" sync with the upstream/master? If so, is there a standard/process for our naming of branches... such as "feature/XYZ" or in this case "restore-original-XX". Just want to ensure that I follow the procedures that are in place...

Thanks!

• Greg

From: Ben West [mailto:notifications@github.com]
Sent: Saturday, July 5, 2014 9:49 PM
To: nightscout/cgm-remote-monitor
Cc: Greg Waehner
Subject: Re: [cgm-remote-monitor] Modified Index.html to enable 2 hour alarm silence (#21)

Greg, if you can manage to:

git checkout master
git checkout 75d1c52
git checkout -b restore-original-01
git push origin restore-original-01

This will create a branch I can target for upgrade on your fork. Afterwards, you can delete/rename your old master branch to something else, and call this one your new master.

Most people don't add their own commits on top of master since that creates trouble in pulling changes from elsewhere. Happy to explain in more detail.

—
Reply to this email directly or view it on GitHub #21 (comment) . https://github.com/notifications/beacon/7674953__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcyMDIzMDU1NiwiZGF0YSI6eyJpZCI6MzUzNTI5MTJ9fQ==--f4a55bf59e6b5c510e62b9f797ee8b22e91fe840.gif

[bewest]

Closing this, the relevant commit was cherry-picked and is in master now.