use new CryptoJS repo since the old one was removed.
Conflicts: bower.json tests_main.js
This commit is contained in:
parent
8feeb73320
commit
b9cf79505a
@ -21,7 +21,7 @@
|
|||||||
"strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
|
"strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
|
||||||
"strophe.muc": "https://raw.github.com/strophe/strophejs-plugins/02310ad1b8da2962cd05b0f4bceaecca134efed4/muc/strophe.muc.js",
|
"strophe.muc": "https://raw.github.com/strophe/strophejs-plugins/02310ad1b8da2962cd05b0f4bceaecca134efed4/muc/strophe.muc.js",
|
||||||
"otr": "0.2.7",
|
"otr": "0.2.7",
|
||||||
"crypto-js": "~3.1.2",
|
"crypto-js-evanvosberg": "~3.1.2",
|
||||||
"almond": "~0.2.6",
|
"almond": "~0.2.6",
|
||||||
"requirejs-text": "~2.0.10",
|
"requirejs-text": "~2.0.10",
|
||||||
"requirejs-tpl-jfparadis": "*"
|
"requirejs-tpl-jfparadis": "*"
|
||||||
|
4
main.js
4
main.js
@ -18,8 +18,8 @@ config = {
|
|||||||
"bigint": "src/bigint",
|
"bigint": "src/bigint",
|
||||||
"crypto.core": "components/otr/vendor/cryptojs/core",
|
"crypto.core": "components/otr/vendor/cryptojs/core",
|
||||||
"crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
|
"crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
|
||||||
"crypto.md5": "components/crypto-js/src/md5",
|
"crypto.md5": "components/crypto-js-evanvosberg/src/md5",
|
||||||
"crypto.evpkdf": "components/crypto-js/src/evpkdf",
|
"crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
|
||||||
"crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
|
"crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
|
||||||
"crypto.aes": "components/otr/vendor/cryptojs/aes",
|
"crypto.aes": "components/otr/vendor/cryptojs/aes",
|
||||||
"crypto.sha1": "components/otr/vendor/cryptojs/sha1",
|
"crypto.sha1": "components/otr/vendor/cryptojs/sha1",
|
||||||
|
Loading…
Reference in New Issue
Block a user