Merge branch 'KelvinTegelaar:dev' into dev

JohnDuprey · Apr 12, 2024 · 64a7f87 · 64a7f87
2 parents b982323 + 06f7c22
commit 64a7f87
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/public/img/augmentt-dark.png b/public/img/augmentt-dark.png
diff --git a/public/img/augmentt-light.png b/public/img/augmentt-light.png
diff --git a/src/components/layout/AppFooter.jsx b/src/components/layout/AppFooter.jsx
@@ -31,13 +31,13 @@ const AppFooter = () => {
             <CImage src={rewst} alt="Rewst" />
           </CLink>
           <CLink
-            className="me-2"
+            className="me-1"
             href="https://www.augmentt.com/?utm_source=cipp&utm_medium=referral&utm_campaign=2024"
             target="_blank"
           >
             <CImage src={augmentt} alt="Augmentt" />
           </CLink>
-          <CLink className="me-2" href="https://ninjaone.com" target="_blank">
+          <CLink className="me-1" href="https://ninjaone.com" target="_blank">
             <CImage src={ninjaone} alt="NinjaOne" />
           </CLink>
         </p>

diff --git a/src/views/endpoint/intune/MEMListAppProtection.jsx b/src/views/endpoint/intune/MEMListAppProtection.jsx
@@ -36,7 +36,7 @@ const Actions = (row, rowIndex, formatExtraData) => {
         ]}
         actions={[
           {
-            label: 'Create template based on policy (beta)',
+            label: 'Create template based on policy',
             color: 'info',
             modal: true,
             icon: <FontAwesomeIcon icon={faBook} className="me-2" />,

diff --git a/src/views/endpoint/intune/MEMListCompliance.jsx b/src/views/endpoint/intune/MEMListCompliance.jsx
@@ -36,7 +36,7 @@ const Actions = (row, rowIndex, formatExtraData) => {
         ]}
         actions={[
           {
-            label: 'Create template based on policy (beta)',
+            label: 'Create template based on policy ',
             color: 'info',
             modal: true,
             icon: <FontAwesomeIcon icon={faBook} className="me-2" />,

diff --git a/src/views/endpoint/intune/MEMListPolicies.jsx b/src/views/endpoint/intune/MEMListPolicies.jsx
@@ -35,7 +35,7 @@ const Actions = (row, rowIndex, formatExtraData) => {
         ]}
         actions={[
           {
-            label: 'Create template based on policy (beta)',
+            label: 'Create template based on policy ',
             color: 'info',
             modal: true,
             icon: <FontAwesomeIcon icon={faBook} className="me-2" />,

diff --git a/src/views/identity/administration/AddGroup.jsx b/src/views/identity/administration/AddGroup.jsx
@@ -141,7 +141,7 @@ const AddGroup = () => {
                     <RFFCFormRadio name="groupType" label="Dynamic Group" value="dynamic" />
                     <RFFCFormRadio
                       name="groupType"
-                      label="Dynamic Distribution Group (Beta)"
+                      label="Dynamic Distribution Group "
                       value="dynamicdistribution"
                     />
 

diff --git a/src/views/identity/administration/DeployGroupTemplate.jsx b/src/views/identity/administration/DeployGroupTemplate.jsx
@@ -153,7 +153,7 @@ const ApplyGroupTemplate = () => {
               placeholder="Select a group type"
               values={[
                 { label: 'Dynamic Group', value: 'dynamic' },
-                { label: 'Dynamic Distribution Group (Beta)', value: 'dynamicdistribution' },
+                { label: 'Dynamic Distribution Group ', value: 'dynamicdistribution' },
 
                 { label: 'Security Group', value: 'generic' },
                 { label: 'Distribution group', value: 'distribution' },