Skip to content

Commit 59ec38a

Browse files
committed
Squashed commit of the following:
commit 05610a9 Merge: fb47935 651033e Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 15:22:51 2023 +0200 Merge pull request KelvinTegelaar#1692 from KelvinTegelaar/dev Dev to release commit 651033e Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 15:10:57 2023 +0200 logos commit 3f0167a Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 14:27:56 2023 +0200 added clearer failure if cell is failed commit 3e58a79 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 10:44:01 2023 +0200 added oauth standard commit 028a271 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 10:32:36 2023 +0200 fixes KelvinTegelaar#1688 commit ed89972 Merge: b989aa8 8975ae6 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 10:09:21 2023 +0200 Merge pull request KelvinTegelaar#1690 from johnduprey/dev BPA - Set report template in state for tenant change commit 8975ae6 Author: John Duprey <[email protected]> Date: Tue Aug 15 22:06:34 2023 -0400 Tweak column sizes for smaller devices commit a50f1e2 Author: John Duprey <[email protected]> Date: Tue Aug 15 21:40:47 2023 -0400 BPA - Set report template in state for tenant change commit 4008058 Merge: 84c4154 b989aa8 Author: John Duprey <[email protected]> Date: Tue Aug 15 20:02:11 2023 -0400 Merge remote-tracking branch 'upstream/dev' into dev commit b989aa8 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 01:53:06 2023 +0200 upped versions commit 404f489 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 01:36:03 2023 +0200 theme improvements commit 889b433 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 01:28:32 2023 +0200 minor fixes commit eaaed26 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 16 01:23:52 2023 +0200 prep for release commit 84c4154 Merge: b9a0e95 33735d4 Author: John Duprey <[email protected]> Date: Tue Aug 15 11:40:55 2023 -0400 Merge pull request KelvinTegelaar#40 from KelvinTegelaar/dev commit d01b2d1 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 15 17:06:29 2023 +0200 minor fixes commit 33735d4 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 15 15:49:11 2023 +0200 improvements bpa overview commit d2f35b4 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 15 13:20:00 2023 +0200 improved layout commit a925f69 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 15 12:54:55 2023 +0200 improvements access check commit b327bab Author: KelvinTegelaar <[email protected]> Date: Tue Aug 15 11:49:21 2023 +0200 BPA Improvements and CIPP Table improvements commit 2b59d07 Author: KelvinTegelaar <[email protected]> Date: Mon Aug 14 23:10:19 2023 +0200 add button tables commit 389b13a Author: KelvinTegelaar <[email protected]> Date: Mon Aug 14 17:13:40 2023 +0200 new bpa commit 9c210c7 Author: KelvinTegelaar <[email protected]> Date: Sat Aug 12 01:09:04 2023 +0200 prevent cipptable from crashing a page commit 9a86d67 Author: KelvinTegelaar <[email protected]> Date: Fri Aug 11 00:08:38 2023 +0200 fix for results arr, not pretty but it'll do pig. commit 58370c0 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 23:50:27 2023 +0200 fixes issuers with returned results commit ccbc0f7 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 23:47:43 2023 +0200 prevent crashes if result is empty commit 73fe477 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 23:31:46 2023 +0200 improvements to alerts commit 0262511 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 15:00:27 2023 +0200 Removed duplicate entry commit 6aba60f Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 10:52:42 2023 +0200 added ipv6 support commit 36f745e Merge: 6aee2db 7cbd462 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 10:50:49 2023 +0200 Merge pull request KelvinTegelaar#1678 from STG-Tanner/dev Update M365Licenses.json commit 6aee2db Merge: ec3feab b9a0e95 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 10:48:02 2023 +0200 Merge pull request KelvinTegelaar#1677 from johnduprey/dev Add Delete GDAP Role Mapping commit ec3feab Merge: 2d6a910 0e58106 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 10 10:47:37 2023 +0200 Merge pull request KelvinTegelaar#1679 from johnduprey/m365-portal-change M365 Portal Change commit 0e58106 Author: John Duprey <[email protected]> Date: Wed Aug 9 17:05:01 2023 -0400 M365 Portal Change Replace portal.office.com with admin.microsoft.com commit b9a0e95 Merge: 41d9770 2d6a910 Author: John Duprey <[email protected]> Date: Wed Aug 9 16:58:50 2023 -0400 Merge pull request KelvinTegelaar#39 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 7cbd462 Author: STG-Tanner <[email protected]> Date: Wed Aug 9 14:49:03 2023 -0500 Update M365Licenses.json Updated to July 28th, 2023 revision. commit 41d9770 Author: John Duprey <[email protected]> Date: Wed Aug 9 15:04:57 2023 -0400 Add exportSelector to license exclusion commit 2d6a910 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 9 20:53:09 2023 +0200 added geo ip lookup commit 2b29be3 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 9 00:21:57 2023 +0200 added severity to alerts commit d16e402 Author: John Duprey <[email protected]> Date: Tue Aug 8 18:05:09 2023 -0400 Update ListGDAPRoles.js Add delete role mapping action commit 320e2b3 Merge: dc79cb7 9c888be Author: John Duprey <[email protected]> Date: Tue Aug 8 17:35:06 2023 -0400 Merge pull request KelvinTegelaar#38 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 9c888be Merge: 8de2017 97e5be0 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 8 23:18:09 2023 +0200 Merge pull request KelvinTegelaar#1665 from BNWEIN/dev Added Functionality to CIPP Notifications so you can filter by severity commit 8de2017 Author: KelvinTegelaar <[email protected]> Date: Tue Aug 8 10:46:08 2023 +0200 added ops commit 663f94b Author: KelvinTegelaar <[email protected]> Date: Mon Aug 7 22:42:00 2023 +0200 corrected typo commit db74121 Author: KelvinTegelaar <[email protected]> Date: Mon Aug 7 22:39:24 2023 +0200 fix commit 32fe72e Author: KelvinTegelaar <[email protected]> Date: Mon Aug 7 12:09:56 2023 +0200 fixed typo commit 8cbc362 Author: KelvinTegelaar <[email protected]> Date: Mon Aug 7 10:52:56 2023 +0200 added adding of webhook based alerts commit dc79cb7 Merge: 39b4c8c a53ffa2 Author: John Duprey <[email protected]> Date: Sat Aug 5 14:36:54 2023 -0400 Merge pull request KelvinTegelaar#36 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit a53ffa2 Merge: bb28a63 1ad2b71 Author: KelvinTegelaar <[email protected]> Date: Sat Aug 5 16:32:24 2023 +0200 Merge pull request KelvinTegelaar#1675 from DChorn-ANS/dev-1 CellBooleanformatter fix commit 1ad2b71 Author: DChorn-ANS <[email protected]> Date: Fri Aug 4 10:59:19 2023 -0600 CellBooleanformatter fix Cellbooleanformatter was not treating disabled as false commit bb28a63 Merge: a598530 4b50b87 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 3 14:23:33 2023 +0200 Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev commit 4b50b87 Merge: 5eade87 330ab51 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 3 12:48:57 2023 +0200 Merge pull request KelvinTegelaar#1670 from rvdwegen/patch-1 Fix input validation to support both domain and GUID commit 5eade87 Merge: 5db8164 39b4c8c Author: KelvinTegelaar <[email protected]> Date: Thu Aug 3 12:48:43 2023 +0200 Merge pull request KelvinTegelaar#1671 from johnduprey/dev Azure Cloud Shell commit a598530 Author: KelvinTegelaar <[email protected]> Date: Thu Aug 3 12:24:29 2023 +0200 correction in add tempalte commit 97e5be0 Author: BNWEIN <[email protected]> Date: Thu Aug 3 10:19:08 2023 +0100 Updated wording. updated wording. commit 33d1c70 Author: BNWEIN <[email protected]> Date: Thu Aug 3 09:55:55 2023 +0100 Added Cell Tip Added Cell Tip commit 39b4c8c Author: John Duprey <[email protected]> Date: Wed Aug 2 23:54:34 2023 -0400 Azure Cloud Shell - Add new section to Backend URLs - Add CippOffcanvas with preset commands - Cleanup card layout commit fceefbb Merge: 1f0d42e 5db8164 Author: John Duprey <[email protected]> Date: Wed Aug 2 21:00:32 2023 -0400 Merge pull request KelvinTegelaar#33 from KelvinTegelaar/dev commit 330ab51 Author: Roel van der Wegen <[email protected]> Date: Thu Aug 3 00:54:05 2023 +0200 Fix input validation to support both domain and GUID commit 5db8164 Merge: 3e4cbf9 4927e2b Author: KelvinTegelaar <[email protected]> Date: Wed Aug 2 21:14:24 2023 +0200 Merge pull request KelvinTegelaar#1668 from redanthrax/ChromeDebug added chrome debug launch, task casing/formatting commit 4927e2b Author: redanthrax <[email protected]> Date: Wed Aug 2 08:58:21 2023 -0700 added chrome debug launch, task casing/formatting commit a5f8ad6 Author: BNWEIN <[email protected]> Date: Wed Aug 2 11:12:34 2023 +0100 Added Functionality to CIPP Notifications so you can filter by severity Added Functionality to CIPP Notifications so you can filter by severity commit 3e4cbf9 Merge: 1e4eef2 54b0407 Author: KelvinTegelaar <[email protected]> Date: Wed Aug 2 09:57:36 2023 +0200 Merge pull request KelvinTegelaar#1664 from redanthrax/DevEnv removed ssl, fixed ws hotreload, azurite location commit 54b0407 Author: redanthrax <[email protected]> Date: Tue Aug 1 16:37:02 2023 -0700 removed ssl, fixed ws hotreload, azurite location commit 1e4eef2 Merge: 59c3a93 e82a6f8 Author: KelvinTegelaar <[email protected]> Date: Mon Jul 31 16:15:12 2023 +0200 Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev commit e82a6f8 Merge: 710f02b 4732866 Author: KelvinTegelaar <[email protected]> Date: Mon Jul 31 16:14:09 2023 +0200 Merge pull request KelvinTegelaar#1656 from BNWEIN/dev Dev commit 710f02b Merge: aa8c361 d65811b Author: KelvinTegelaar <[email protected]> Date: Mon Jul 31 16:13:48 2023 +0200 Merge pull request KelvinTegelaar#1657 from DChorn-ANS/patch-7 Update MEMListPolicyTemplates.js commit aa8c361 Merge: 45ef541 93d5133 Author: KelvinTegelaar <[email protected]> Date: Mon Jul 31 16:13:32 2023 +0200 Merge pull request KelvinTegelaar#1659 from DChorn-ANS/patch-8 Update ListLicences.js commit 59c3a93 Author: KelvinTegelaar <[email protected]> Date: Mon Jul 31 16:12:47 2023 +0200 fix display bug commit 93d5133 Author: DChorn-ANS <[email protected]> Date: Sun Jul 30 20:18:10 2023 -0600 Update ListLicences.js adjusting labelling commit d65811b Author: DChorn-ANS <[email protected]> Date: Sun Jul 30 14:22:26 2023 -0600 Update MEMListPolicyTemplates.js Correct display issues commit 4732866 Author: BNWEIN <[email protected]> Date: Fri Jul 28 11:03:34 2023 +0100 Added SendOnBehalf Function Added ability to add and remove "send on behalf" permissions from the edit mailbox screen commit 3755e7f Author: BNWEIN <[email protected]> Date: Fri Jul 28 08:44:20 2023 +0100 Fixed Enabling Online Archiving Fixed Issue mentioned here: KelvinTegelaar#1655 commit 1f0d42e Merge: df9dbfb 45ef541 Author: John Duprey <[email protected]> Date: Thu Jul 27 09:46:12 2023 -0400 Merge pull request KelvinTegelaar#29 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 52e674f Author: BNWEIN <[email protected]> Date: Thu Jul 27 10:30:04 2023 +0100 Update package-lock.json commit 9e101be Merge: 4854132 45ef541 Author: BNWEIN <[email protected]> Date: Wed Jul 26 16:31:51 2023 +0100 Merge branch 'KelvinTegelaar:dev' into dev commit 45ef541 Merge: 6dccfc7 281767c Author: KelvinTegelaar <[email protected]> Date: Tue Jul 25 23:00:33 2023 +0200 Merge pull request KelvinTegelaar#1649 from redanthrax/DisableOneDriveShortcutStandard standards tooltip added onedrive shortcut standard commit 281767c Author: redanthrax <[email protected]> Date: Tue Jul 25 13:08:02 2023 -0700 standards tooltip added onedrive shortcut standard commit 4854132 Merge: 4b415d5 6dccfc7 Author: BNWEIN <[email protected]> Date: Tue Jul 25 10:17:28 2023 +0100 Merge pull request KelvinTegelaar#11 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 6dccfc7 Merge: e423dea 499ecee Author: KelvinTegelaar <[email protected]> Date: Tue Jul 25 10:04:21 2023 +0200 Merge pull request KelvinTegelaar#1645 from redanthrax/Node18 fix launch settings for https node 18 enforcement commit e423dea Merge: 7a99a68 1471a9d Author: KelvinTegelaar <[email protected]> Date: Tue Jul 25 09:50:19 2023 +0200 Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev commit 7a99a68 Author: KelvinTegelaar <[email protected]> Date: Tue Jul 25 09:50:14 2023 +0200 fix lost marker. commit 1471a9d Merge: 59cc85d 087c1ea Author: KelvinTegelaar <[email protected]> Date: Mon Jul 24 22:55:23 2023 +0200 Merge pull request KelvinTegelaar#1647 from PeakeIT/PeakeIT-correct-azure-portal-link commit 087c1ea Author: PeakeIT <[email protected]> Date: Mon Jul 24 16:51:27 2023 -0400 Correct client Azure portal link commit 499ecee Author: redanthrax <[email protected]> Date: Mon Jul 24 12:39:34 2023 -0700 fix launch settings for https node 18 enforcement commit df9dbfb Merge: 2e003e0 59cc85d Author: John Duprey <[email protected]> Date: Fri Jul 21 14:07:33 2023 -0400 Merge branch 'KelvinTegelaar:dev' into dev commit 4b415d5 Merge: eaf09af 3775e99 Author: BNWEIN <[email protected]> Date: Fri Jul 21 08:52:44 2023 +0100 Merge pull request KelvinTegelaar#9 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 2e003e0 Merge: cc8e6a0 3775e99 Author: John Duprey <[email protected]> Date: Thu Jul 20 20:39:13 2023 -0400 Merge pull request KelvinTegelaar#22 from KelvinTegelaar/dev commit eaf09af Merge: c53a8bd e77009b Author: BNWEIN <[email protected]> Date: Thu Jul 20 16:57:14 2023 +0100 Merge pull request #8 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit c53a8bd Merge: da5df36 4b36eae Author: BNWEIN <[email protected]> Date: Thu Jul 20 08:02:32 2023 +0100 Merge pull request #6 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit da5df36 Merge: 3bf7433 c4fd5f5 Author: BNWEIN <[email protected]> Date: Wed Jul 19 11:25:32 2023 +0100 Merge pull request #5 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev commit 3bf7433 Merge: 1195f47 974de05 Author: BNWEIN <[email protected]> Date: Mon Jul 17 21:52:32 2023 +0100 Merge pull request #3 from KelvinTegelaar/dev [pull] dev from KelvinTegelaar:dev
1 parent 10e2f94 commit 59ec38a

