Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge Upstream.

This commit is contained in:
Matt C 2016-12-01 22:55:09 +00:00
parent 9ab5fb5469 8b0112229e
commit ca8fef1c90
7 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Gruntfile.js
View File

@ -355,9 +355,16 @@ module.exports = function(grunt) {
css: "type='text/css'" css: "type='text/css'"
} }
}, },
prod: { compiled: {
src: "build/prod/cyberchef.htm", src: "build/prod/cyberchef.htm",
dest: "build/prod/cyberchef.htm" dest: "build/prod/cyberchef.htm"
},
prod: {
options: {
tag: "__inline"
},
src: "build/prod/index.html",
dest: "build/prod/index.html"
} }
}, },
chmod: { chmod: {
@ -424,7 +431,7 @@ module.exports = function(grunt) {
}, },
js: { js: {
files: "src/js/**/*.js", files: "src/js/**/*.js",
tasks: ["concat:js_all", "chmod:build"] tasks: ["concat:js", "chmod:build"]
}, },
html: { html: {
files: "src/html/**/*.html", files: "src/html/**/*.html",
@ -436,7 +443,7 @@ module.exports = function(grunt) {
}, },
grunt: { grunt: {
files: "Gruntfile.js", files: "Gruntfile.js",
tasks: ["clean:dev", "concat:css", "concat:js_all", "copy:html_dev", "copy:static_dev", "chmod:build"] tasks: ["clean:dev", "concat:css", "concat:js", "copy:html_dev", "copy:static_dev", "chmod:build"]
} }
}, },
}); });

16
build/prod/cyberchef.htm
View File

File diff suppressed because one or more lines are too long

6
build/prod/index.html
View File

File diff suppressed because one or more lines are too long

10
build/prod/scripts.js
View File

File diff suppressed because one or more lines are too long

2
src/html/index.html
View File

@ -29,7 +29,7 @@
<meta name="description" content="The Cyber Swiss Army Knife" /> <meta name="description" content="The Cyber Swiss Army Knife" />
<meta name="keywords" content="base64, hex, decode, encode, encrypt, decrypt, compress, decompress, regex, regular expressions, hash, crypt, hexadecimal, user agent, url, certificate, x.509, parser, JSON, gzip, md5, sha1, aes, des, blowfish, xor" /> <meta name="keywords" content="base64, hex, decode, encode, encrypt, decrypt, compress, decompress, regex, regular expressions, hash, crypt, hexadecimal, user agent, url, certificate, x.509, parser, JSON, gzip, md5, sha1, aes, des, blowfish, xor" />
<link rel="icon" type="image/png" href="images/favicon.ico" /> <link rel="icon" type="image/png" href="images/favicon.ico?__inline" />
<link href="styles.css" rel="stylesheet" /> <link href="styles.css" rel="stylesheet" />
</head> </head>
<body> <body>

7
src/js/views/html/HTMLApp.js
View File

@ -279,8 +279,8 @@ HTMLApp.prototype.valid_favourites = function(favourites) {
if (this.operations.hasOwnProperty(favourites[i])) { if (this.operations.hasOwnProperty(favourites[i])) {
valid_favs.push(favourites[i]); valid_favs.push(favourites[i]);
} else { } else {
this.alert("The operation \"" + favourites[i] + "\" is no longer " + this.alert("The operation \"" + Utils.escape_html(favourites[i]) +
"available. It has been removed from your favourites.", "info"); "\" is no longer available. It has been removed from your favourites.", "info");
} }
} }
return valid_favs; return valid_favs;
@ -436,7 +436,8 @@ HTMLApp.prototype.set_recipe_config = function(recipe_config) {
} else if (args[j].classList.contains("toggle-string")) { } else if (args[j].classList.contains("toggle-string")) {
// toggle_string // toggle_string
args[j].value = recipe_config[i].args[j].string; args[j].value = recipe_config[i].args[j].string;
args[j].previousSibling.children[0].innerHTML = recipe_config[i].args[j].option + args[j].previousSibling.children[0].innerHTML =
Utils.escape_html(recipe_config[i].args[j].option) +
" <span class='caret'></span>"; " <span class='caret'></span>";
} else { } else {
// all others // all others

14
src/static/stats.txt
View File

@ -1,18 +1,32 @@
202 source files 202 source files
<<<<<<< HEAD
104240 lines 104240 lines
size size
136 JavaScript source files 136 JavaScript source files
95168 lines 95168 lines
3.5M size 3.5M size
=======
104191 lines
4.0M size
136 JavaScript source files
95119 lines
3.4M size
>>>>>>> upstream/master
78 third party JavaScript source files 78 third party JavaScript source files
76377 lines 76377 lines
2.8M size 2.8M size
58 first party JavaScript source files 58 first party JavaScript source files
<<<<<<< HEAD
18791 lines 18791 lines
736K size 736K size
=======
18742 lines
724K size
>>>>>>> upstream/master
3.1M uncompressed JavaScript size 3.1M uncompressed JavaScript size
1.7M compressed JavaScript size 1.7M compressed JavaScript size