Commit Graph

512 Commits

Author SHA1 Message Date
Mike Schwörer
f44171c005
Merge remote-tracking branch 'upstream/master' into feature_filter 2016-12-21 20:17:53 +01:00
n1474335
ef464ab57c Added 'Substitute' operation. 2016-12-21 14:09:46 +00:00
n1474335
e1ef228575 Output buttons now adjust when there is limited screen space. 2016-12-21 12:13:03 +00:00
n1474335
9c1fb7ddf4 Added button to maximise the output window 2016-12-20 20:18:16 +00:00
n1474335
a9f15b2c64 Updated npm package versions 2016-12-20 18:57:53 +00:00
n1474335
39d50093ae Tweaks to 'XPath expression' and 'CSS selector' operations. Closes #13. 2016-12-20 18:49:25 +00:00
n1474335
650fd9a940 Merge pull request #20 from Mikescher/feature_xpath
Added operations 'XPath expression' and 'CSS selector'
2016-12-20 18:16:14 +00:00
Mike Schwörer
4b5210585a
Added operation 'filter' 2016-12-17 01:53:06 +01:00
Mike Schwörer
8db1b2fc79
switched from jquery.cpath.js to xpath.js 2016-12-17 01:14:33 +01:00
Mike Schwörer
dea16f63f5
Small stuff to make eslint happy 2016-12-16 22:32:19 +01:00
Mike Schwörer
4c36123fd7
Merge remote-tracking branch 'upstream/master' into feature_xpath
# Conflicts:
#	Gruntfile.js
#	src/js/.jshintrc
2016-12-16 22:15:53 +01:00
Matt C
c24cdf3bae Merge remote-tracking branch 'refs/remotes/upstream/master' 2016-12-14 23:31:04 +00:00
n1474335
af4644c9eb Replaced jsHint with eslint. Fixes #4. 2016-12-14 16:39:17 +00:00
n1474335
e2e68dd876 BUGFIX: Fixed seasonal event handling. 2016-12-14 13:12:04 +00:00
n1474335
351eef7fd9 BUGFIX: Flow control ops are now correctly highlighted when a breakpoint is triggered on them. 2016-12-14 12:43:57 +00:00
Matt C
ed5f00d402 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-08 09:18:14 +00:00
n1474335
7994a65926 Merge branch 'artemisbot-feature_vigenere' 2016-12-08 00:35:01 +00:00
n1474335
55c1626d41 Cleaned up the Vigenere cipher operations so that they conform with the coding conventions. 2016-12-08 00:34:41 +00:00
n1474335
e5854b6f86 Resolving conflicts 2016-12-08 00:09:31 +00:00
n1474335
ed7cab36d2 BUGFIX: Operations can now be dragged out of the recipe on touchscreen devices. 2016-12-07 23:57:15 +00:00
Matt C
e64dfcdf0f Build
Final ROT-47 + probably final vig
2016-12-06 20:28:20 +00:00
Matt C
ac3a0b35f5 Merge branch 'feature_vigenere'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-06 20:27:14 +00:00
Matt C
22c00e8d3c Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-06 20:23:20 +00:00
Matt C
b36459064e Changes for merge
- Removed conflicting build files
- Moved @author tags
2016-12-06 20:20:27 +00:00
n1474335
b0fd297069 Merge branch 'artemisbot-feature_rot47' 2016-12-06 18:45:51 +00:00
n1474335
6fa6a92719 Moved author tag and improved description for ROT47 2016-12-06 18:43:55 +00:00
n1474335
2db810289d Merge conflicts 2016-12-06 18:32:39 +00:00
n1474335
86fb03fe10 BUGFIX #37: Description popovers for search results now get removed when the list is modified. 2016-12-06 18:10:35 +00:00
Matt C
326e15d05c Built production version.
- Includes both ROT-47 and Vigenere
2016-12-06 17:10:42 +00:00
Matt C
f2b22605ab Merge branch 'feature_vigenere'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-06 17:08:45 +00:00
Matt C
44919b8c17 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-06 17:02:17 +00:00
Matt C
605a577d92 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-06 17:01:35 +00:00
Mike Schwörer
5c92e49d5d
Merge remote-tracking branch 'upstream/master' into feature_xpath 2016-12-05 20:16:39 +01:00
Mike Schwörer
662805d11e
fixed a few jshint warnings and uglify:prod problems 2016-12-05 20:03:33 +01:00
Mike Schwörer
da7a832ceb
Merge remote-tracking branch 'upstream/master' into feature_xpath 2016-12-05 19:30:46 +01:00
n1474335
e4d30861d5 BIGFIX: 'Show Base64 Offsets' operation now escapes input before adding to tooltips. 2016-12-05 14:07:19 +00:00
Matt C
b631feea74 Misc Fixes
- Built prod version
- added missing semicolons
2016-12-03 21:33:19 +00:00
Matt C
560712cee3 Feature: Add Vigenere Cipher Encode & Decode
- Added Vigenere Encode & Decode
- Added metadata for /config/ relating to this additon
2016-12-03 20:54:28 +00:00
Matt C
67ee8544e9 Added name to Rotate namespace 2016-12-03 13:47:38 +00:00
Matt C
1cc48fd481 Update for merge
- Added to Categories
- Removed comment
- Rebuilt pages
2016-12-03 10:19:26 +00:00
Matt C
4101152c73 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
2016-12-03 10:15:00 +00:00
n1474335
20d9903572 XOR operation now supports both input and output differentials. Fixes #17 2016-12-03 01:42:23 +00:00
n1474335
fc9d0a63c2 JSON Beautify and Minify operations no longer throw an error on empty input. Fixes #29 2016-12-03 00:51:17 +00:00
n1474335
19b0a972d8 Inlined version now correctly displays compile time in place of the download link. Fixes #14. 2016-12-03 00:40:51 +00:00
n1474335
43fa4370a3 Added Grunt task to deploy build/prod to the gh-pages branch. Partial solution to #19. 2016-12-03 00:37:38 +00:00
Schwörer Mike
2db6f8f63c added css_query operation 2016-12-02 12:49:49 +01:00
Matt C
09a9fbe206 Built production version 2016-12-01 23:09:18 +00:00
Matt C
ca8fef1c90 Merge Upstream. 2016-12-01 22:55:09 +00:00
n1474335
8b0112229e BUGFIX #24: Invalid favourites loaded from localStorage are now escaped when reported to the user. 2016-11-30 23:11:06 +00:00
n1474335
8882805830 Favicon changed to a data URL to prevent re-requests in some circumstances. #21 2016-11-30 19:50:21 +00:00