Skip to content

Commit 3580f47

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #258 from KelvinTegelaar/dev
Upgrading Dev to Release
2 parents 7cedc42 + 9ebcf69 commit 3580f47

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

+10104
-201
lines changed

‎.editorconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Editor configuration, see http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
end_of_line = lf
7+
indent_size = 2
8+
indent_style = space
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.md]
13+
max_line_length = off
14+
trim_trailing_whitespace = false

‎.eslintignore‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Ignore artifacts:
2+
build
3+
.github
4+
5+
# Ignore assets
6+
assets
7+
8+
# Ignore vendor libs:
9+
css/bootstrap.min.css
10+
css/dataTables.bootstrap5.min.css
11+
css/styles.css
12+
js/datatables/Buttons-2.0.1
13+
js/datatables/JSZip-2.5.0
14+
js/datatables/pdfmake-0.1.36
15+
js/datatables/bootstable.min.js
16+
js/datatables/jquery.dataTables.js
17+
js/bootstrap.bundle.min.js
18+
js/fa.all.min.js
19+
js/feather.min.js
20+
js/jquery-3.6.0.min.js
21+
js/litepicker.js
22+
js/markdown.js
23+
js/countrylist.json
24+
25+
# Ignore markdown (for now)
26+
*.md
27+
Documentation

‎.eslintrc.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
node: true,
5+
jquery: true,
6+
},
7+
parserOptions: {
8+
ecmaVersion: 2017,
9+
sourceType: 'script',
10+
},
11+
plugins: ['html'],
12+
settings: {
13+
'html/indent': '+2',
14+
},
15+
extends: [
16+
'eslint:recommended',
17+
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
18+
],
19+
globals: {
20+
feather: 'readonly',
21+
bootstrap: 'readonly',
22+
},
23+
rules: {
24+
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
25+
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
26+
'no-var': 'warn',
27+
'no-unused-vars': 'warn',
28+
},
29+
};

‎.gitignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
2+
# editor, github and lint
3+
.github/
4+
.vscode/
5+
.idea/
6+
.husky/
7+
.eslintcache
8+
# node packages
9+
node_modules
110
# Ignore all files in .github and .vscode directories.
211
.github/
312
.vscode/
413
# Except pre-approved CI/CD files.
514
!.github/workflows/Version_Check.yml
6-
!.github/workflows/Docs.yml
15+
!.github/workflows/Docs.yml

‎.node-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16

‎.prettierignore‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Ignore artifacts:
2+
build
3+
.github
4+
5+
# Ignore assets
6+
assets
7+
8+
# Ignore vendor libs:
9+
css/bootstrap.min.css
10+
css/dataTables.bootstrap5.min.css
11+
css/styles.css
12+
js/countrylist.json
13+
js/datatables/Buttons-2.0.1
14+
js/datatables/JSZip-2.5.0
15+
js/datatables/pdfmake-0.1.36
16+
js/datatables/bootstable.min.js
17+
js/datatables/jquery.dataTables.js
18+
js/bootstrap.bundle.min.js
19+
js/fa.all.min.js
20+
js/feather.min.js
21+
js/jquery-3.6.0.min.js
22+
js/litepicker.js
23+
js/markdown.js
24+
25+
# Ignore markdown (for now)
26+
*.md
27+
Documentation

‎.prettierrc.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
semi: true,
3+
trailingComma: 'all',
4+
singleQuote: true,
5+
printWidth: 100,
6+
tabWidth: 2,
7+
};

