800 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
n1474335	f7e958e7a1	Changed HOTP inputType to byteArray	2017-12-19 14:38:13 +00:00
n1474335	5d75f8636a	Resolved conflict	2017-12-19 14:31:40 +00:00
n1474335	22aaeb3ff5	6.6.2	2017-12-19 14:25:12 +00:00
n1474335	8c29ce95e2	Merge branch 'artemisbot-bug/uuid'	2017-12-19 14:24:59 +00:00
n1474335	049fc66785	Added note to Default.js to show that crypto is included in that module.	2017-12-19 14:24:47 +00:00
n1474335	029c55fd53	Merge branch 'bug/uuid' of https://github.com/artemisbot/CyberChef into artemisbot-bug/uuid	2017-12-19 14:15:31 +00:00
n1474335	7b433b9bd6	6.6.1	2017-12-19 14:12:24 +00:00
n1474335	5ec210990b	Fixed NetBIOS space removal	2017-12-19 14:12:18 +00:00
n1474335	a7a0cacddb	Merge branch 'bwhitn-fixNB'	2017-12-19 13:54:02 +00:00
n1474335	e61ced93d6	Removed dependency for Utils.js from NetBIOS.js	2017-12-19 13:53:33 +00:00
n1474335	df122da1d2	Merge branch 'fixNB' of https://github.com/bwhitn/CyberChef into bwhitn-fixNB	2017-12-19 13:26:49 +00:00
n1474335	31d90939fe	6.6.0	2017-12-19 13:19:46 +00:00
n1474335	67b0fdf73e	Merge branch 'bwhitn-control'	2017-12-19 13:18:58 +00:00
n1474335	12fc8c22dd	Made some naming changes to Label-related operations.	2017-12-19 13:18:25 +00:00
n1474335	4e00ac9300	Files are now uploaded in a worker and not displayed in the input by default. Added ArrayBuffer Dish type.	2017-12-18 20:39:55 +00:00
bwhitn	4ca2a30249	Fixed minor errors	2017-12-18 05:33:52 -08:00
bwhitn	08a31523b2	changed the function comment	2017-12-18 05:04:11 -08:00
Matt C	4b29a61065	Fixes UUID incompatibility with webworkers	2017-12-18 09:53:23 +00:00
bwhitn	06c83cb44c	forgot a equal sign	2017-12-17 23:58:53 -05:00
bwhitn	75a5fc0ddc	Added Test, function checks, and cleaned some output.	2017-12-17 23:58:53 -05:00
bwhitn	946d165aa0	fixed decode	2017-12-17 23:57:35 -05:00
bwhitn	224d79be05	merged with master	2017-12-17 23:56:30 -05:00
bwhitn	435ed587a5	Fixed HOTP, TOTP and added test for HOTP	2017-12-17 23:53:13 -05:00
bwhitn	81082ea001	I really need to learn git	2017-12-17 23:45:15 -05:00
bwhitn	1d3229a729	rebase to current	2017-12-17 23:35:34 -05:00
bwhitn	a9e60d3450	minor fix	2017-12-17 23:29:16 -05:00
bwhitn	f9ddee7d80	Inital commit for pull	2017-12-17 23:29:16 -05:00
bwhitn	ef0d3b73b0	changed op array	2017-12-17 23:29:16 -05:00
bwhitn	5368040e83	Added additional arithmetic source	2017-12-17 23:29:16 -05:00
bwhitn	b9b4147c2f	start of math operations	2017-12-17 23:28:09 -05:00
bwhitn	caae0ec5ca	Merge pull request #2 from gchq/master ... update	2017-12-17 20:16:25 -08:00
bwhitn	2b47631f4d	minor fix	2017-12-17 22:15:13 -05:00
bwhitn	298e8e8491	Inital commit for pull	2017-12-17 21:57:09 -05:00
bwhitn	6ad3728314	changed op array	2017-12-17 15:29:31 -05:00
bwhitn	772f9a806e	Added additional arithmetic source	2017-12-17 15:20:58 -05:00
bwhitn	ae8d1f2178	start of math operations	2017-12-17 15:19:10 -05:00
bwhitn	9bc6c46dc3	Fixed HOTP, TOTP and added test for HOTP	2017-12-16 09:10:52 -05:00
n1474335	b48e940f2d	Merge branch 'control' of https://github.com/bwhitn/CyberChef into bwhitn-control	2017-12-08 13:47:45 +00:00
bwhitn	e500cfae75	Fixed errors	2017-11-24 10:31:26 -08:00
bwhitn	f01c0adee2	Changed jumps from index based to label base. Updated test.	2017-11-24 10:12:08 -08:00
n1474335	021cae1a95	6.5.0	2017-11-24 16:33:46 +00:00
n1474335	f66cd8f983	Merge branch 'jarmovanlenthe-master'	2017-11-24 16:32:45 +00:00
n1474335	fe8049199a	Moved PhpDeserialize.js to PHP.js to encompass possible future PHP-related ops	2017-11-24 16:32:11 +00:00
n1474335	cfb6dd9471	Merge branch 'master' of https://github.com/jarmovanlenthe/CyberChef into jarmovanlenthe-master	2017-11-24 15:19:56 +00:00
bwhitn	7abda44fd6	Added Negative Matching to conditional jumps so negative lookahead is not required.	2017-11-24 05:48:40 -08:00
bwhitn	47ce240e70	Merge pull request #1 from gchq/master ... updating	2017-11-24 07:50:13 -05:00
n1474335	c23d7fd79c	6.4.6	2017-11-20 17:47:48 +00:00
n1474335	555fed2d51	Merge branch 'artemisbot-features/keybindings'	2017-11-20 17:46:09 +00:00
n1474335	7a2f68e14a	Cosmetic changes to keybindings code	2017-11-20 17:45:50 +00:00
n1474335	8fd08cb2bf	Merge branch 'features/keybindings' of https://github.com/artemisbot/CyberChef into artemisbot-features/keybindings	2017-11-20 16:57:16 +00:00