Commit 32750741 authored by JC Brand's avatar JC Brand

Update changelog, bump pluggable.js, move files to 3rdparty directory

parent 527ed7bb
...@@ -65,8 +65,8 @@ require.config({ ...@@ -65,8 +65,8 @@ require.config({
"converse-vcard": "src/converse-vcard", "converse-vcard": "src/converse-vcard",
// Off-the-record-encryption // Off-the-record-encryption
"bigint": "src/bigint", "bigint": "3rdparty/bigint",
"crypto": "src/crypto", "crypto": "3rdparty/crypto",
"crypto.aes": "node_modules/otr/vendor/cryptojs/aes", "crypto.aes": "node_modules/otr/vendor/cryptojs/aes",
"crypto.cipher-core": "node_modules/otr/vendor/cryptojs/cipher-core", "crypto.cipher-core": "node_modules/otr/vendor/cryptojs/cipher-core",
"crypto.core": "node_modules/otr/vendor/cryptojs/core", "crypto.core": "node_modules/otr/vendor/cryptojs/core",
...@@ -79,7 +79,7 @@ require.config({ ...@@ -79,7 +79,7 @@ require.config({
"crypto.sha1": "node_modules/otr/vendor/cryptojs/sha1", "crypto.sha1": "node_modules/otr/vendor/cryptojs/sha1",
"crypto.sha256": "node_modules/otr/vendor/cryptojs/sha256", "crypto.sha256": "node_modules/otr/vendor/cryptojs/sha256",
"salsa20": "node_modules/otr/build/dep/salsa20", "salsa20": "node_modules/otr/build/dep/salsa20",
"otr": "src/otr", "otr": "3rdparty/otr",
// Locales paths // Locales paths
"locales": "src/locales", "locales": "src/locales",
...@@ -103,7 +103,7 @@ require.config({ ...@@ -103,7 +103,7 @@ require.config({
"uk": "locale/uk/LC_MESSAGES/converse.json", "uk": "locale/uk/LC_MESSAGES/converse.json",
"zh": "locale/zh/LC_MESSAGES/converse.json", "zh": "locale/zh/LC_MESSAGES/converse.json",
"moment_with_locales": "src/moment_locales", "moment_with_locales": "3rdparty/moment_locales",
'moment_af': "node_modules/moment/locale/af", 'moment_af': "node_modules/moment/locale/af",
'moment_de': "node_modules/moment/locale/de", 'moment_de': "node_modules/moment/locale/de",
'moment_es': "node_modules/moment/locale/es", 'moment_es': "node_modules/moment/locale/es",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment