Skip to content

Commit 2cab4bb

Browse files
authored
Merge branch 'KelvinTegelaar:main' into main
2 parents a3405d0 + dad942c commit 2cab4bb

File tree

65 files changed

+4974
-1626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4974
-1626
lines changed

generate-placeholders.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ const pages = [
8383
{ title: "Profiles", path: "/endpoint/autopilot/list-profiles" },
8484
{ title: "Add Profile", path: "/endpoint/autopilot/add-profile" },
8585
{ title: "Status Pages", path: "/endpoint/autopilot/list-status-pages" },
86-
{ title: "Add Status Page", path: "/endpoint/autopilot/add-status-page" },
8786
{ title: "Devices", path: "/endpoint/MEM/devices" },
8887
{ title: "Configuration Policies", path: "/endpoint/MEM/list-policies" },
8988
{ title: "Compliance Policies", path: "/endpoint/MEM/list-compliance-policies" },

public/version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "8.3.0"
3-
}
2+
"version": "8.3.2"
3+
}

src/components/CippCards/CippExchangeInfoCard.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const CippExchangeInfoCard = (props) => {
6060
</Stack>
6161
}
6262
/>
63-
{exchangeData?.BlockedForSpam ? (
63+
{exchangeData?.BlockedForSpam === true ? (
6464
<Alert severity="warning" sx={{ mx: 2, mt: 2, mb: 2 }}>
6565
This mailbox is currently blocked for spam.
6666
</Alert>
@@ -101,6 +101,14 @@ export const CippExchangeInfoCard = (props) => {
101101
{getCippFormatting(exchangeData?.BlockedForSpam, "BlockedForSpam")}
102102
</Typography>
103103
</Grid>
104+
<Grid size={{ xs: 12, md: 12 }}>
105+
<Typography variant="inherit" color="text.primary" gutterBottom>
106+
Retention Policy:
107+
</Typography>
108+
<Typography variant="inherit">
109+
{getCippFormatting(exchangeData?.RetentionPolicy, "RetentionPolicy")}
110+
</Typography>
111+
</Grid>
104112
</Grid>
105113
)
106114
}

src/components/CippCards/CippStandardsDialog.jsx

Lines changed: 341 additions & 123 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)