Skip to content

Dev to release #1898

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

Merged
merged 111 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
c1975ee
fixes issue with addtional emails not showing
KelvinTegelaar Nov 6, 2023
0cfadea
Add missing description
JohnDuprey Nov 9, 2023
429bcc7
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 9, 2023
b7d87d4
Update CIPPSettings.js
JohnDuprey Nov 9, 2023
ad814dd
Update MailboxRestoreWizard.js
JohnDuprey Nov 9, 2023
3f56c8d
Force ipv4 start-swa
JohnDuprey Nov 9, 2023
d9cf840
fix oauth colum giving object id and not application id
kris6673 Nov 10, 2023
af2ba64
Add mailbox type to Email settings pane under list user
kris6673 Nov 10, 2023
fefa5c6
Add Sign-In Status to
kris6673 Nov 11, 2023
eb2c6ff
Settings improvements
JohnDuprey Nov 11, 2023
668f06e
Tweak table filters
JohnDuprey Nov 11, 2023
50b5be6
Steal JD's code
kris6673 Nov 11, 2023
b900a46
updated repos
KelvinTegelaar Nov 13, 2023
0e62433
Merge pull request #1864 from kris6673/dev
KelvinTegelaar Nov 13, 2023
173a7cf
Merge pull request #1858 from johnduprey/dev
KelvinTegelaar Nov 13, 2023
c528e80
Merge pull request #1859 from kris6673/List-Oauth-appid-fix-API
KelvinTegelaar Nov 13, 2023
72895e0
Merge pull request #1863 from kris6673/sign-in-status
KelvinTegelaar Nov 13, 2023
89a4c3c
Merge pull request #1861 from kris6673/UserEmailSettings-recipientTyp…
KelvinTegelaar Nov 13, 2023
5324f77
Fixed alert removal
KelvinTegelaar Nov 14, 2023
3f3185a
added feature
KelvinTegelaar Nov 14, 2023
a0589af
Mailbox Restore Actions
JohnDuprey Nov 14, 2023
e8e1d32
Merge pull request #105 from KelvinTegelaar/dev
JohnDuprey Nov 14, 2023
0ca9ad2
Merge pull request #1869 from johnduprey/dev
KelvinTegelaar Nov 14, 2023
87748a0
Various changes
kris6673 Nov 14, 2023
227206d
Add tenant offboarding feature
Nov 14, 2023
2fc4903
Merge branch 'dev' of https://github.com/rvdwegen/CIPP into dev
Nov 14, 2023
9692d8f
Merge pull request #1870 from kris6673/dev
KelvinTegelaar Nov 14, 2023
c5603ae
wording
rvdwegen Nov 14, 2023
d4718db
Merge pull request #1871 from rvdwegen/dev
KelvinTegelaar Nov 14, 2023
4527baa
update imports
KelvinTegelaar Nov 14, 2023
ea60ab2
add tenant exclusion standard
KelvinTegelaar Nov 15, 2023
d034886
Merge pull request #106 from KelvinTegelaar/dev
JohnDuprey Nov 15, 2023
b77868f
scheduler in offboarding wizard
KelvinTegelaar Nov 15, 2023
3dfbd8c
Add configurable mailbox plan tenant standard
kris6673 Nov 16, 2023
25f52c8
Standard namechange
Nov 16, 2023
a971988
Merge pull request #1878 from kris6673/dev
KelvinTegelaar Nov 16, 2023
ddfb0b9
updated text
KelvinTegelaar Nov 16, 2023
76c4709
Typos
Nov 16, 2023
5e7e065
America #2 UK #1
Nov 16, 2023
dfaef33
Improved bec checks
KelvinTegelaar Nov 16, 2023
f5494e1
text changes
KelvinTegelaar Nov 16, 2023
3af4d1a
Merge branch 'dev' of https://github.com/johnduprey/CIPP into dev
JohnDuprey Nov 16, 2023
4876b8e
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Nov 16, 2023
f37082f
Merge pull request #1879 from kris6673/dev
KelvinTegelaar Nov 16, 2023
b235b64
Rename files with JSX to .jsx, move index.html to root. Change entry…
k-grube Nov 16, 2023
714239a
Bump node version to match package
k-grube Nov 16, 2023
d3afe1a
Update to react 18, update component libs. Override peerDeps for `re…
k-grube Nov 16, 2023
70151a9
Merge branch 'vite' of https://github.com/k-grube/CIPP into dev
k-grube Nov 16, 2023
fca40d2
Merge pull request #2 from k-grube/dev
k-grube Nov 16, 2023
95a5fa7
Merge pull request #1882 from k-grube/vite
KelvinTegelaar Nov 16, 2023
2a288c4
updated vars
KelvinTegelaar Nov 17, 2023
fa0230b
fixes some of the css
KelvinTegelaar Nov 17, 2023
dc77c0a
fix placeholder text
KelvinTegelaar Nov 17, 2023
7e2dc75
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 17, 2023
8be49d2
more css fixes
KelvinTegelaar Nov 17, 2023
ce94efa
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 17, 2023
6f77e0c
CPV Tweaks
JohnDuprey Nov 17, 2023
1ade9c2
Add Generate TAP button
kris6673 Nov 17, 2023
a9dd5a8
Add lots of deploy buttons
kris6673 Nov 17, 2023
cb06fa6
RFF Select Search update
JohnDuprey Nov 18, 2023
c5553e5
Add loading indicator
JohnDuprey Nov 18, 2023
5d7b9ad
Speed up mailbox queries
JohnDuprey Nov 18, 2023
f6831b3
Add Graph User filter builder
JohnDuprey Nov 18, 2023
73a6be7
Merge pull request #1885 from johnduprey/dev
KelvinTegelaar Nov 18, 2023
bfde7a9
Merge pull request #1886 from kris6673/dev
KelvinTegelaar Nov 18, 2023
b5926c9
Merge pull request #1887 from kris6673/remember-button-links
KelvinTegelaar Nov 18, 2023
a7055b7
removed console.log
KelvinTegelaar Nov 18, 2023
cc2da9b
removed console logging
KelvinTegelaar Nov 18, 2023
6c145b7
fixes input issue
KelvinTegelaar Nov 18, 2023
bc2bf02
fixes bug with unselected offboarding
KelvinTegelaar Nov 18, 2023
67231c1
fixes tenant selector button
KelvinTegelaar Nov 18, 2023
ba73c1e
Graph User Search
JohnDuprey Nov 18, 2023
5f6a919
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 18, 2023
bf387bd
fixes tenant selector
KelvinTegelaar Nov 18, 2023
977aa70
Merge pull request #1888 from johnduprey/dev
KelvinTegelaar Nov 18, 2023
ea34f1c
Global Admin modal table
JohnDuprey Nov 18, 2023
40b93f5
Add option to add owners/members to certain groups
Nov 18, 2023
67df66e
Merge pull request #1889 from johnduprey/dev
KelvinTegelaar Nov 18, 2023
ac42cc4
Merge pull request #1890 from rvdwegen/dev
KelvinTegelaar Nov 18, 2023
f15949c
some css fixes
KelvinTegelaar Nov 18, 2023
5ac8a50
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Nov 18, 2023
78df4ca
fixes issues with footer css and dropdowns
KelvinTegelaar Nov 18, 2023
f295475
update vite assetsDir, add browserslist integration. specify minimum…
k-grube Nov 18, 2023
73197f1
Merge pull request #1891 from k-grube/dev
KelvinTegelaar Nov 18, 2023
e43ae06
Clear graph filter
JohnDuprey Nov 18, 2023
6bdc9fb
Fixes actions
KelvinTegelaar Nov 19, 2023
a3f5c95
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 19, 2023
0e96eb8
Merge pull request #1892 from johnduprey/dev
KelvinTegelaar Nov 19, 2023
7153abd
Replace lodash with lodash-es
JohnDuprey Nov 19, 2023
8afe926
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Nov 19, 2023
210e3d4
Merge pull request #1893 from johnduprey/dev
KelvinTegelaar Nov 19, 2023
4e3db81
Update eslint config
k-grube Nov 19, 2023
9ead2f4
Update jsconfig, add sourcemaps
k-grube Nov 19, 2023
acf69eb
Disable sass deprecation error messages as we have no control over th…
k-grube Nov 19, 2023
9d915ce
Enable React18 rendering
k-grube Nov 19, 2023
e538099
Fix eslint issues, multiple imports, unused imports, missing propType…
k-grube Nov 19, 2023
283b198
Merge pull request #1894 from k-grube/dev
KelvinTegelaar Nov 19, 2023
b1d7828
fixes dark mode hover
KelvinTegelaar Nov 19, 2023
27fc5b8
hover
KelvinTegelaar Nov 19, 2023
ffc830e
Edit mailbox tweaks
JohnDuprey Nov 19, 2023
7603fb7
Add modal search description
JohnDuprey Nov 19, 2023
fcf335f
Merge pull request #1895 from johnduprey/dev
KelvinTegelaar Nov 19, 2023
6d041d3
fixes toasts
KelvinTegelaar Nov 19, 2023
7c46c6f
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Nov 19, 2023
ae08b4e
upped versions
KelvinTegelaar Nov 20, 2023
795e5a0
change vite config to test azure build
KelvinTegelaar Nov 20, 2023
2ff6518
back to /build
KelvinTegelaar Nov 20, 2023
006ae50
remove duplicate import
KelvinTegelaar Nov 20, 2023
fa1a0be
remove outdir as test
KelvinTegelaar Nov 20, 2023
20d5f29
readded build dir
KelvinTegelaar Nov 20, 2023
ad96209
update build command
KelvinTegelaar Nov 20, 2023
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
43 changes: 43 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
module.exports = {
env: {
browser: true,
es6: true,
node: true,
},
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
},
settings: {
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',
'plugin:import/recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
'plugin:prettier/recommended',
],
plugins: ['react-hooks', 'import'],
rules: {
'no-unused-vars': 'off',
'react/prop-types': 'warn',
// this rule is annoying on strings with quotes in them
'react/no-unescaped-entities': 'off',
},
}
17 changes: 0 additions & 17 deletions .eslintrc.json

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/Check_for_Version_Update.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
name: Check for Version Update
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches: [master, main]
workflow_dispatch:
jobs:
build:
if: github.repository_owner == 'KelvinTegelaar'
name: 'Check for Version Update'
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Close_Stale_Issues_and_PRs.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: 'Close stale issues and PRs'
on: # yamllint disable-line rule:truthy
on:
schedule:
- cron: '30 1 * * *'
jobs:
stale:
if: github.repository_owner == 'KelvinTegelaar'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/CodeQL_Analyser.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---
name: 'CodeQL'
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches: [master, main, dev, react]
schedule:
- cron: '26 17 * * 0'
jobs:
analyze:
if: github.repository_owner == 'KelvinTegelaar'
name: Analyze
runs-on: ubuntu-latest
permissions:
Expand Down
19 changes: 5 additions & 14 deletions .github/workflows/Comment_on_Issues.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: Add Comment
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- labeled
jobs:
add-comment_bug:
if: github.event.label.name == 'unconfirmed-by-user'
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'unconfirmed-by-user'
runs-on: ubuntu-latest
permissions:
issues: write
Expand All @@ -17,23 +17,14 @@ jobs:
issue-number: ${{ github.event.issue.number }}
body: |
Thank you for creating a bug. Please make sure your bug is indeed a unique case by checking current and past issues, and reading the complete documentation at https://docs.cipp.app/
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug.".
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug."

Without confirming, your report will be closed in 24 hours. If you'd like this bug to be assigned to you, please comment "I would like to work on this please!".
add-comment_fr:
if: github.event.label.name == 'enhancement'
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'enhancement'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Add Comment
uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
with:
issue-number: ${{ github.event.issue.number }}
body: |
Thank you for creating a feature request!
Your current priority is set to "No Priority". No Priority Feature requests automatically get closed in two days if a contributor does not accept the FR.

If you are a sponsor you can request an upgrade of priority. To upgrade the priority type "I would like to upgrade the priority".
If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://docs.cipp.app/dev-documentation/contributing-to-the-code. Contributors to the CIPP project reserve the right to close feature requests at will.
If you'd like this feature request to be assigned to you, please comment "I would like to work on this please!".
uses: peter-evans/create-or-update
6 changes: 3 additions & 3 deletions .github/workflows/Label_Issues.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: Label Issues
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- opened
jobs:
label_issues_bugs:
if: contains(github.event.issue.title,'Bug')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
runs-on: ubuntu-latest
permissions:
issues: write
Expand All @@ -17,7 +17,7 @@ jobs:
add-labels: 'unconfirmed-by-user'
repo-token: ${{ secrets.GITHUB_TOKEN }}
label_issues_frs:
if: contains(github.event.issue.title,'Feature')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Feature')
runs-on: ubuntu-latest
permissions:
issues: write
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Node_Project_Check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: NodeJS Project Check
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches:
- main
Expand All @@ -10,6 +10,7 @@ concurrency:
cancel-in-progress: false
jobs:
install-build:
if: github.repository_owner == 'KelvinTegelaar'
name: NPM Install and Build
runs-on: ubuntu-latest
strategy:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/label_sponsor_requests.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Label Issues
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- opened
jobs:
label_issues_bugs:
if: contains(github.event.issue.title,'Bug')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Sponsor Labels
uses: JasonEtco/[email protected]
with:
label: 'Sponsor Request'
label: 'Sponsor Request'
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
37 changes: 37 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<!--
* CoreUI Free React.js Admin Template
* @version v4.0.0
* @link https://coreui.io/react/
* Copyright (c) 2021 creativeLabs Łukasz Holeczek
* License MIT
-->
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta
name="description"
content="The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners."
/>
<meta name="author" content="CIPP Contributors" />
<title>CIPP</title>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/manifest.json" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#f77f00" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
</head>
<body>
<noscript> You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.jsx"></script>
</body>
</html>
15 changes: 0 additions & 15 deletions jest.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"module": "commonjs",
"module": "ES2022",
"baseUrl": "."
},
"include": ["./src"],
Expand Down
Loading