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

Manual Pull Request #3238

Closed
wants to merge 115 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
abb5e6f
ci: add Azure Static Web Apps workflow file
EberlyCIPP Aug 4, 2022
52cba69
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Aug 10, 2022
4d40322
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Sep 14, 2022
52b0d87
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Sep 26, 2022
2d25023
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Sep 30, 2022
2c7ec8a
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Oct 17, 2022
9cfb09b
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Nov 1, 2022
d55ce05
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Nov 21, 2022
0282bf5
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Dec 5, 2022
8c79302
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Dec 20, 2022
0f4d53b
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Jan 27, 2023
b681d63
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Feb 24, 2023
fb6431c
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Mar 13, 2023
9a1811b
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Mar 20, 2023
56f1398
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Apr 19, 2023
85ee731
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim May 1, 2023
c04858f
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim May 8, 2023
6228f92
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim May 16, 2023
c36fac3
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Jun 13, 2023
5db5932
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Jul 26, 2023
7677b40
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Aug 18, 2023
9c5df08
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Sep 1, 2023
10954b7
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Oct 27, 2023
6680e6b
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Nov 30, 2023
a869077
Merge branch 'KelvinTegelaar:main' into main
gurupilgrim Dec 29, 2023
384c7e8
Merge pull request #1 from KelvinTegelaar/main
gurupilgrim Jan 25, 2024
9375878
Merge pull request #2 from KelvinTegelaar/main
gurupilgrim Mar 5, 2024
61000f6
Merge pull request #3 from KelvinTegelaar/main
pull[bot] Mar 15, 2024
0061bbd
Merge pull request #2807 from KelvinTegelaar/dev
JohnDuprey Aug 12, 2024
4b04d38
Merge pull request #66 from KelvinTegelaar/dev
kris6673 Aug 14, 2024
5b9a833
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Aug 19, 2024
51b2170
Merge pull request #2837 from KelvinTegelaar/dev
KelvinTegelaar 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
977d3a0
Merge pull request #4 from KelvinTegelaar/main
jrdnr Aug 30, 2024
557efcd
Update .gitignore
JohnDuprey Sep 5, 2024
b8c26ec
CippAppPermissionBuilder fixes
JohnDuprey Sep 30, 2024
facbb46
Merge pull request #2908 from JohnDuprey/dev
JohnDuprey Sep 30, 2024
3b87108
Add zipdeploy
JohnDuprey Oct 4, 2024
37fb0e6
Cleanup api reference
JohnDuprey Oct 4, 2024
85f9e44
Merge pull request #216 from KelvinTegelaar/dev
JohnDuprey Oct 4, 2024
9b8cd90
Merge pull request #2921 from JohnDuprey/dev
JohnDuprey Oct 4, 2024
f3862a2
up version
JohnDuprey Oct 4, 2024
e18ffcb
Merge pull request #2922 from JohnDuprey/dev
JohnDuprey Oct 4, 2024
65176b0
Merge pull request #2923 from KelvinTegelaar/dev
JohnDuprey Oct 4, 2024
4d9dad5
Merge pull request #5 from KelvinTegelaar/main
pull[bot] Oct 5, 2024
6fcf613
updated extensions
KelvinTegelaar Dec 5, 2024
53aee74
Merge pull request #6 from KelvinTegelaar/main
pull[bot] Dec 5, 2024
f624f90
Update package.json
KelvinTegelaar Dec 18, 2024
41eea9a
Update package.json
KelvinTegelaar Dec 18, 2024
97dcc6c
Merge pull request #7 from KelvinTegelaar/main
pull[bot] Dec 18, 2024
fdeb93a
update static web app for v7
gurupilgrim Jan 14, 2025
22e78f6
conflict cleanup
gurupilgrim Jan 14, 2025
760deaf
Merge branch 'KelvinTegelaar-main'
gurupilgrim Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 0 additions & 11 deletions .browserslistrc

This file was deleted.

14 changes: 0 additions & 14 deletions .cspell.json

This file was deleted.

696 changes: 688 additions & 8 deletions .editorconfig

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions .env

This file was deleted.

