Commit graph

436 commits

Author SHA1 Message Date
d98762625
456b85ed03 Merge branch 'master' of github.com:gchq/CyberChef into node-lib 2018-12-21 09:47:28 +00:00
n1474335
8c3569ea63 8.16.0 2018-12-19 17:59:55 +00:00
n1474335
f367c1f78b 8.15.1 2018-12-19 17:25:05 +00:00
n1474335
8ab56a29ac 8.15.0 2018-12-18 13:50:30 +00:00
n1474335
56f8302402 8.14.0 2018-12-18 12:20:03 +00:00
n1474335
79b9b63982 8.13.0 2018-12-15 00:26:41 +00:00
n1474335
31cbf8cccc 8.12.4 2018-12-15 00:16:23 +00:00
n1474335
6aa9d2b492 Added 'Extract Files' operation and 'Forensics' category. 2018-12-14 16:43:03 +00:00
d98762625
18f6ab451d pull from master 2018-12-07 13:27:23 +00:00
n1474335
15fbe5a459 8.12.3 2018-11-23 16:07:30 +00:00
n1474335
3bdcf4d851 8.12.2 2018-11-23 14:58:38 +00:00
n1474335
a946d04a72 8.12.1 2018-11-21 17:48:03 +00:00
n1474335
b458707921 8.12.0 2018-11-21 12:29:25 +00:00
n1474335
4b6132a2d7 8.11.2 2018-11-19 14:34:56 +00:00
n1474335
045747f543 8.11.1 2018-11-14 12:27:55 +00:00
n1474335
b10c5e3256 Fixed faulty package-lock.json 2018-11-14 12:27:47 +00:00
n1474335
69df2e4183 Updated comments 2018-11-13 18:05:52 +00:00
n1474335
12ebd35c4d 8.11.0 2018-11-13 17:56:46 +00:00
n1474335
4acf7b4e4f 8.10.2 2018-11-09 15:25:22 +00:00
d98762625
b19f8f65a4 update HMAC test after merge and add loader to allow external uglifyjs plugin to work for node builds 2018-11-09 14:40:40 +00:00
d98762625
97255bbb33 merge upstream 2018-11-09 12:33:19 +00:00
n1474335
3c4893d7c7 8.10.1 2018-11-07 15:20:51 +00:00
n1474335
037300de79 8.10.0 2018-11-07 15:10:57 +00:00
n1474335
19c002fcdd 8.9.2 2018-11-07 14:40:13 +00:00
n1474335
e1b456c01c 8.9.1 2018-11-07 14:21:26 +00:00
n1474335
520eaedd9a 8.9.0 2018-11-07 13:23:26 +00:00
n1474335
c5d82a76ab 8.8.8 2018-11-07 12:29:32 +00:00
n1474335
18a9dfffc7 Updated dependencies. Removed shim from HMAC op and postinstall js-to-mjs step due to CryptoAPI fixes. 2018-11-07 12:29:23 +00:00
n1474335
38838e4dca 8.8.7 2018-11-06 18:52:31 +00:00
n1474335
10d3d27a33 8.8.6 2018-11-05 12:48:29 +00:00
n1474335
f957925aac 8.8.5 2018-10-12 10:51:01 +00:00
d98762625
214d6c4405 merge from upstream 2018-10-12 11:46:50 +01:00
n1474335
d5c01f387a 8.8.4 2018-10-12 10:43:01 +00:00
n1474335
dd630f20f8 8.8.3 2018-10-12 10:28:23 +00:00
n1474335
d6c6981bc0 8.8.2 2018-10-10 15:49:11 +00:00
n1474335
8aeb7b60a7 Updated dependencies 2018-10-10 15:49:07 +00:00
n1474335
9197ac6510 8.8.1 2018-10-10 14:08:32 +00:00
n1474335
c55331f220 8.8.0 2018-10-10 13:59:37 +00:00
d98762625
48f3a3b18f Do not mangle names on minification for Node prod build - property names are used for search in bake 2018-10-05 18:24:06 +01:00
d98762625
5047619e54 Merge branch 'master' of github.com:gchq/CyberChef into node-lib 2018-09-04 09:42:05 +01:00
n1474335
016086ef4e 8.7.0 2018-08-31 14:00:29 +00:00
n1474335
be14d56eae Tidied up JWT operations 2018-08-31 13:58:06 +00:00
n1474335
98f4fe4c2b 8.6.2 2018-08-29 19:06:02 +00:00
n1474335
7061c05f77 8.6.1 2018-08-29 18:58:01 +00:00
n1474335
22e8883934 8.6.0 2018-08-29 18:04:55 +00:00
n1474335
415beaa0b0 Tidied up Geohash operations 2018-08-29 17:59:48 +00:00
n1474335
c1be109592 8.5.1 2018-08-29 17:36:05 +00:00
n1474335
c7b2095bb4 Updated package-lock.json 2018-08-29 17:34:47 +00:00
n1474335
3905c01a0d 8.5.0 2018-08-24 01:07:56 +01:00
n1474335
3d4f54e8bc 8.4.3 2018-08-24 00:32:57 +01:00
n1474335
00058bd5c7 8.4.2 2018-08-23 23:24:05 +01:00
n1474335
e4fdadc573 8.4.1 2018-08-23 22:56:46 +01:00
n1474335
10cf0d13c2 8.4.0 2018-08-23 22:10:23 +01:00
n1474335
6c9fea97ef Updated CHANGELOG 2018-08-23 22:10:15 +01:00
n1474335
bf2643802a 8.3.1 2018-08-23 21:42:04 +01:00
n1474335
38f5fcde86 8.3.0 2018-08-21 19:29:51 +01:00
n1474335
e7c6a05e9f Merge branch 'features/messagepack' of https://github.com/artemisbot/CyberChef into artemisbot-features/messagepack 2018-08-21 19:22:10 +01:00
n1474335
17ec5c2683 8.2.0 2018-08-21 19:11:15 +01:00
n1474335
745d21d1bc 8.1.4 2018-08-20 00:26:49 +01:00
n1474335
2507362741 8.1.3 2018-08-19 23:08:02 +01:00
n1474335
92d9abf43a 8.1.2 2018-08-19 22:58:35 +01:00
n1474335
e11bb38625 8.1.1 2018-08-19 22:50:54 +01:00
n1474335
782e0f3475 8.1.0 2018-08-19 17:37:19 +01:00
n1474335
b9703e2bb6 8.0.2 2018-08-19 17:14:36 +01:00
n1474335
8dab0eac58 Removed excess newline 2018-08-19 17:14:07 +01:00
d98762625
7c1ac4392e merge 8.0.1 release -> node-lib 2018-08-11 22:15:09 +01:00
d98762625
20452fe3cb include crypto-api src into lib to get around mjs import issue. compiled node lib now requires successfully. 2018-08-10 17:44:40 +01:00
n1474335
f7310369e6 8.0.1 2018-08-09 19:17:35 +01:00
Matt C
0c06e64051 Added MessagePack operations 2018-08-09 11:09:28 +01:00
n1474335
2b6c280858 8.0.0 2018-08-06 08:17:36 +01:00
n1474335
4dc6dac885 Added CHANGELOG.md 2018-08-06 07:35:30 +01:00
n1474335
8da9af8989 Updated dependencies 2018-08-04 19:32:30 +01:00
n1474335
d182261ff3 Switched to unbordered args 2018-07-13 10:30:24 +00:00
d98762625
fa8736b1a4 Make help function use OperationConfig.json file
Tidy up Gruntfile execs
2018-07-06 11:34:06 +01:00
n1474335
4338e2626b Replaced Bootstrap alert with Material Design snackbar 2018-06-20 00:18:59 +01:00
n1474335
974ab29e36 Switched toggle string dropdown sides and removed form-control padding 2018-06-17 23:52:00 +01:00
n1474335
4147ec719b Converted modals to Bootstrap 4 Material Design 2018-06-17 12:44:12 +01:00
n1474335
27b0505ede Merged ESM into feature-bootstrap4 2018-06-09 10:48:35 +01:00
n1474335
1ce6e32086 Merged ESM into feature-bootstrap4. Started work on text inputs. 2018-06-09 10:43:36 +01:00
d98762625
33f2c89716 update tests to reflect new API behaviour 2018-06-06 17:29:30 +01:00
n1474335
78c1c4d680 ESM: Added builder script to generate new operations. npm run newop 2018-05-29 14:18:39 +00:00
n1474335
3f3a3e0016 ESM: Tidied up recently added operations 2018-05-28 15:42:43 -07:00
Matt C
189e077247 Ported blowfish operations and library to ESM modules 2018-05-23 16:54:12 +01:00
d98762625
8ff6596657 add other flowcontrol ops. Update tests 2018-05-21 10:58:35 +01:00
d98762625
9f52689fde Merge branch 'esm' of github.com:gchq/CyberChef into esm 2018-05-21 09:02:21 +01:00
n1474335
ee519c7352 Merged esm branch into feature-magic. Ported FileType ops. 2018-05-20 16:49:42 +01:00
d98762625
3f08fa3b23 update package-lock 2018-05-18 11:40:24 +01:00
n1474335
3fd1f4e6d9 ESM: Ported all Hash and Checksum operations 2018-05-17 15:11:34 +00:00
n1474335
b760c2f1a0 ESM: Fixed OperationError detection and tidied up ops. 2018-05-16 10:17:49 +01:00
d98762625
4fe34a4839 port Sum operation 2018-05-15 10:12:59 +01:00
n1474335
a98d37e61c Merged master into esm branch 2018-05-14 11:58:01 +00:00
n1474335
dcc28438ff 7.11.1 2018-05-10 15:34:23 +00:00
n1474335
6987e6b1b9 ESM: Ported Bit shift, MAC address and Morse Code operations. 2018-05-07 12:12:58 +01:00
n1474335
0ca0e7427d Merge branch 'esm' of github.com:gchq/CyberChef into esm 2018-05-07 11:35:35 +01:00
n1474335
1f877817f4 ESM: Added portOperation.mjs script. Added To and From Hexdump operations. 2018-05-06 12:24:01 +01:00
n1474335
403296cc59 7.11.0 2018-05-04 16:11:50 +00:00
n1474335
f7729c0fd2 7.10.3 2018-04-30 17:55:26 +00:00
n1474335
2cefd3b941 Updated dependencies 2018-04-30 17:52:43 +00:00
n1474335
68ab2da866 7.10.2 2018-04-30 16:51:24 +00:00
n1474335
d18a7df3bc 7.10.1 2018-04-29 21:45:07 +01:00
d98762625
cc20ad9567 Add OperationError error type and use for errors to be printed to the output panel 2018-04-27 10:59:53 +01:00
n1474335
4e38b09e18 ESM: Config scripts now run synchronously before webpack builds start 2018-04-11 17:58:40 +00:00
n1474335
c501720cdd 7.10.0 2018-03-28 23:58:52 +01:00
n1474335
92b5aa08f3 Updated dependencies 2018-03-28 23:58:43 +01:00
n1474335
1097170a68 Updated dependencies 2018-03-28 23:56:33 +01:00
n1474335
e41145427e Tidied up PGP operations and added progress callback 2018-03-28 23:26:48 +01:00
n1474335
1143c23ad9 Merge branch 'feature-add-pgp-kbpgp' of https://github.com/tlwr/CyberChef into tlwr-feature-add-pgp-kbpgp 2018-03-27 00:07:20 +01:00
n1474335
9b4fc3d3aa Converted the core to ES modules 2018-03-26 23:14:23 +01:00
n1474335
c1bb93eec1 7.9.0 2018-03-26 22:43:58 +01:00
n1474335
715ca1c292 Added Bcrypt, Scrypt, BSON and string operations along with many new tests. 2018-03-26 22:25:36 +01:00
n1474335
5ece79c74d 7.8.1 2018-03-23 20:02:03 +00:00
n1474335
209a5b7274 7.8.0 2018-03-04 18:45:23 +00:00
n1474335
242bad09ea Added SSDEEP and CTPH operations 2018-03-04 18:41:41 +00:00
n1474335
8dd223f1cb 7.7.8 2018-03-04 17:51:39 +00:00
n1474335
5a7bb092c7 Fixed popovers in Bootstrap v4 2018-03-02 15:32:27 +00:00
n1474335
d166dda229 Started updating Bootstrap to v4 2018-03-02 14:04:58 +00:00
n1474335
372b2378a8 7.7.7 2018-03-01 19:45:47 +00:00
n1474335
574207c626 Updated many dependencies including Webpack (v4) and crypto-api (v0.8) 2018-03-01 19:45:34 +00:00
n1474335
ead64dcb47 7.7.6 2018-02-28 16:40:22 +00:00
n1474335
da473de9f0 Switched from uas_parser.js to ua-parser-js library to improve library management and remove ReDos vulnerabilities. Also improved performance of two native regexes. Thanks to James Davis for raising awareness. 2018-02-28 16:40:15 +00:00
n1474335
a177e2ab7e 7.7.5 2018-02-21 11:24:46 +00:00
n1474335
d491e95d1c 7.7.4 2018-02-20 17:04:47 +00:00
n1474335
502a9fbb92 Added dynamically generated sitemap and robots.txt file to prevent crawling of inline version 2018-02-20 16:52:27 +00:00
n1474335
cc44fe6557 7.7.3 2018-02-16 13:33:41 +00:00
n1474335
5a2a649d8e 7.7.2 2018-02-15 13:41:17 +00:00
n1474335
750fa45c04 7.7.1 2018-02-14 10:34:14 +00:00
n1474335
ab55b91da1 7.7.0 2018-02-13 15:51:45 +00:00
n1474335
8518fa67f2 Added 'XKCD Random Number' operation 2018-02-13 15:05:55 +00:00
n1474335
6624f25a64 Magic operation now detects UTF8 and gives a probability score for each language 2018-02-10 15:10:53 +00:00
n1474335
078849041f 7.6.3 2018-01-26 19:14:15 +00:00
n1474335
1c711f5e03 Updated dependencies 2018-01-26 19:14:05 +00:00
n1474335
614af0602a 7.6.2 2018-01-25 18:41:53 +00:00
n1474335
e55cfe0bc1 Fixed 'Syntax highlighter' operation. Using highlight.js instead of google-code-prettify. 2018-01-25 18:41:47 +00:00
n1474335
170feaaff2 7.6.1 2018-01-25 14:03:19 +00:00
n1474335
3c669a075e 7.6.0 2018-01-25 13:45:05 +00:00
n1474335
231322eddf 7.5.6 2018-01-24 16:54:42 +00:00
n1474335
f091918575 7.5.5 2018-01-24 15:50:10 +00:00
n1474335
7490651a06 7.5.4 2018-01-22 17:10:02 +00:00
n1474335
ec205f4f7d 7.5.3 2018-01-18 19:53:01 +00:00
n1474335
6fbb2f26d1 7.5.2 2018-01-18 15:27:26 +00:00
n1474335
aa6890432c 7.5.1 2018-01-12 23:59:03 +00:00
n1474335
fff188eb30 Merged master into feature-unicode-strings 2018-01-12 23:57:02 +00:00
n1474335
2762319dbb 7.5.0 2018-01-12 18:29:10 +00:00
Matt C
f07263ca2a Fix decrypt operation 2018-01-12 11:45:16 +00:00
Matt C
bfbefb7318 Merge branch 'master' into features/add-pgp-kbpgp 2018-01-11 22:57:31 +00:00
n1474335
7176e5ca6e 7.4.0 2018-01-06 16:34:06 +00:00
n1474335
491e6f5f5f 7.3.0 2018-01-05 18:50:48 +00:00
n1474335
3f3e7a78eb Arithmetic operations now support BigNumbers 2018-01-05 18:04:55 +00:00
n1474335
8d3d39acd3 Merge branch 'features/big-number' of https://github.com/artemisbot/CyberChef into artemisbot-features/big-number 2018-01-05 17:31:27 +00:00
n1474335
bbfb732d8f 7.2.3 2018-01-04 17:48:08 +00:00
n1474335
1bff490fa4 7.2.2 2018-01-04 14:43:54 +00:00
n1474335
56551712d6 Began implementing UTF-16 support in the 'Strings' operation. 2018-01-03 16:51:10 +00:00
Matt C
c241d2f90b Adds basic BigNumber type support
Fixes `To Base` & `From Base` issues as reported on twitter
2018-01-03 11:26:31 +00:00
n1474335
ac9af6d2ba 7.2.1 2018-01-02 15:33:08 +00:00
n1474335
10f42e9a7f 7.2.0 2018-01-02 00:13:34 +00:00
n1474335
9fc7e6cd98 Rewrote AES, DES and Triple DES operations to use Forge instead of CryptoJS, simplifying their options and adding many tests. Removed Rabbit operations. Fixes #63 and #210. 2018-01-01 16:09:58 +00:00
n1474335
87f346d88c 7.1.0 2017-12-29 17:48:22 +00:00
n1474335
fa6905ef00 Added more comprehensive logging to FlowControl ops and added '>' prefix to all ChefWorker logs to improve clarity 2017-12-29 17:32:23 +00:00
n1474335
d079420d46 Added logging with configurable levels to make debugging easier. 2017-12-28 18:17:38 +00:00
n1474335
124ff83206 7.0.0 2017-12-28 16:10:39 +00:00
n1474335
e2161ec934 Resolved conflicts 2017-12-27 12:50:29 +00:00
n1474335
ff94172b3c Output files can now be downloaded using FileSaver (supports large files ~500MB) 2017-12-26 01:32:51 +00:00
n1474335
0e7989111f Removed CryptoJS from Utils.js. UTF8 conversion is now achieved with the much smaller and actively maintained utf8 library. 2017-12-25 23:11:52 +00:00
Toby Lorne
db8955d90d WIP: add encrypt and decrypt operations
Currently the encrypt operation works only to my public key and not to
keys generated by the generate key pair operation. Probably something
wrong with the generate operation.
2017-12-24 17:44:32 +00:00
n1474335
8ee3742216 6.8.0 2017-12-21 15:13:54 +00:00
Matt C
670566b7eb Promisified generation of key pair 2017-12-21 14:23:31 +00:00
n1474335
fe4c5f5899 6.7.2 2017-12-20 15:56:56 +00:00
n1474335
5e9380b550 6.7.1 2017-12-20 13:43:31 +00:00
n1474335
317327d097 CSS selector operation now works in a web worker. Fixes #218 2017-12-20 13:30:51 +00:00
n1474335
ecd0ac2521 Updated dependencies 2017-12-19 16:53:57 +00:00
n1474335
f9eaf67db2 6.7.0 2017-12-19 15:02:23 +00:00
n1474335
80719ae368 6.6.3 2017-12-19 14:41:34 +00:00
n1474335
22aaeb3ff5 6.6.2 2017-12-19 14:25:12 +00:00
n1474335
7b433b9bd6 6.6.1 2017-12-19 14:12:24 +00:00
n1474335
31d90939fe 6.6.0 2017-12-19 13:19:46 +00:00
n1474335
021cae1a95 6.5.0 2017-11-24 16:33:46 +00:00
n1474335
c23d7fd79c 6.4.6 2017-11-20 17:47:48 +00:00
n1474335
7a2b75c861 Updated dependencies 2017-11-20 16:57:04 +00:00
n1474335
2cd4256ece Updated dependencies 2017-10-26 17:00:13 +00:00
n1474335
c6a65c4686 6.4.5 2017-10-23 17:32:47 +00:00
n1474335
8afd77b32d 6.4.4 2017-10-13 11:29:45 +00:00
n1474335
ec7294d734 6.4.3 2017-10-13 09:35:34 +00:00
n1474335
40d8b42478 6.4.2 2017-10-13 09:19:22 +00:00
n1474335
b61a1b4edb 6.4.1 2017-10-09 15:39:10 +00:00
n1474335
dc9ba583d5 Merge branch 'master' of github.com:gchq/CyberChef 2017-10-05 16:29:09 +00:00
n1474335
6b5ff83927 Updated dependencies 2017-10-05 16:28:49 +00:00
n1474335
a5ffa406a8 6.4.0 2017-10-04 23:08:23 +01:00
n1474335
4fee6cd5d8 6.3.2 2017-10-03 17:49:29 +00:00
n1474335
a997ec0695 Updated dependencies 2017-10-03 16:56:37 +00:00
n1474335
bd1790b692 6.3.1 2017-09-28 19:45:37 +00:00
n1474335
2afd23fcf7 6.3.0 2017-09-28 19:33:01 +00:00
n1474335
35c9dca955 6.2.1 2017-09-27 15:44:10 +00:00
n1474335
392652ed8e 6.2.0 2017-09-27 15:33:37 +00:00
n1474335
7557e1e9e5 Added Snefru hashing operation 2017-09-27 15:33:14 +00:00
n1474335
d924da2f25 6.1.0 2017-09-22 17:36:03 +00:00
n1474335
7966b2bde6 Merge branch 'master' into feature-hashing 2017-09-22 16:09:13 +00:00
n1474335
9391b947c6 Merge branch 'master' of github.com:gchq/CyberChef 2017-09-22 16:05:59 +00:00
n1474335
e61e3bcf9b Updated the dev server to work on external interfaces 2017-09-22 16:05:15 +00:00
n1474335
89ca2cc631 6.0.2 2017-09-20 22:26:54 +01:00
n1474335
d79a0e737a Added HAS-160 and Whirlpool hashing operations 2017-09-20 09:43:14 +00:00
n1474335
c60ec7c170 6.0.1 2017-09-20 01:18:46 +01:00
n1474335
3be370aefa 6.0.0 2017-09-20 00:56:32 +01:00
n1474335
d3246b7c8b Merged upstream master 2017-09-17 14:53:17 +01:00
n1474335
c93edec55b Switched to val-loader and compiling MetaConfig 2017-09-17 13:47:33 +01:00
n1474335
83d258c396 5.20.0 2017-09-14 15:06:11 +00:00
n1474335
35382faf28 Updated all dependencies and set node version to 8.4 to fix docstrap bug in travis builds (until it is fixed) 2017-09-14 10:20:16 +00:00
n1474335
174cabdc74 Added 'CRC-16 Checksum' operation 2017-09-12 15:50:46 +00:00
n1474335
73561993a7 Added SHA3, Keccak and Shake hashing algorithms 2017-09-12 15:31:51 +00:00
n1474335
a736be7ca8 Added MD6 operation. Closes #53 2017-09-12 14:20:05 +00:00
n1474335
f1fe0b944f 5.19.3 2017-09-07 10:01:31 +00:00
n1474335
bf833991bf 5.19.2 2017-09-06 16:09:36 +00:00
n1474335
2ea6d9437f 5.19.1 2017-09-06 10:28:41 +00:00
n1474335
833b6d67a6 Updated package-lock.json to fix tagged builds 2017-09-06 10:28:35 +00:00
n1474335
d012fd3a65 5.16.3 2017-08-25 11:53:08 +00:00
n1474335
53c22d5e29 5.13.0 2017-08-04 14:00:24 +00:00
n1474335
55aedfe901 Jsonpath lib now imported from npm with workaround instead of serving locally. 2017-08-04 13:59:32 +00:00
n1474335
fc9497f067 Updated dependencies 2017-08-04 13:35:52 +00:00
n1474335
c07cc913c8 5.12.4 2017-08-01 19:27:24 +00:00
n1474335
1435acdc28 5.12.3 2017-08-01 14:42:52 +00:00
n1474335
37f164f11c Merge branch 'master' of github.com:gchq/CyberChef 2017-08-01 14:42:17 +00:00
n1474335
7a2f071269 Dependencies in the node version are now kept external in the webpack build 2017-08-01 14:42:09 +00:00
n1474335
e977a1006c Merge branch 'master' into feature-threading 2017-07-28 16:55:07 +01:00
n1474335
559c13a003 5.12.2 2017-07-28 16:44:48 +01:00
n1474335
77e074efc2 5.12.1 2017-07-24 15:27:14 +00:00
n1474335
a61df0832f Updated dependencies and linted 2017-07-24 13:49:16 +00:00
n1474335
58361e58f8 5.12.0 2017-07-19 16:03:24 +00:00
n1474335
bcaef8ba54 5.11.7 2017-07-18 16:17:59 +00:00
n1474335
8d09f7c7eb 5.11.6 2017-07-17 13:31:37 +00:00
n1474335
cc3aad17e1 OperationConfig now loaded into App via value-loader so that operation code is only included in the worker 2017-07-16 23:33:47 +01:00
n1474335
09df753ca9 5.11.5 2017-07-12 14:34:50 +00:00
n1474335
086d5272ac 5.11.4 2017-07-12 12:49:22 +00:00
n1474335
645e540c66 5.11.3 2017-07-10 11:49:48 +00:00
n1474335
7c5dd2bd78 5.11.2 2017-07-07 13:30:27 +00:00
n1474335
85d41085de 5.11.1 2017-07-03 15:25:52 +00:00
n1474335
ec7a55dba6 5.10.7 2017-06-27 14:13:30 +00:00
n1474335
a417a6469c Added package-lock.json 2017-06-20 14:45:20 +00:00