Merge branch 'master' into JumpCloudModule_1.15.0

TheJumpCloud · Oct 8, 2019 · 8b661da · 8b661da
2 parents 7b842c6 + eee7088
commit 8b661da
Show file tree

Hide file tree

Showing 18 changed files with 928 additions and 6,722 deletions.
diff --git a/ADMU/CHANGELOG.md b/ADMU/CHANGELOG.md
@@ -0,0 +1,36 @@
+## 1.2.0
+
+#### RELEASE DATE
+
+September 27, 2019
+
+#### RELEASE NOTES
+
+- Improve and reduce migapp.xml & miguser.xml entrys. This will reduce overall file count and scanning times.
+
+- Add UI loading feedback using write-progress. 
+
+- Add localadmin column to UI for profiles.
+
+- Add profile size column to UI for profiles. Also add system c:\ available space to UI.
+
+- Introduce Pester tests and azure pipeline CI for improved automated testing.
+
+
+## 1.1.0
+
+#### RELEASE DATE
+
+September 6, 2019
+
+#### RELEASE NOTES
+
+- Fix netbios name to use better function and account for cases where netbios name is different than domain name.
+
+- Change ADK install path to use default.
+
+- Improve install and running of USMT on x86 and x64 systems.
+
+- Introduce custom config.xml to remove APAPI prompt.
+
+- Introduce custom migapp.xml and miguser.xml to add more applications and downloads folder migration.
diff --git a/ADMU/ReadMe.md b/ADMU/ReadMe.md
@@ -1,3 +1,5 @@
+[![Build status](https://dev.azure.com/JumpCloudPowershell/JumpCloud%20ADMU/_apis/build/status/JumpCloud%20ADMU-CI)](https://dev.azure.com/JumpCloudPowershell/JumpCloud%20ADMU/_build/latest?definitionId=13)
+
 # Providing Feedback
 
 The ADMU is currently in an Early Access (EA) period. 

diff --git a/ADMU/exe/Windows 7/gui_jcadmu_win7.exe b/ADMU/exe/Windows 7/gui_jcadmu_win7.exe
diff --git a/ADMU/exe/Windows 7/jcadmu_win7.exe b/ADMU/exe/Windows 7/jcadmu_win7.exe
diff --git a/ADMU/exe/Windows 8-10/gui_jcadmu_win10.exe b/ADMU/exe/Windows 8-10/gui_jcadmu_win10.exe
diff --git a/ADMU/exe/Windows 8-10/jcadmu_win10.exe b/ADMU/exe/Windows 8-10/jcadmu_win10.exe
diff --git a/ADMU/images/img_17.png b/ADMU/images/img_17.png
diff --git a/ADMU/powershell/Form.ps1 b/ADMU/powershell/Form.ps1