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.

Sign up for GitHub

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

Jump to bottom

master update #2

Merged
merged 180 commits into from
Feb 18, 2019
Merged

master update #2

merged 180 commits into from
Feb 18, 2019

Conversation

bwhitn
Copy link
Owner

@bwhitn bwhitn commented Feb 18, 2019

Updating from current master

j433866 and others added 30 commits December 18, 2018 10:40
@j433866
Add Output Filter option to Magic operation
283d7f2
@j433866
Fix filtering to work on all the data and not just the result snippet
367d79e
@j433866
Commenting
c8eab5d
@j433866
Rename output filter argument to Crib
b6bdcaa
@j433866
Add note about crib to operation description
5d4c724
@j433866
Fix to make the filter work when intensive mode was turned on.
f600571
@j433866
Add qr-image to package
952f49e
@j433866
Add new Generate QR Code module
2070e1a
@anthony-arnold
Add the Play Media operation and place it under a new "Multimedia" ca…
866dd54 
…tegory. Move the Render Image to this new category as well.
@j433866
Add customisation arguments.
ae20a95 
Add presentation of QR code in HTML.
@n1474335
Merge branch 'master' of https://github.com/j433866/CyberChef into j4…
6337e84 
…33866-master
@n1474335
Magic crib now only applies after all branches have been explored.
ed2c886
@n1474335
Merge branch 'j433866-master'
13d87d3
@n1474335
8.15.1
f367c1f
@n1474335
Merge branch 'play-media' of https://github.com/anthony-arnold/CyberChef
8c6c3a1 
 into anthony-arnold-play-media
@n1474335
Tidied up 'Play Media' operation
01c4cfd
@n1474335
Merge branch 'anthony-arnold-play-media'
ae28d47
@n1474335
8.16.0
8c3569e
@j433866
Change module to Image, change default format value to PNG
b3113c1
@j433866
Add Jimp and jsqr modules
1953d9a
@j433866
Add new ParseQRCode operation
e5b2b84
@j433866
Add process.browser to webpack config, so we don't include stuff we d…
ed25017 
…on't need
@j433866
Always generate a PNG if the format isn't SVG
ae5128a
@j433866
Improve image normalising
d0e428b
@j433866
Add tests for Parse QR Code module
c2f6b8d
@mattnotmitt
Added colour channel splitting support
0046f7e
@mattnotmitt
Add to categories
5a9583c
@mattnotmitt
Add tests, however non-functional due to lack of File in Node
18693d2 
Also add jimp to package.json
@mattnotmitt
Disabled tests
454ef00
@n1474335
The 'option' and 'editableOption' arguments can now specify a 'defaul…
bf24547 
…tIndex' to populate, instead of using the first in the provided list.
h345983745 and others added 29 commits February 7, 2019 21:05
@h345983745
Removed jpath import
75a58f4
@d98762625
Highligting for Recipe now working. Discovered bug when highlighting …
58a8af2 
…on a test case
@n1474335
Merge branch 'j433866-coords-fix'
4dc5a14
@n1474335
Update package-lock.json
f1264d6
@n1474335
8.23.1
f48af97
@n1474335
Fixed BigNumber/XRegExp incompatibility. CLoses #481
d2b4c40
@n1474335
8.23.2
d54d66c
@n1474335
Merge branch 'xss_fixes' of https://github.com/j433866/CyberChef into…
821bc94 
… j433866-xss_fixes
@n1474335
Merge branch 'j433866-xss_fixes'
310ff30
@n1474335
8.23.3
7d09ba5
@n1474335
Fixed populateOption HTML escape bug. Closes #490
3d20833
@n1474335
8.23.4
0db0ced
@n1474335
Merge branch 'dnsoverhttps' of https://github.com/h345983745/CyberChef …
b8ecd83 
…into h345983745-dnsoverhttps
@n1474335
Tidied up 'DNS over HTTPS' operation and fixed manualBake flag.
ab43635
@n1474335
Merge branch 'h345983745-dnsoverhttps'
42d1c94
@n1474335
Updated changelog
42826e5
@n1474335
8.24.0
7a4e030
@n1474335
Merge branch 'open-file-button' of https://github.com/j433866/CyberChef…
d71aa8d 
… into j433866-open-file-button
@d98762625
WIP getting prod working with minicss webpack plugin
d22eac9
@n1474335
Abstracted out loadFile logic to separate function
13abbd2
@n1474335
Merge branch 'j433866-open-file-button'
d84a61d
@n1474335
8.24.1
b5c655d
@d98762625
prod working with mini css webpack plugin
a7a2fe2
@d98762625
tidy up
2391e08
@d98762625
try/catch to allow chef to run from prod file
c01c076
@d98762625
Merge branch 'master' of github.com:gchq/CyberChef into dynamic-import
481f2a4
@n1474335
Dynamic module loading is now cached and Webpack includes the import …
49e2b05 
…in the main chunk.
@n1474335
Merge branch 'd98762625-dynamic-import'
ce61bcc
@n1474335
8.24.2
8148c1a
@bwhitn bwhitn merged commit 2db7c03 into bwhitn:master Feb 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@bwhitn @j433866 @anthony-arnold @n1474335 @mattnotmitt @klaxon1 @masq @calfr @d98762625 @h345983745