9 changes: 0 additions & 9 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ module.exports = {
react: {
version: 'detect',
},
'import/resolver': {
// added for `import {component} from 'src/component' style imports`
'eslint-import-resolver-custom-alias': {
alias: {
src: './src',
},
extensions: ['.js', '.jsx', '.json'],
},
},
},
extends: [
'eslint:recommended',
Expand Down
17 changes: 17 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"extends": "next/core-web-vitals",
"rules": {
"@next/next/no-img-element": "off",
"@next/next/no-page-custom-font": "off",
"jsx-a11y/alt-text": "off",
"react/display-name": "off",
"react/no-children-prop": "off",
"react/no-unescaped-entities": "off",
"react/jsx-max-props-per-line": [
0,
{
"maximum": 10
}
]
}
}
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Enforce Unix newlines
* text=auto eol=lf
* text=lf
45 changes: 45 additions & 0 deletions .github/workflows/azure-static-web-apps-lively-river-0dd9a610f.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- main

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_RIVER_0DD9A610F }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "/out" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_RIVER_0DD9A610F }}
action: "close"
8 changes: 4 additions & 4 deletions .github/workflows/dev_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CIPP Development Frontend CI/CD
on:
push:
branches:
- dev
- interface-rewrite

jobs:
build_and_deploy_job:
Expand All @@ -18,14 +18,14 @@ jobs:
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # change this to your repository secret name
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RW }} # change this to your repository secret name
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: 'upload'
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: '/' # App source code path
api_location: '' # Api source code path - optional
output_location: '' # Built app content directory - optional
output_location: 'out' # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
Expand All @@ -37,5 +37,5 @@ jobs:
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # change this to your repository secret name
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RW }} # change this to your repository secret name
action: 'close'
26 changes: 18 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules

node_modules
.pnp
.pnp.js
build
# testing
/coverage
coverage

# production
/build
.next
out

# misc
.eslintcache
.DS_Store
.idea
.eslintcache
.env
.env.local
.env.development.local
.env.test.local
Expand All @@ -21,4 +24,11 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
__*
<<<<<<< HEAD
__*
.next/*
=======

# vscode debug logs
debug.log
>>>>>>> fceac3a966cf35825ceb2e2e9ba0d3e26dac40b5
15 changes: 0 additions & 15 deletions .jscpd.json

This file was deleted.

9 changes: 0 additions & 9 deletions .mega-linter.yml

This file was deleted.

1 change: 0 additions & 1 deletion .node-version

This file was deleted.

4 changes: 0 additions & 4 deletions .prettierignore

This file was deleted.

7 changes: 0 additions & 7 deletions .prettierrc.json

This file was deleted.

2 changes: 0 additions & 2 deletions .secretlintignore

This file was deleted.

7 changes: 0 additions & 7 deletions .secretlintrc.json

This file was deleted.

14 changes: 0 additions & 14 deletions .stylelintrc.json

This file was deleted.

1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"recommendations": [
"github.vscode-codeql",
"dbaeumer.vscode-eslint",
"eg2.vscode-npm-script",
"christian-kohler.npm-intellisense",
"esbenp.prettier-vscode",
"stylelint.vscode-stylelint",
Expand Down
11 changes: 9 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "node-terminal"
},
{
"command": "npm start",
"command": "yarn run dev",
"name": "Run Frontend",
"request": "launch",
"type": "node-terminal",
Expand All @@ -33,7 +33,14 @@
"name": "Launch in Windows Terminal",
"request": "launch",
"cwd": "${cwd}",
"script": ". '${cwd}\\Tools\\Start-CippDevEmulators.ps1'"
"script": ". '${cwd}\\Tools\\Start-CIPPDevEmulators.ps1'"
},
{
"type": "PowerShell",
"name": "Launch in Kitty Terminal",
"request": "launch",
"cwd": "${cwd}",
"script": ". '${cwd}${pathSeparator}Tools${pathSeparator}Start-CippDevEmulatorsWithKitty.ps1'"
}
],
"compounds": [
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2 changes: 0 additions & 2 deletions .yamllint.yaml

This file was deleted.

35 changes: 0 additions & 35 deletions Generate-Import-Map.js

This file was deleted.

22 changes: 0 additions & 22 deletions Importmap.ps1

This file was deleted.

3 changes: 0 additions & 3 deletions LICENSE.CustomLicenses

This file was deleted.

Loading