Merge branch 'KelvinTegelaar:main' into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.2.1",
+  "version": "6.2.2",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

public/version_latest.txt

@@ -1 +1 @@
-6.2.1
+6.2.2

src/data/AuditLogSchema.json

@@ -731,6 +731,7 @@
     { "value": "AR", "name": "Argentina" },
     { "value": "AM", "name": "Armenia" },
     { "value": "AW", "name": "Aruba" },
+    { "value": "AC", "name": "Ascension Island" },
     { "value": "AU", "name": "Australia" },
     { "value": "AT", "name": "Austria" },
     { "value": "AZ", "name": "Azerbaijan" },
@@ -779,6 +780,7 @@
     { "value": "CY", "name": "Cyprus" },
     { "value": "CZ", "name": "Czech Republic" },
     { "value": "DK", "name": "Denmark" },
+    { "value": "DG", "name": "Diego Garcia" },
     { "value": "DJ", "name": "Djibouti" },
     { "value": "DM", "name": "Dominica" },
     { "value": "DO", "name": "Dominican Republic" },
@@ -837,6 +839,7 @@
     { "value": "KI", "name": "Kiribati" },
     { "value": "KP", "name": "Korea, Democratic People's Republic of" },
     { "value": "KR", "name": "Korea, Republic of" },
+    { "value": "XK", "name": "Kosovo" },
     { "value": "KW", "name": "Kuwait" },
     { "value": "KG", "name": "Kyrgyzstan" },
     { "value": "LA", "name": "Lao People's Democratic Republic" },

src/data/countryList.json

@@ -12,6 +12,7 @@
   { "Code": "AR", "Name": "Argentina" },
   { "Code": "AM", "Name": "Armenia" },
   { "Code": "AW", "Name": "Aruba" },
+  { "Code": "AC", "Name": "Ascension Island" },
   { "Code": "AU", "Name": "Australia" },
   { "Code": "AT", "Name": "Austria" },
   { "Code": "AZ", "Name": "Azerbaijan" },
@@ -60,6 +61,7 @@
   { "Code": "CY", "Name": "Cyprus" },
   { "Code": "CZ", "Name": "Czech Republic" },
   { "Code": "DK", "Name": "Denmark" },
+  { "Code": "DG", "Name": "Diego Garcia" },
   { "Code": "DJ", "Name": "Djibouti" },
   { "Code": "DM", "Name": "Dominica" },
   { "Code": "DO", "Name": "Dominican Republic" },
@@ -118,6 +120,7 @@
   { "Code": "KI", "Name": "Kiribati" },
   { "Code": "KP", "Name": "Korea, Democratic People's Republic of" },
   { "Code": "KR", "Name": "Korea, Republic of" },
+  { "Code": "XK", "Name": "Kosovo" },
   { "Code": "KW", "Name": "Kuwait" },
   { "Code": "KG", "Name": "Kyrgyzstan" },
   { "Code": "LA", "Name": "Lao People's Democratic Republic" },

src/data/standards.json

@@ -2341,7 +2341,7 @@
             "value": "none"
           },
           {
-            "label": "Restirct sharing to specific domains",
+            "label": "Restrict sharing to specific domains",
             "value": "allowList"
           },
           {

src/views/identity/administration/Users.jsx

@@ -275,7 +275,8 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             color: 'info',
             modal: true,
             modalUrl: `/api/ExecResetPass?MustChange=true&TenantFilter=${tenant.defaultDomainName}&ID=${row.id}&displayName=${row.displayName}`,
-            modalMessage: 'Are you sure you want to reset the password for this user?',
+            modalMessage:
+              'Are you sure you want to reset the password for this user? The user must change their password at next logon.',
           },
           {
             label: 'Reset Password',
@@ -285,11 +286,11 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             modalMessage: 'Are you sure you want to reset the password for this user?',
           },
           {
-            label: 'Preprovision OneDrive',
+            label: 'Pre-provision OneDrive',
             color: 'info',
             modal: true,
             modalUrl: `/api/ExecOneDriveProvision?TenantFilter=${tenant.defaultDomainName}&UserPrincipalName=${row.userPrincipalName}`,
-            modalMessage: 'Are you sure you want to preprovision onedrive for this user??',
+            modalMessage: 'Are you sure you want to pre-provision OneDrive for this user??',
           },
           {
             label: 'Clear ImmutableId',

version_latest.txt

@@ -1 +1 @@
-6.2.1
+6.2.2