Some content is hidden

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

41 files changed

+27464
-14621
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ PORT=3000
22
CHOKIDAR_USEPOLLING=true
33
BROWSER=none
44
GENERATE_SOURCEMAP=false
5-
WDS_SOCKET_PORT=0
5+
WDS_SOCKET_PORT=3000

.vscode/cert.crt

Lines changed: 0 additions & 23 deletions
This file was deleted.

.vscode/key.key

Lines changed: 0 additions & 28 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,30 @@
99
"cwd": "${file}"
1010
},
1111
{
12-
"command": "npm run start-api",
13-
"name": "Run emulator",
12+
"command": "npm run start-swa",
13+
"name": "Run Emulator",
1414
"request": "launch",
1515
"type": "node-terminal"
1616
},
1717
{
1818
"command": "npm start",
19-
"name": "Run frontend",
19+
"name": "Run Frontend",
2020
"request": "launch",
2121
"type": "node-terminal",
22-
"preLaunchTask": "RunAllTasks",
22+
"preLaunchTask": "Run All Tasks",
2323
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"]
2424
},
2525
{
26-
"name": "Launch Edge",
26+
"type": "chrome",
2727
"request": "launch",
28-
"type": "pwa-msedge",
29-
"url": "https://localhost:4280",
30-
"webRoot": "${workspaceFolder}"
31-
},
32-
{
33-
"name": "Attach to Edge",
34-
"port": 9222,
35-
"request": "attach",
36-
"type": "pwa-msedge",
37-
"urlFilter": "https://localhost:4280/*",
38-
"webRoot": "${workspaceFolder}"
28+
"name": "Launch Chrome Debugger",
29+
"url": "http://localhost:4280"
3930
}
4031
],
4132
"compounds": [
4233
{
4334
"name": "Launch it all 🚀",
44-
"configurations": ["Run frontend", "Run emulator"]
35+
"configurations": ["Run Frontend", "Run Emulator"]
4536
}
4637
]
4738
}

