Merge branch '1.5.1'

sandialabs · Apr 25, 2019 · 7a6dd38 · 7a6dd38
2 parents 70a3001 + b248cfc
commit 7a6dd38
Show file tree

Hide file tree

Showing 197 changed files with 14,805 additions and 5,680 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+unittestresults.xml
+src/COMMONNode/node_modules/
+src/keywords.txt
diff --git a/README.md b/README.md
@@ -8,9 +8,10 @@ Sandia National Laboratories’ COMMON software is designed to help by pointing
 
 # Release History
 
-| Version | Date |
-| ------- | ---- |
-| [1.5.0](https://github.com/sandialabs/common/releases/tag/v1.5.0) | 2019/03/13 |
+| Version | Date | Comment |
+| ------- | ---- | ---- |
+| [1.5.1](https://github.com/sandialabs/common/releases/tag/v1.5.1) | 2019/04/25 | `Fixed missing 'Uptime %' in reports`</br>`Performance improvements` |
+| [1.5.0](https://github.com/sandialabs/common/releases/tag/v1.5.0) | 2019/03/13 | `Initial Commit` |
 
 # COMMON main pieces:
 - A user-interface, accessed via a Web Browser, written in TypeScript and AngularJS (1.6.x).
@@ -109,7 +110,7 @@ Sandia National Laboratories’ COMMON software is designed to help by pointing
 
 
 # Building
-COMMON is built using Visual Studio 2017. The COMMONWeb part also uses Bower, NPM, and Gulp. Eventually, I plan to do away with Bower and just use NPM, but haven't done that yet.
+COMMON is built using Visual Studio 2019. The COMMONWeb part also uses Bower, NPM, and Gulp. Eventually, I plan to do away with Bower and just use NPM, but haven't done that yet.
 
 There have been cases where Visual Studio doesn't properly do the Bower and NPM stuff, so you may need to install those separately.
 

diff --git a/src/COMMON.sln b/src/COMMON.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "COMMON", "COMMON\COMMON.csproj", "{AFEC7287-063D-43F0-8B56-4F87B6AA37F1}"
 EndProject

diff --git a/src/COMMON/Properties/AssemblyInfo.cs b/src/COMMON/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/src/COMMONCLI/Properties/AssemblyInfo.cs b/src/COMMONCLI/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/src/COMMONConfig/Properties/AssemblyInfo.cs b/src/COMMONConfig/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/src/COMMONWeb/COMMONWeb - Copy (2).csproj b/src/COMMONWeb/COMMONWeb - Copy (2).csproj
diff --git a/src/COMMONWeb/COMMONWeb - Copy (3).csproj b/src/COMMONWeb/COMMONWeb - Copy (3).csproj
diff --git a/src/COMMONWeb/COMMONWeb - Copy.csproj b/src/COMMONWeb/COMMONWeb - Copy.csproj
diff --git a/src/COMMONWeb/COMMONWeb-backup.csproj b/src/COMMONWeb/COMMONWeb-backup.csproj