Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
79b8ed71
Commit
79b8ed71
authored
Oct 02, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New release 4.0.2
parent
dbfd4601
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
19 additions
and
19 deletions
+19
-19
CHANGES.md
CHANGES.md
+1
-1
COPYRIGHT
COPYRIGHT
+2
-2
Makefile
Makefile
+1
-1
dist/converse-no-dependencies.js
dist/converse-no-dependencies.js
+8
-5
docs/source/conf.py
docs/source/conf.py
+2
-2
docs/source/quickstart.rst
docs/source/quickstart.rst
+2
-2
package-lock.json
package-lock.json
+1
-1
package.json
package.json
+1
-1
sass/_chatbox.scss
sass/_chatbox.scss
+1
-0
src/converse-omemo.js
src/converse-omemo.js
+0
-4
No files found.
CHANGES.md
View file @
79b8ed71
# Changelog
## 4.0.2 (
Unreleased
)
## 4.0.2 (
2018-10-02
)
-
M4A and WEBM files, when sent as XEP-0066 Out of Band Data, are now playable directly in chat
-
Updated French and Spanish translations
...
...
COPYRIGHT
View file @
79b8ed71
...
...
@@ -2,9 +2,9 @@
*
* An XMPP chat client that runs in the browser.
*
* Version: 4.0.
1
* Version: 4.0.
2
*
* Copyright: JC Brand 201
2-2017
* Copyright: JC Brand 201
3-2018
* Except for 3rd party dependencies.
* Please refer to the unminified version of this file for details.
*
...
...
Makefile
View file @
79b8ed71
...
...
@@ -71,7 +71,7 @@ serve_bg: dev
########################################################################
## Translation machinery
GETTEXT
=
xgettext
--language
=
"JavaScript"
--keyword
=
__
--keyword
=
___
--from-code
=
UTF-8
--output
=
locale/converse.pot dist/converse-no-dependencies.js
--package-name
=
Converse.js
--copyright-holder
=
"Jan-Carel Brand"
--package-version
=
4.0.
1
-c
GETTEXT
=
xgettext
--language
=
"JavaScript"
--keyword
=
__
--keyword
=
___
--from-code
=
UTF-8
--output
=
locale/converse.pot dist/converse-no-dependencies.js
--package-name
=
Converse.js
--copyright-holder
=
"Jan-Carel Brand"
--package-version
=
4.0.
2
-c
.PHONY
:
pot
pot
:
dist/converse-no-dependencies-es2015.js
...
...
dist/converse-no-dependencies.js
View file @
79b8ed71
...
...
@@ -33199,7 +33199,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}
},
setVCard: function setVCard() {
if (this.get('type') === 'groupchat') {
if (this.get('type') === 'error') {
return;
} else if (this.get('type') === 'groupchat') {
this.vcard = this.getVCardForChatroomOccupant();
} else {
var jid = this.get('from');
...
...
@@ -40280,7 +40282,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
'click .chat-msg__edit-modal': 'showMessageVersionsModal'
},
initialize: function initialize() {
this.model.vcard.on('change', this.render, this);
if (this.model.vcard) {
this.model.vcard.on('change', this.render, this);
}
this.model.on('change:correcting', this.onMessageCorrection, this);
this.model.on('change:message', this.render, this);
this.model.on('change:progress', this.renderFileUploadProgresBar, this);
...
...
@@ -40334,7 +40339,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
var is_me_message = this.isMeCommand(),
moment_time = moment(this.model.get('time')),
role = this.model.vcard
.get('role')
,
role = this.model.vcard
? this.model.vcard.get('role') : null
,
roles = role ? role.split(',') : [];
var msg = u.stringToElement(tpl_message(_.extend(this.model.toJSON(), {
'__': __,
...
...
@@ -45594,7 +45599,6 @@ function _instanceof(left, right) { if (right != null && typeof Symbol !== "unde
algo = {
'name': 'AES-GCM',
'iv': iv,
'additionalData': new Uint8Array(1),
'tagLength': TAG_LENGTH
},
encrypted = await crypto.subtle.encrypt(algo, key, u.stringToArrayBuffer(plaintext)),
...
...
@@ -45616,7 +45620,6 @@ function _instanceof(left, right) { if (right != null && typeof Symbol !== "unde
algo = {
'name': "AES-GCM",
'iv': u.base64ToArrayBuffer(obj.iv),
'additionalData': new Uint8Array(1),
'tagLength': TAG_LENGTH
};
return u.arrayBufferToString((await crypto.subtle.decrypt(algo, key_obj, cipher)));
docs/source/conf.py
View file @
79b8ed71
...
...
@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
# built documents.
#
# The short X.Y version.
version
=
'4.0.
1
'
version
=
'4.0.
2
'
# The full version, including alpha/beta/rc tags.
release
=
'4.0.
1
'
release
=
'4.0.
2
'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
...
...
docs/source/quickstart.rst
View file @
79b8ed71
...
...
@@ -25,8 +25,8 @@ breakage when a new version is released and the above URLs load new resources.
To load a specific version of Converse you can put the version in the URL, like so:
* https://cdn.conversejs.org/4.0.
1
/dist/converse.min.js
* https://cdn.conversejs.org/4.0.
1
/css/converse.min.css
* https://cdn.conversejs.org/4.0.
2
/dist/converse.min.js
* https://cdn.conversejs.org/4.0.
2
/css/converse.min.css
You can include these two URLs inside the *<head>* element of your website
via the *script* and *link* tags:
...
...
package-lock.json
View file @
79b8ed71
{
"name"
:
"converse.js"
,
"version"
:
"4.0.
1
"
,
"version"
:
"4.0.
2
"
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
"dependencies"
:
{
...
...
package.json
View file @
79b8ed71
{
"name"
:
"converse.js"
,
"version"
:
"4.0.
1
"
,
"version"
:
"4.0.
2
"
,
"description"
:
"Browser based XMPP chat client"
,
"main"
:
"dist/converse.js"
,
"directories"
:
{
...
...
sass/_chatbox.scss
View file @
79b8ed71
...
...
@@ -620,6 +620,7 @@
overflow
:
hidden
;
}
.chat-body
{
height
:
calc
(
100%
-
#{
$fullpage-chat-head-height
}
);
background-color
:
$chat-head-color
;
border-top-left-radius
:
$chatbox-border-radius
;
border-top-right-radius
:
$chatbox-border-radius
;
...
...
src/converse-omemo.js
View file @
79b8ed71
...
...
@@ -927,10 +927,6 @@
});
_converse
.
omemo
=
{
}
function
fetchDeviceLists
()
{
return
new
Promise
((
resolve
,
reject
)
=>
_converse
.
devicelists
.
fetch
({
'
success
'
:
resolve
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment