Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from KelvinTegelaar:main #114

Merged
merged 65 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
4b04d38
Merge pull request #66 from KelvinTegelaar/dev
kris6673 Aug 14, 2024
5b9a833
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Aug 19, 2024
c880aad
Delete exchange rule confirmation fixed
MoltenTesseract Aug 19, 2024
e329e78
Merge pull request #2839 from MoltenTesseract/patch-1
JohnDuprey Aug 20, 2024
a00ba2f
Fix flyout extended information and incorrect wording
MoltenTesseract Aug 20, 2024
2894f93
Improvements to MEMListPolicies
OfficialEsco Aug 17, 2024
389b251
Merge pull request #2841 from MoltenTesseract/patch-2
KelvinTegelaar Aug 20, 2024
d22ceef
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Aug 21, 2024
a1ce07d
Add owner property to anonymization check
JohnDuprey Aug 21, 2024
f84c087
Extend permission builder for app approval
JohnDuprey Aug 21, 2024
be79c62
approval template page
JohnDuprey Aug 21, 2024
8ecaf07
Hide permission builder while loading
JohnDuprey Aug 21, 2024
8e16606
Add username to BEC refresh
JohnDuprey Aug 21, 2024
e5a9798
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Aug 21, 2024
c97bd1d
Merge pull request #2847 from JohnDuprey/dev
JohnDuprey Aug 21, 2024
3bb85f8
Added Anti-Phishing and Anti-Spam policies to backup
cipptesting Aug 21, 2024
f690aff
Update standards.json
OwenIbarra Aug 22, 2024
49834bc
Merge pull request #2852 from OwenC3/dev
KelvinTegelaar Aug 22, 2024
66c221e
Merge pull request #2849 from cipptesting/dev
KelvinTegelaar Aug 22, 2024
2fd9396
Update CippAppPermissionBuilder.jsx
JohnDuprey Aug 22, 2024
81f5533
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Aug 22, 2024
d075e73
Merge pull request #2853 from JohnDuprey/dev
JohnDuprey Aug 22, 2024
846c04e
Merge pull request #69 from KelvinTegelaar/dev
kris6673 Aug 24, 2024
4fb3eae
Add delete rule button to mailboxrulelist
kris6673 Aug 24, 2024
1f71fe9
Add todo's
kris6673 Aug 24, 2024
8abf15e
feat: Add delete rule button to mailboxrulelist
kris6673 Aug 24, 2024
f207802
Fix angry linter
kris6673 Aug 24, 2024
b403887
Fix another angry linter
kris6673 Aug 24, 2024
8ec7490
Merge pull request #2855 from kris6673/delete-mailboxrules
KelvinTegelaar Aug 25, 2024
6d1082e
Quarantine messages
JohnDuprey Aug 27, 2024
c94c739
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 27, 2024
240772a
Merge pull request #2858 from JohnDuprey/dev
JohnDuprey Aug 27, 2024
c476963
Update AzureDeploymentTemplate.json
OwenIbarra Aug 27, 2024
2173e51
Update AzureDeploymentTemplate_regionoptions.json
OwenIbarra Aug 27, 2024
b72a4e7
Update DevAzureDeploymentTemplate.json
OwenIbarra Aug 27, 2024
1c4d5dd
Update DevAzureDeploymentTemplate_regionoptions.json
OwenIbarra Aug 27, 2024
6083434
Update SettingsExtensionMappings.jsx
OwenIbarra Aug 27, 2024
a9b88a2
Update QuarantineList.jsx
JohnDuprey Aug 28, 2024
43491ff
Typo
OwenIbarra Aug 28, 2024
b103752
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 28, 2024
2b4f94a
BEC prettification
JohnDuprey Aug 28, 2024
385fbd2
Merge pull request #2863 from JohnDuprey/dev
JohnDuprey Aug 28, 2024
8a04e24
Update orchestration starter url
JohnDuprey Aug 29, 2024
fae4360
Cleanup queries in Mailbox Settings
JohnDuprey Aug 29, 2024
26852fe
Update paths for starting BPA/Domain Analyser
JohnDuprey Aug 29, 2024
0c308b2
Update BestPracticeAnalyser.jsx
JohnDuprey Aug 29, 2024
262d90b
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Aug 29, 2024
804021f
Merge pull request #2865 from JohnDuprey/dev
JohnDuprey Aug 29, 2024
9c6e810
Merge pull request #2859 from OwenIbarra/dev
KelvinTegelaar Aug 29, 2024
b7ff9d4
Merge pull request #2842 from Ren-Roros-Digital/listconfig
KelvinTegelaar Aug 29, 2024
94eb15f
alert update
KelvinTegelaar Aug 29, 2024
529277e
Improve edit mailbox page
JohnDuprey Aug 30, 2024
90b09c7
Update settings panel on save for fwd and ooo
JohnDuprey Aug 30, 2024
dd3d43a
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 30, 2024
c29d0e3
Merge pull request #2867 from JohnDuprey/dev
JohnDuprey Aug 30, 2024
423ed7e
Update EditMailboxPermissions.jsx
JohnDuprey Aug 30, 2024
6495cb1
add proptypes
JohnDuprey Aug 30, 2024
652c2eb
Merge pull request #2868 from JohnDuprey/dev
JohnDuprey Aug 30, 2024
9eb600c
added get bitlocker key
KelvinTegelaar Aug 30, 2024
cb32a99
Move entire request to post body
JohnDuprey Aug 30, 2024
07e5358
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 30, 2024
1570977
Merge pull request #2869 from JohnDuprey/dev
JohnDuprey Aug 30, 2024
2e15063
Right of Boom logo
KelvinTegelaar Aug 30, 2024
46b15c7
update version
KelvinTegelaar Aug 30, 2024
3439e33
Merge pull request #2871 from KelvinTegelaar/dev
KelvinTegelaar Aug 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment/AzureDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
6 changes: 3 additions & 3 deletions deployment/AzureDeploymentTemplate_regionoptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPP",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"GithubRepository": {
Expand All @@ -20,7 +20,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down Expand Up @@ -197,7 +197,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
6 changes: 3 additions & 3 deletions deployment/DevAzureDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPPDev",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"TenantID": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down Expand Up @@ -250,7 +250,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
4 changes: 2 additions & 2 deletions deployment/DevAzureDeploymentTemplate_regionoptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPP",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"TenantID": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "6.3.0",
"version": "6.4.0",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down
17 changes: 17 additions & 0 deletions public/img/RoB-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/img/RoB.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/datto.png
Binary file not shown.
2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.0
6.4.0
10 changes: 7 additions & 3 deletions src/components/layout/AppFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const AppFooter = () => {
const isDark =
currentTheme === 'impact' || (currentTheme === 'default' && preferredTheme === 'impact')

const datto = isDark ? '/img/datto.png' : '/img/datto.png'
const RoB = isDark ? '/img/RoB.svg' : '/img/RoB-light.svg'
const huntress = isDark ? '/img/huntress_teal.png' : '/img/huntress_teal.png'
const rewst = isDark ? '/img/rewst_dark.png' : '/img/rewst.png'
const ninjaone = isDark ? '/img/ninjaone_dark.png' : '/img/ninjaone.png'
Expand All @@ -24,8 +24,12 @@ const AppFooter = () => {
<CLink className="mx-2" href="https://www.huntress.com/" target="_blank">
<CImage src={huntress} alt="Huntress" />
</CLink>
<CLink className="me-2" href="https://datto.com/" target="_blank">
<CImage src={datto} alt="Datto" />
<CLink
className="me-2"
href="https://www.rightofboom.com/rob-2025/register?promo=EarlyBird2025#register"
target="_blank"
>
<CImage src={RoB} alt="RoB" />
</CLink>
<CLink className="me-2" href="https://rewst.io/" target="_blank">
<CImage src={rewst} alt="Rewst" />
Expand Down
10 changes: 6 additions & 4 deletions src/components/tables/CippDatatable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,18 @@ export default function CippDatatable({ path, params, ...rest }) {
refetch,
} = useListDatatableQuery({ path, params: { $filter: graphFilter, ...params } })

let anonimized = false // Assuming default value is false
let anonymized = false // Assuming default value is false
const regex = new RegExp('^[A-Z0-9]+$')
const principalNameOrUPN =
data[0]?.userPrincipalName ??
data[0]?.UPN ??
data[0]?.Owner ??
data.Results?.[0]?.upn ??
data.Results?.[0]?.userPrincipalName
data.Results?.[0]?.userPrincipalName ??
data.Results?.[0]?.Owner

if (principalNameOrUPN && regex.test(principalNameOrUPN)) {
anonimized = true
anonymized = true
}

var defaultFilterText = ''
Expand All @@ -32,7 +34,7 @@ export default function CippDatatable({ path, params, ...rest }) {
}
return (
<>
{anonimized && (
{anonymized && (
<CCallout color="info">
This table might contain anonymized data. Please check this
<a
Expand Down
Loading