‎AddIntunePolicyTemplate.html‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<main>
2+
<form name="edituserform" id="Userform">
3+
<header class="page-header page-header-compact page-header-light border-bottom bg-white mb-4">
4+
<div class="container-xl px-4">
5+
<div class="page-header-content">
6+
<div class="row align-items-center justify-content-between pt-3">
7+
<div class="col-auto mb-3">
8+
<h1 class="page-header-title">
9+
<div class="page-header-icon"><i data-feather="user-plus"></i></div>
10+
Add Intune Policy Template
11+
</h1>
12+
</div>
13+
<div class="col-12 col-xl-auto mb-3">
14+
<a class="btn btn-sm btn-light text-primary" href="index.html?page=users">
15+
<i class="me-1" data-feather="arrow-left"></i>
16+
Back to Users
17+
</a>
18+
</div>
19+
</div>
20+
</div>
21+
</div>
22+
</header>
23+
<!-- Main page content-->
24+
<div class="container-xl px-4 mt-4">
25+
<div class="row">
26+
27+
28+
<div class="col-xl-8">
29+
<!-- Account details card-->
30+
<div class="card mb-4">
31+
<div class="card-header">Template details</div>
32+
33+
<div class="card-body">
34+
<div class="mb-3">
35+
<label class="small mb-1" for="DisplayName">Display Name</label>
36+
<input class="form-control" id="DisplayName" placeholder="Enter the display name"
37+
value="" name="DisplayName" />
38+
</div>
39+
<div class="mb-3">
40+
<label class="small mb-1" for="Description">Description</label>
41+
<input class="form-control" id="Description" placeholder="Enter the description"
42+
value="" name="Description" />
43+
</div>
44+
<div class="mb-3">
45+
<label for="TemplateType">Select policy type</label>
46+
<select name="TemplateType" class="form-control" id="TemplateType">
47+
<option value="Admin">Administrative Template</option>
48+
<option value="Catalog">Settings Catalog</option>
49+
<option value="Device">Custom Configuration</option>
50+
</select>
51+
</div>
52+
<div class="mb-3">
53+
<label class="small mb-1" for="RawJSON">Raw JSON</label>
54+
<textarea name="RawJSON" class="form-control" id="RawJSON" type="email"
55+
placeholder="Enter raw JSON information." value=""></textarea>
56+
</div>
57+
<!-- Form Group (email address)-->
58+
59+
<button class="btn btn-primary" onclick='PostForm("Userform","api/AddIntuneTemplate")'' type="button">Add
60+
Template</button>
61+
</div>
62+
</div>
63+
</div>
64+
65+
</div>
66+
</div>
67+
</form>
68+
<button class="btn btn-primary" id="PopModal" type="button" data-bs-toggle="modal" data-bs-target="#exampleModal"
69+
style="display:none;"></button>
70+
<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
71+
aria-hidden="true">
72+
<div class="modal-dialog" role="document">
73+
<div class="modal-content">
74+
<div class="modal-header">
75+
<h5 class="modal-title" id="exampleModalLabel">Results</h5>
76+
</div>
77+
<div class="modal-body">
78+
<section id="APIContent">
79+
<div class="spinner-border text-primary" role="status">
80+
<span class="sr-only"></span>
81+
</div></span>
82+
</section>
83+
</div>
84+
<div class="modal-footer"><button class="btn btn-secondary" type="button"
85+
data-bs-dismiss="modal">Close</button>
86+
</div>
87+
</div>
88+
</div>
89+
</main>

‎AddPolicy.html‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ <h5 class="card-title mb-4">Enter the raw JSON for this policy. See
110110
href="https://github.com/KelvinTegelaar/CIPP/blob/master/Documentation/DeployPolicy.md">this
111111
link</a> for more information
112112
</h5>
113+
114+
Please choose a template to apply, or enter the information manually.
115+
<div> <input class="form-control" name="User" list="TemplateListOptions"
116+
id="TemplateList" placeholder="Type to search..."
117+
oninput='onInputTemplateList()'>
118+
<datalist id="TemplateListOptions">
119+
</datalist>
120+
</div>
113121
<div class="mb-3">
114122
<label for="TemplateType">Select policy type</label>
115123
<select name="TemplateType" class="form-control" id="TemplateType">
@@ -119,13 +127,13 @@ <h5 class="card-title mb-4">Enter the raw JSON for this policy. See
119127
</select>
120128
</div>
121129
<div class="mb-3">
122-
<label class="small mb-1" for="inputEmailAddress">Policy Name</label>
123-
<input class="form-control" id="inputEmailAddress"
130+
<label class="small mb-1" for="Displayname">Policy Name</label>
131+
<input class="form-control" id="Displayname"
124132
placeholder="Enter the display name" value="" name="DisplayName" />
125133
</div>
126134
<div class="mb-3">
127-
<label class="small mb-1" for="inputEmailAddress">Description</label>
128-
<input class="form-control" id="inputEmailAddress"
135+
<label class="small mb-1" for="Description">Description</label>
136+
<input class="form-control" id="Description"
129137
placeholder="Enter the display name" value="" name="Description" />
130138
</div>
131139
<div class="mb-3">
@@ -227,6 +235,6 @@ <h5 class="modal-title" id="exampleModalLabel">Results</h5>
227235
<script src="js/datatables/jquery.dataTables.js"></script>
228236
<script src="js/datatables/WizardButtons.js"></script>
229237
<script src="js/datatables/datatablestenantsWizards.js"></script>
230-
238+
<script src="js/TemplateList.js"></script>
231239

232240
</html>

