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 #19

Merged
merged 69 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
8c7296f
Added Teams Global Meeting Policy standard
OfficialEsco Jul 27, 2024
a0005cc
Merge pull request #2739 from Ren-Roros-Digital/TeamsGlobalMeetingPolicy
KelvinTegelaar Jul 28, 2024
9cb5b30
Added Teams External File Sharing Standard
OfficialEsco Jul 27, 2024
3ebd874
Merge pull request #2738 from Ren-Roros-Digital/TeamsExternalFileSharing
KelvinTegelaar Jul 28, 2024
3a8c74e
Updated Spam Filter Standard
cipptesting Jul 29, 2024
e2cbb68
Updated standards.json based on feedback
cipptesting Jul 29, 2024
2bb4af8
Add controlStateUpdates table to Secure Score page
JohnDuprey Jul 29, 2024
e24a2ee
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jul 29, 2024
803b5aa
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jul 29, 2024
04b91af
Merge pull request #2743 from JohnDuprey/dev
JohnDuprey Jul 29, 2024
68d6e5c
Added Teams Email Integration standard
OfficialEsco Jul 30, 2024
562e40f
Added Teams External Access Policy Standard
OfficialEsco Jul 27, 2024
4ff9647
Add form validation for GDAP invite wizard
JohnDuprey Jul 30, 2024
da771ee
Add GDAP invite page
JohnDuprey Jul 30, 2024
5f11caf
Merge pull request #2749 from JohnDuprey/dev
JohnDuprey Jul 30, 2024
4b18fc4
wording, remove console log
JohnDuprey Jul 30, 2024
f0768c6
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Jul 30, 2024
85a84a9
Merge pull request #2750 from JohnDuprey/dev
JohnDuprey Jul 30, 2024
2152229
Merge pull request #2746 from Ren-Roros-Digital/TeamsExternalAccessPo…
KelvinTegelaar Jul 30, 2024
737fa4e
Merge pull request #2745 from Ren-Roros-Digital/TeamsEmailIntegration
KelvinTegelaar Jul 30, 2024
d46476b
Merge pull request #2742 from cipptesting/dev
KelvinTegelaar Jul 30, 2024
a6aa56c
Added Teams Federation Configuration Standard
OfficialEsco Jul 27, 2024
9929f59
Merge pull request #2740 from Ren-Roros-Digital/TeamsFederationConfig…
KelvinTegelaar Jul 31, 2024
b168c99
Message Viewer
JohnDuprey Jul 31, 2024
cb25573
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jul 31, 2024
638c1aa
Merge pull request #2754 from JohnDuprey/dev
JohnDuprey Jul 31, 2024
9b51796
upgrade user schedulder experience.
KelvinTegelaar Jul 31, 2024
78b16ef
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Jul 31, 2024
3f20d80
message view bugfixes
JohnDuprey Jul 31, 2024
0401676
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Jul 31, 2024
0065d68
Merge pull request #2756 from JohnDuprey/dev
JohnDuprey Jul 31, 2024
cff54a8
add blob: to content-security-policy
JohnDuprey Aug 1, 2024
ede1628
Merge pull request #2757 from JohnDuprey/dev
JohnDuprey Aug 1, 2024
ff56eef
add blob to default-src
JohnDuprey Aug 1, 2024
5b4a94d
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 1, 2024
72c3a02
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 1, 2024
f978031
sanitize secure score html
JohnDuprey Aug 1, 2024
e4e5ab1
Fix revokesession bulk action
JohnDuprey Aug 1, 2024
8be3b6d
SAM Roles
JohnDuprey Aug 1, 2024
8ac22e9
add device compliance alert
KelvinTegelaar Aug 1, 2024
3d4792a
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Aug 1, 2024
2cb908a
fixes https://github.com/KelvinTegelaar/CIPP/issues/2710
KelvinTegelaar Aug 1, 2024
f79e0c8
fixes https://github.com/KelvinTegelaar/CIPP/issues/2710
KelvinTegelaar Aug 1, 2024
d6059df
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Aug 1, 2024
06ba66b
Fix tenant selector
JohnDuprey Aug 1, 2024
33966f4
Merge pull request #2758 from JohnDuprey/dev
JohnDuprey Aug 1, 2024
47e8e7f
Add edit named locations
KelvinTegelaar Aug 1, 2024
01c8225
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Aug 1, 2024
c70d679
test
KelvinTegelaar Aug 1, 2024
930f997
test fix for extension multi mappings
KelvinTegelaar Aug 1, 2024
1d94b1e
fallback to actual id
KelvinTegelaar Aug 1, 2024
ed1e05b
Audit logs
JohnDuprey Aug 1, 2024
8d0f233
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 1, 2024
f8cdd26
Merge pull request #2759 from JohnDuprey/dev
JohnDuprey Aug 1, 2024
7085360
Add refresh config following a save
JohnDuprey Aug 1, 2024
aae375a
updates to layout
KelvinTegelaar Aug 2, 2024
fb51fb9
new standards apply templates for intune
KelvinTegelaar Aug 2, 2024
5facbd7
add remove of old undefined.
KelvinTegelaar Aug 2, 2024
98c9aa1
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 2, 2024
c7b6f31
revert due to license column bug.
KelvinTegelaar Aug 2, 2024
fde2501
Add message header parsing
JohnDuprey Aug 2, 2024
f36880f
Merge pull request #2762 from JohnDuprey/dev
JohnDuprey Aug 2, 2024
c755dce
Audit Logs
JohnDuprey Aug 2, 2024
5ee233d
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Aug 2, 2024
efa22da
Merge pull request #2763 from JohnDuprey/dev
JohnDuprey Aug 2, 2024
53445e6
release ready
KelvinTegelaar Aug 2, 2024
4bd7192
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Aug 2, 2024
d0b1f4f
update
KelvinTegelaar Aug 2, 2024
8db8c70
Merge pull request #2764 from KelvinTegelaar/dev
KelvinTegelaar Aug 2, 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
188 changes: 177 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "6.1.1",
"version": "6.2.0",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down Expand Up @@ -50,6 +50,8 @@
"chart.js": "^3.5.1",
"classnames": "^2.3.1",
"core-js": "^3.18.3",
"dompurify": "^3.1.6",
"eml-parse-js": "^1.1.14",
"enzyme": "^3.11.0",
"final-form": "^4.20.4",
"final-form-arrays": "^3.1.0",
Expand All @@ -69,11 +71,13 @@
"react-data-table-component": "^7.4.5",
"react-datepicker": "^4.10.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-final-form": "^6.5.9",
"react-final-form-arrays": "^3.1.4",
"react-final-form-listeners": "^1.0.3",
"react-helmet-async": "^1.3.0",
"react-hotkeys-hook": "^3.4.4",
"react-html-parser": "^2.0.2",
"react-loading-skeleton": "^3.1.0",
"react-masonry-component": "^6.3.0",
"react-media-hook": "^0.4.9",
Expand All @@ -88,7 +92,7 @@
"redux-persist": "^6.0.0",
"simplebar-react": "^2.3.6",
"source-map-loader": "^3.0.0",
"styled-components": "^5.3.3"
"styled-components": "^5.3.11"
},
"devDependencies": {
"@types/react": "^18.2.39",
Expand Down
2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.1.1
6.2.0
Loading
Loading