.vscode/tasks.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "RunAllTasks",
6-
"dependsOn": ["RunAPI", "RunAzurite"]
5+
"label": "Run All Tasks",
6+
"dependsOn": ["Run API", "Run Azurite"]
77
},
88
{
9-
"label": "RunAzurite",
9+
"label": "Run Azurite",
1010
"type": "shell",
11-
"command": "azurite",
11+
"command": "azurite --location ../",
1212
"isBackground": true,
1313
"problemMatcher": {
1414
"pattern": [
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
{
30-
"label": "RunAPI",
30+
"label": "Run API",
3131
"type": "shell",
3232
"command": "func start --verbose",
3333
"isBackground": true,

package-lock.json

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"test": "react-scripts test",
2222
"test:cov": "npm test -- --coverage --watchAll=false",
2323
"test:debug": "react-scripts --inspect-brk test --runInBand",
24-
"start-api": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location .vscode http://localhost:3000 --api-location http://localhost:7071",
24+
"start-swa": "swa start --swa-config-location .vscode http://127.0.0.1:3000 --api-location http://localhost:7071",
2525
"prepare": "husky install"
2626
},
2727
"config": {
@@ -92,13 +92,13 @@
9292
"prettier": "2.4.1",
9393
"react-scripts": "^5.0.0",
9494
"redux-immutable-state-invariant": "^2.1.0",
95-
"sass": "^1.44",
95+
"sass": "^1.64.2",
9696
"stylelint": "^14.3.0",
9797
"stylelint-config-sass-guidelines": "^9.0.1",
9898
"stylelint-order": "^5.0.0"
9999
},
100100
"engines": {
101-
"node": "16",
101+
"node": "18",
102102
"npm": ">=7"
103103
}
104104
}

public/version_latest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.8.0
1+
4.0.0

src/_nav.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const _nav = [
161161
},
162162
{
163163
component: CNavItem,
164-
name: 'Scheduled Alerts',
164+
name: 'Alerts Configuration',
165165
to: '/tenant/administration/alertsqueue',
166166
},
167167
{
@@ -188,6 +188,11 @@ const _nav = [
188188
name: 'Application Approval',
189189
to: '/tenant/administration/appapproval',
190190
},
191+
{
192+
component: CNavItem,
193+
name: 'Geo IP Lookup',
194+
to: '/tenant/tools/geoiplookup',
195+
},
191196
{
192197
component: CNavItem,
193198
name: 'Tenant Lookup',
Loading

0 commit comments

Comments
 (0)