‎Addstandard.html‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,78 +129,96 @@ <h5 class="card-title mb-4">Select the standard you want to apply</h5>
129129
These standards will be applied every 3 hours on a repeated schedule.
130130
<div class="form-check mb-2">
131131
<input class="form-check-input" id="AuditLog" name="AuditLog" type="checkbox"
132-
value="true" checked />
132+
value="true" />
133133
<label class="form-next buttocheck-label" for="AuditLog">Enable the
134134
Unified Audit Log</label>
135135
</div>
136136
<div class="form-check mb-2">
137137
<input class="form-check-input" id="SecurityDefaults" name="SecurityDefaults"
138-
type="checkbox" value="true" checked />
138+
type="checkbox" value="true" />
139139
<label class="form-next buttocheck-label" for="SecurityDefaults">Enable Security
140140
Defaults</label>
141141
</div>
142142
<div class="form-check mb-2">
143143
<input class="form-check-input" id="DelegateSentItems" name="DelegateSentItems"
144-
type="checkbox" value="true" checked />
144+
type="checkbox" value="true" />
145145
<label class="form-next buttocheck-label" for="DelegateSentItems">Set mailbox
146146
Sent Items delegation (Sent items for shared mailboxes)</label>
147147
</div>
148148
<div class="form-check mb-2">
149149
<input class="form-check-input" id="OauthConsent" name="OauthConsent"
150-
type="checkbox" value="true" checked />
150+
type="checkbox" value="true" />
151151
<label class="form-next buttocheck-label" for="OauthConsent">Require
152152
admin consent for applications (Prevent OAuth phishing)</label>
153153
</div>
154154
<div class="form-check mb-2">
155155
<input class="form-check-input" id="PasswordExpireDisabled"
156-
name="PasswordExpireDisabled" type="checkbox" value="true" checked />
156+
name="PasswordExpireDisabled" type="checkbox" value="true" />
157157
<label class="form-next buttocheck-label" for="PasswordExpireDisabled">Do not
158158
expire passwords</label>
159159
</div>
160160
<div class="form-check mb-2">
161161
<input class="form-check-input" id="AnonReportDisable" name="AnonReportDisable"
162-
type="checkbox" value="true" checked />
162+
type="checkbox" value="true" />
163163
<label class="form-next buttocheck-label" for="AnonReportDisable">Enable
164164
Usernames instead of pseudo anonymised names
165165
in reports</label>
166166
</div>
167167
<div class="form-check mb-2">
168168
<input class="form-check-input" id="SSPR" name="SSPR" type="checkbox"
169-
value="true" checked />
169+
value="true" />
170170
<label class="form-next buttocheck-label" for="SSPR">Enable Self
171171
Service Password Reset</label>
172172
</div>
173173
<div class="form-check mb-2">
174174
<input class="form-check-input" id="ModernAuth" name="ModernAuth"
175-
type="checkbox" value="true" checked />
175+
type="checkbox" value="true" />
176176
<label class="form-next buttocheck-label" for="ModernAuth">Enable Modern
177177
Authentication</label>
178178
</div>
179179
<div class="form-check mb-2">
180180
<input class="form-check-input" id="DisableBasicAuth" name="DisableBasicAuth"
181-
type="checkbox" value="true" checked />
181+
type="checkbox" value="true" />
182182
<label class="form-next buttocheck-label" for="DisableBasicAuth">Disable Basic
183183
Authentication</label>
184184
</div>
185185
<div class="form-check mb-2">
186186
<input class="form-check-input" id="DisableSharedMailbox"
187-
name="DisableSharedMailbox" type="checkbox" value="true" checked />
187+
name="DisableSharedMailbox" type="checkbox" value="true" />
188188
<label class="form-next buttocheck-label" for="DisableSharedMailbox">Disable
189189
Shared Mailbox AAD accounts</label>
190190
</div>
191191
<div class="form-check mb-2">
192192
<input class="form-check-input" id="AutoExpandArchive" name="AutoExpandArchive"
193-
type="checkbox" value="true" checked />
193+
type="checkbox" value="true" />
194194
<label class="form-next buttocheck-label" for="AutoExpandArchive">Enable
195195
Auto-expanding archives</label>
196196
</div>
197+
<div class="form-check mb-2">
198+
<input class="form-check-input" id="SpoofWarn" name="SpoofWarn" type="checkbox"
199+
value="true" />
200+
<label class="form-next buttocheck-label" for="SpoofWarn">Enable
201+
Spoofing warnings for Outlook (This e-mail is external identifiers)</label>
202+
</div>
197203
<div class="form-check mb-2">
198204
<input class="form-check-input" id="LegacyMFA" name="LegacyMFA" type="checkbox"
199-
value="true" checked />
205+
value="true" />
200206
<label class="form-next buttocheck-label" for="LegacyMFA">Enable
201207
per-user MFA for all users</label>
202208
</div>
203209

210+
<div class="form-check mb-2">
211+
<input class="form-check-input" id="UndoSSPR" name="UndoSSPR" type="checkbox"
212+
value="true" />
213+
<label class="form-next buttocheck-label" for="UndoSSPR">Undo SSPR
214+
Standard</label>
215+
</div>
216+
<div class="form-check mb-2">
217+
<input class="form-check-input" id="UndoOauth" name="UndoOauth" type="checkbox"
218+
value="true" />
219+
<label class="form-next buttocheck-label" for="UndoOauth">Undo App Consent
220+
Standard</label>
221+
</div>
204222
<hr class="my-4" />
205223
<div class="d-flex justify-content-between">
206224
<a class="nav-link active wizardbutton" href="#wizard1-tab">

0 commit comments

Comments
 (0)