From 38d806d2b7ef79f1909f6dc399545a4afebf96d9 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Tue, 18 Apr 2023 19:32:01 +0200
Subject: [PATCH 1/8] Update README.md
---
README.md | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/README.md b/README.md
index 9e42be1b45e1..6b350fa81646 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,6 @@
-
-
-[](https://github.com/KelvinTegelaar/CIPP/releases)
-
-[](https://github.com/KelvinTegelaar/CIPP/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement)
-[](https://github.com/KelvinTegelaar/CIPP/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement+label%3Abug)
-[](https://discord.com/invite/cyberdrain)
-[](https://github.com/sponsors/KelvinTegelaar)
-
-
-
Sponsored by
From a007b94d4939eace271d58a51567cf5e68303dcc Mon Sep 17 00:00:00 2001
From: Roel van der Wegen
Date: Wed, 10 May 2023 17:33:02 +0200
Subject: [PATCH 2/8] Replaced old docs link
---
.github/workflows/Comment_on_Issues.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/Comment_on_Issues.yml b/.github/workflows/Comment_on_Issues.yml
index 6bd12f6a005b..80574ef5d235 100644
--- a/.github/workflows/Comment_on_Issues.yml
+++ b/.github/workflows/Comment_on_Issues.yml
@@ -16,7 +16,7 @@ jobs:
with:
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://kelvintegelaar.github.io/CIPP
+ 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.".
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!".
From e95b287b06608a83c7c1ae103d6751702bf36396 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 17:44:52 +0200
Subject: [PATCH 3/8] Create CLA.yml
---
.github/ISSUE_TEMPLATE/CLA.yml | 47 ++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/CLA.yml
diff --git a/.github/ISSUE_TEMPLATE/CLA.yml b/.github/ISSUE_TEMPLATE/CLA.yml
new file mode 100644
index 000000000000..0f8b839fdec9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/CLA.yml
@@ -0,0 +1,47 @@
+name: CLA - Contributor License Agreement
+description: Sign the CLA for CIPP and CIPP-API
+labels: [CLA]
+
+body:
+- type: markdown
+ attributes:
+ value: >
+ CONTRIBUTOR LICENSE AGREEMENT ("Agreement")
+
+ Version 1.0
+
+ 1. Definitions
+
+ "Contribution" means any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Kelvin Tegelaar for inclusion in, or documentation of, any of the products owned or managed by Kelvin Tegelaar (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Kelvin Tegelaar or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Kelvin Tegelaar for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+ "You" (or "Your") means the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Kelvin Tegelaar. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single contributor. This Agreement applies both to future Contributions and Contributions made prior to the date of this Agreement.
+
+ 2. Grant of Copyright License
+
+ Subject to the terms and conditions of this Agreement, You hereby grant to Kelvin Tegelaar and to recipients of software distributed by Kelvin Tegelaar a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works for the purpose of dual licensing the application.
+
+ 3. Grant of Patent License
+
+ You grant Kelvin Tegelaar, and those who receive the Contribution directly or indirectly from Kelvin Tegelaar, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under Your patent claims that are necessarily infringed by the Contribution or the combination of the Contribution with the Project to which it was submitted, to make, have made, use, offer to sell, sell, import, and otherwise dispose of the Contribution alone or with the Project.
+
+ 4. Other Rights Reserved
+
+ Each party reserves all rights not expressly granted in this Agreement. No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are granted by implication, exhaustion, estoppel, or otherwise.
+
+ 5. Representations
+
+ You represent that you are legally entitled to grant the above licenses. If your employer(s) has rights to intellectual property that you create, you represent that you have received permission to make Contributions on behalf of that employer, or that your employer has waived such rights for your Contributions to Kelvin Tegelaar.
+
+ You represent that each of Your Contributions is Your original creation. You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
+
+ 6. Project Sale
+
+ In the event that the Project is sold or otherwise transferred in ownership in its entirety to a third party, a sum equivalent to fifteen percent (15%) of the total sale price or value of the consideration received shall be set aside. This sum shall be divided amongst all Contributors who have entered into this Agreement, with each Contributor receiving a portion proportional to the relative quantity and significance of their Contributions to the Project, as determined by Kelvin Tegelaar. The method and timeframe of the distribution shall be at the discretion of Kelvin Tegelaar and shall be communicated
+
+- type: textarea
+ attributes:
+ label: Description
+ description: >
+ Type "I Agree" in the text area.
+ validations:
+ required: true
From 97d6a4e3ebb0b1db662025a211e5b6c1b8fa7fa0 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 17:54:39 +0200
Subject: [PATCH 4/8] Update CLA.yml
---
.github/ISSUE_TEMPLATE/CLA.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/CLA.yml b/.github/ISSUE_TEMPLATE/CLA.yml
index 0f8b839fdec9..a57e55c5783c 100644
--- a/.github/ISSUE_TEMPLATE/CLA.yml
+++ b/.github/ISSUE_TEMPLATE/CLA.yml
@@ -28,6 +28,13 @@ body:
Each party reserves all rights not expressly granted in this Agreement. No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are granted by implication, exhaustion, estoppel, or otherwise.
+ You are not expected to provide support for your Contributions, except to the extent you desire to provide
+ support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in
+ writing, you provide your Contributions on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
+ OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A
+ PARTICULAR PURPOSE.
+
5. Representations
You represent that you are legally entitled to grant the above licenses. If your employer(s) has rights to intellectual property that you create, you represent that you have received permission to make Contributions on behalf of that employer, or that your employer has waived such rights for your Contributions to Kelvin Tegelaar.
From 7693913334ae18c54fededccf1a8b8992ed18e8b Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 17:54:49 +0200
Subject: [PATCH 5/8] Update CLA.yml
---
.github/ISSUE_TEMPLATE/CLA.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/CLA.yml b/.github/ISSUE_TEMPLATE/CLA.yml
index a57e55c5783c..c2180bb38d05 100644
--- a/.github/ISSUE_TEMPLATE/CLA.yml
+++ b/.github/ISSUE_TEMPLATE/CLA.yml
@@ -31,9 +31,9 @@ body:
You are not expected to provide support for your Contributions, except to the extent you desire to provide
support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in
writing, you provide your Contributions on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
- OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A
- PARTICULAR PURPOSE.
+ ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
+ OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A
+ PARTICULAR PURPOSE.
5. Representations
From 59515095c089667230fa7b599c9724052d338513 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 18:25:15 +0200
Subject: [PATCH 6/8] Update LICENSE.CustomLicenses
---
LICENSE.CustomLicenses | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/LICENSE.CustomLicenses b/LICENSE.CustomLicenses
index cf44562e72c4..c66793baf6d3 100644
--- a/LICENSE.CustomLicenses
+++ b/LICENSE.CustomLicenses
@@ -1 +1,3 @@
-Custom licenses are available upon agreement via Github Sponsorships. Custom licenses will not have to be published in this repository. All contributors automatically agree with this provision.
\ No newline at end of file
+Custom licenses are available upon agreement via Github Sponsorships. Custom licenses will not have to be published in this repository. All contributors automatically agree with this provision.
+
+A CLA is signed by contributors if they have contributed before these provisions. Only contributions currently in the running latest release require the CLA to be signed. The CLA is signed by creating a issue using the issue template "CLA". the agreement will be related directly to available CLA template.
From ae41486b26dd31f919c058d97ed3607997bd0a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?=
Date: Sun, 29 Oct 2023 18:59:33 +0100
Subject: [PATCH 7/8] Fix various 404 links to the old docs URL
---
.github/ISSUE_TEMPLATE/feature.yml | 2 +-
.github/workflows/Comment_on_Issues.yml | 4 ++--
src/views/cipp/CIPPSettings.js | 2 +-
src/views/tenant/administration/GDAPWizard.js | 2 +-
src/views/tenant/standards/ApplyStandard.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index af41440ebfc9..de839daf7a30 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -11,7 +11,7 @@ body:
- Please search the existing feature request to see if there has been a similar issue filed.
- - If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://cipp.app/docs/dev/).
+ - If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://docs.cipp.app/dev-documentation/cipp-dev-guide/setting-up-for-local-development).
- Repeat feature requests are allowed if the previous request has been closed for more than 30 days
diff --git a/.github/workflows/Comment_on_Issues.yml b/.github/workflows/Comment_on_Issues.yml
index 6bd12f6a005b..c43a6c184869 100644
--- a/.github/workflows/Comment_on_Issues.yml
+++ b/.github/workflows/Comment_on_Issues.yml
@@ -16,7 +16,7 @@ jobs:
with:
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://kelvintegelaar.github.io/CIPP
+ 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.".
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!".
@@ -35,5 +35,5 @@ jobs:
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://cipp.app/docs/dev/. Contributors to the CIPP project reserve the right to close feature requests at will.
+ 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!".
diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
index 8c46d827521f..66c09666d7ec 100644
--- a/src/views/cipp/CIPPSettings.js
+++ b/src/views/cipp/CIPPSettings.js
@@ -402,7 +402,7 @@ const GeneralSettings = () => {
documentation on how to add permissions{' '}
here
diff --git a/src/views/tenant/administration/GDAPWizard.js b/src/views/tenant/administration/GDAPWizard.js
index 8722bde0b5f7..bf119444b18c 100644
--- a/src/views/tenant/administration/GDAPWizard.js
+++ b/src/views/tenant/administration/GDAPWizard.js
@@ -56,7 +56,7 @@ const GDAPWizard = () => {
The GDAP migration tool requires setup. Please check the documentation{' '}
here.
diff --git a/src/views/tenant/standards/ApplyStandard.js b/src/views/tenant/standards/ApplyStandard.js
index 64d9fbf0ffce..2f84f99607ea 100644
--- a/src/views/tenant/standards/ApplyStandard.js
+++ b/src/views/tenant/standards/ApplyStandard.js
@@ -83,7 +83,7 @@ const ApplyStandard = () => {
>
Ensure you read{' '}
-
+
the documentation fully
{' '}
before proceeding with this wizard. Some of the changes cannot be reverted by CIPP.
From 1aff2cc40f0eebb88c42371164b933b60fb19d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?=
Date: Sun, 29 Oct 2023 19:26:51 +0100
Subject: [PATCH 8/8] Found more stale links
---
.github/workflows/Close_Stale_Issues_and_PRs.yml | 2 +-
src/views/endpoint/intune/MEMAddPolicy.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/Close_Stale_Issues_and_PRs.yml b/.github/workflows/Close_Stale_Issues_and_PRs.yml
index 7eff0bf2f619..35bd43d9f8f0 100644
--- a/.github/workflows/Close_Stale_Issues_and_PRs.yml
+++ b/.github/workflows/Close_Stale_Issues_and_PRs.yml
@@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/stale@v4
with:
- stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://cipp.app/GettingStarted/Contributions/ . Please notify the team if you are working on this yourself.'
+ stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://docs.cipp.app/dev-documentation/contributing-to-the-code . Please notify the team if you are working on this yourself.'
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
stale-issue-label: 'no-activity'
exempt-issue-labels: 'planned'
diff --git a/src/views/endpoint/intune/MEMAddPolicy.js b/src/views/endpoint/intune/MEMAddPolicy.js
index f87f6b87dd2a..6d0eb918710e 100644
--- a/src/views/endpoint/intune/MEMAddPolicy.js
+++ b/src/views/endpoint/intune/MEMAddPolicy.js
@@ -130,7 +130,7 @@ const AddPolicy = () => {
Step 2
Enter the raw JSON for this policy. See{' '}
- this for more
+ this for more
information.