Cool_Tools/CyberChef
1
0
Fork 0
mirror of synced 2024-12-02 18:27:17 +01:00
Code Releases Activity

Merge remote-tracking branch 'upstream/master' into feature_xpath

Browse Source
This commit is contained in:
Mike Schwörer 2016-12-05 19:30:46 +01:00
commit da7a832ceb
No known key found for this signature in database
GPG Key ID: D3C7172E0A70F8CF
7 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gruntfile.js
View File

@ -356,9 +356,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: {

8
build/prod/cyberchef.htm
View File

File diff suppressed because one or more lines are too long

2
build/prod/index.html
View File

File diff suppressed because one or more lines are too long

4
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>

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

@ -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

6
src/static/stats.txt
View File

@ -1,9 +1,9 @@
202 source files 202 source files
104190 lines 104191 lines
4.0M size 4.0M size
136 JavaScript source files 136 JavaScript source files
95118 lines 95119 lines
3.4M size 3.4M size
78 third party JavaScript source files 78 third party JavaScript source files
@ -11,7 +11,7 @@
2.7M size 2.7M size
58 first party JavaScript source files 58 first party JavaScript source files
18741 lines 18742 lines
724K size 724K size
3.1M uncompressed JavaScript size 3.1M uncompressed JavaScript size