From 327507412b2ae73a8b815af05568a926b1b66922 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 26 Jan 2017 09:35:17 +0000 Subject: [PATCH] Update changelog, bump pluggable.js, move files to 3rdparty directory --- {src => 3rdparty}/bigint.js | 0 {src => 3rdparty}/crypto.js | 0 {src => 3rdparty}/moment_locales.js | 0 {src => 3rdparty}/otr.js | 0 config.js | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename {src => 3rdparty}/bigint.js (100%) rename {src => 3rdparty}/crypto.js (100%) rename {src => 3rdparty}/moment_locales.js (100%) rename {src => 3rdparty}/otr.js (100%) diff --git a/src/bigint.js b/3rdparty/bigint.js similarity index 100% rename from src/bigint.js rename to 3rdparty/bigint.js diff --git a/src/crypto.js b/3rdparty/crypto.js similarity index 100% rename from src/crypto.js rename to 3rdparty/crypto.js diff --git a/src/moment_locales.js b/3rdparty/moment_locales.js similarity index 100% rename from src/moment_locales.js rename to 3rdparty/moment_locales.js diff --git a/src/otr.js b/3rdparty/otr.js similarity index 100% rename from src/otr.js rename to 3rdparty/otr.js diff --git a/config.js b/config.js index 0a299d59e..9c54a29b2 100644 --- a/config.js +++ b/config.js @@ -65,8 +65,8 @@ require.config({ "converse-vcard": "src/converse-vcard", // Off-the-record-encryption - "bigint": "src/bigint", - "crypto": "src/crypto", + "bigint": "3rdparty/bigint", + "crypto": "3rdparty/crypto", "crypto.aes": "node_modules/otr/vendor/cryptojs/aes", "crypto.cipher-core": "node_modules/otr/vendor/cryptojs/cipher-core", "crypto.core": "node_modules/otr/vendor/cryptojs/core", @@ -79,7 +79,7 @@ require.config({ "crypto.sha1": "node_modules/otr/vendor/cryptojs/sha1", "crypto.sha256": "node_modules/otr/vendor/cryptojs/sha256", "salsa20": "node_modules/otr/build/dep/salsa20", - "otr": "src/otr", + "otr": "3rdparty/otr", // Locales paths "locales": "src/locales", @@ -103,7 +103,7 @@ require.config({ "uk": "locale/uk/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_de': "node_modules/moment/locale/de", 'moment_es': "node_modules/moment/locale/es",