From 66575d17d4f743fb6ecff557064e57d439dc6f3e Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Wed, 18 Dec 2019 23:34:53 -0700
Subject: [PATCH] Documentation for 1.1.0-beta-1

---
 oscar/build_number.h          |  2 +-
 oscar/docs/release_notes.html | 36 +++++++++++++++++++++++++++++++++--
 oscar/version.h               |  2 +-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/oscar/build_number.h b/oscar/build_number.h
index 396b197e..4efaa269 100644
--- a/oscar/build_number.h
+++ b/oscar/build_number.h
@@ -1 +1 @@
-const int build_number = 4;
+const int build_number = 1;
diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index f78c2466..d6d1d6d4 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -7,16 +7,48 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
 </p>
 
 <p>
-<b>Changes and fixes in OSCAR <u>**AFTER**</u> v1.1.0-testing-4</b>
+<b>Changes and fixes in OSCAR v1.1.0-beta-1</b>
 <ul>
 <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
-<li>[new] Default and View/reset graphs use a different order for AVS and AVAPS CPAP modes</li>
+<li>[new] Extensive overhaul of the Philips Respironics System One importer, resolving all known issues.</li>
+<li>[new] The following Philips Respironics machines are now tested and fully supported:
+REMstar Plus (System One) (251P),
+REMstar Pro (System One) (450P, 451P),
+REMstar Auto (System One) (550P, 551P),
+BiPAP Auto (System One) (750P),
+BiPAP AutoSV Advanced System One (950P, 951P),
+REMstar Pro (System One 60 Series) (460P, 461P),
+REMstar Auto (System One 60 Series) (560P, 561P, 562P, 560PBT),
+BiPAP Pro (System One 60 Series) (660P),
+BiPAP Auto (System One 60 Series) (760P),
+BiPAP autoSV Advanced (System One 60 Series) (960P, 961P),
+BiPAP autoSV Advanced 30 (System One 60 Series) (960T),
+BiPAP S/T 30 (System One 60 Series) (1061T),
+BiPAP AVAPS 30 (System One 60 Series) (1160P),
+DreamStation CPAP (200X110),
+DreamStation CPAP Pro (400X110, 400X150),
+DreamStation Go (400G110),
+DreamStation Auto CPAP (500X110, 500X150),
+DreamStation Go Auto (500G110, 502G150),
+DreamStation BiPAP Pro (600X110),
+DreamStation Auto BiPAP (700X110),
+DreamStation BiPAP autoSV (900X110, 900X120),
+DreamStation BiPAP S/T 30 (1030X110),
+DreamStation BiPAP S/T 30 with AAM (1030X150),
+DreamStation BiPAP AVAPS 30 (1130X110),
+DreamStation BiPAP AVAPS 30 AE (1131X150)</li>
+<li>[new] Update translation files and add new languages</li>
+<li>[new] Allow user to reset graph order on Daily page to Standard or Advanced order (often useful for AVS and AVAPS CPAP modes)</li>
 <li>[new] Add preference setting to include serial number on machine settings list</li>
 <li>[fix] Place date, time, and Oscar version information in report footers</li>
 <li>[fix] Update identification of ResMed S9 machines on Welcome page</li>
 <li>[fix] Correct formatting of event number in Daily Events tab</li>
 <li>[fix] Correct timezone offset for somnopose imports</li>
 <li>[fix] Show a progress bar when setting Overview range to a large number of days</li>
+<li>[fix] Make session bars on Daily page clearer by using a better color</li>
+<li>[fix] Improve list of machines on Statistics page</li>
+<li>[fix] Report Pressure when IPAP data is missing</li>
+<li>[fix] Implement Refresh button on Profile page</li>
 </ul>
 </p>
 
diff --git a/oscar/version.h b/oscar/version.h
index d23b5769..f78b00b1 100644
--- a/oscar/version.h
+++ b/oscar/version.h
@@ -15,7 +15,7 @@
 const int major_version = 1;   // incompatible API changes
 const int minor_version = 1;   // new features that don't break things
 const int revision_number = 0; // bugfixes, revisions
-const QString ReleaseStatus = "testing"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
+const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
 
 const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
 const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);