Skip to content

Commit f0e9192

Browse files
Merge branch 'master' into master
2 parents 644edb9 + ae1b12c commit f0e9192

20 files changed

+3871
-3752
lines changed

.github/workflows/master.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
- name: Generate sitemap
3737
run: npx grunt exec:sitemap
3838

39-
- name: UI Tests
40-
if: success()
41-
run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
39+
# - name: UI Tests
40+
# if: success()
41+
# run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
4242

4343
- name: Prepare for GitHub Pages
4444
if: success()

.github/workflows/pull_requests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
if: success()
3333
run: npx grunt prod
3434

35-
- name: UI Tests
36-
if: success()
37-
run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
35+
# - name: UI Tests
36+
# if: success()
37+
# run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui

.github/workflows/releases.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
if: success()
3434
run: npx grunt prod
3535

36-
- name: UI Tests
37-
if: success()
38-
run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
36+
# - name: UI Tests
37+
# if: success()
38+
# run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
3939

4040
- name: Upload Release Assets
4141
if: success()

CHANGELOG.md

+20
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ All major and minor version changes will be documented in this file. Details of
1313

1414
## Details
1515

16+
### [9.32.0] - 2021-08-18
17+
- 'Protobuf Encode' operation added and decode operation modified to allow decoding with full and partial schemas [@n1474335] | [dd18e52]
18+
19+
### [9.31.0] - 2021-08-10
20+
- 'HASSH Client Fingerprint' and 'HASSH Server Fingerprint' operations added [@n1474335] | [e9ca4dc]
21+
22+
### [9.30.0] - 2021-08-10
23+
- 'JA3S Fingerprint' operation added [@n1474335] | [289a417]
24+
25+
### [9.29.0] - 2021-07-28
26+
- 'JA3 Fingerprint' operation added [@n1474335] | [9a33498]
27+
1628
### [9.28.0] - 2021-03-26
1729
- 'CBOR Encode' and 'CBOR Decode' operations added [@Danh4] | [#999]
1830

@@ -259,6 +271,10 @@ All major and minor version changes will be documented in this file. Details of
259271

260272

261273

274+
[9.32.0]: https://github.com/gchq/CyberChef/releases/tag/v9.32.0
275+
[9.31.0]: https://github.com/gchq/CyberChef/releases/tag/v9.31.0
276+
[9.30.0]: https://github.com/gchq/CyberChef/releases/tag/v9.30.0
277+
[9.29.0]: https://github.com/gchq/CyberChef/releases/tag/v9.29.0
262278
[9.28.0]: https://github.com/gchq/CyberChef/releases/tag/v9.28.0
263279
[9.27.0]: https://github.com/gchq/CyberChef/releases/tag/v9.27.0
264280
[9.26.0]: https://github.com/gchq/CyberChef/releases/tag/v9.26.0
@@ -370,6 +386,10 @@ All major and minor version changes will be documented in this file. Details of
370386
[@Danh4]: https://github.com/Danh4
371387

372388
[8ad18b]: https://github.com/gchq/CyberChef/commit/8ad18bc7db6d9ff184ba3518686293a7685bf7b7
389+
[9a33498]: https://github.com/gchq/CyberChef/commit/9a33498fed26a8df9c9f35f39a78a174bf50a513
390+
[289a417]: https://github.com/gchq/CyberChef/commit/289a417dfb5923de5e1694354ec42a08d9395bfe
391+
[e9ca4dc]: https://github.com/gchq/CyberChef/commit/e9ca4dc9caf98f33fd986431cd400c88082a42b8
392+
[dd18e52]: https://github.com/gchq/CyberChef/commit/dd18e529939078b89867297b181a584e8b2cc7da
373393

374394
[#95]: https://github.com/gchq/CyberChef/pull/299
375395
[#173]: https://github.com/gchq/CyberChef/pull/173

0 commit comments

Comments
 (0)