Skip to content

Commit

Permalink
build v3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sualko committed Oct 28, 2016
1 parent 8859615 commit c7cf573
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 34 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
v3.0.1 / 2016-10-28
===
- upgrade jsxc to v3.0.1
- fix invalid argument
- use regex to match full id instead of only letters (internal chat server)
- allow port number in BOSH url for csp
- fix login without chat link
- force login form

v3.0.0 / 2016-03-11
===
- upgrade jsxc to v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>ojsxc</id>
<name>JavaScript XMPP Chat</name>
<description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
<version>3.0.1-beta2</version>
<version>3.0.1</version>
<licence>MIT</licence>
<author>Klaus Herberth, Tobia De Koninck</author>
<requiremin>8.0</requiremin>
Expand Down
2 changes: 1 addition & 1 deletion appinfo/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1-beta2
3.0.1
2 changes: 1 addition & 1 deletion build/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>ojsxc</id>
<name>JavaScript XMPP Chat</name>
<description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
<version>3.0.1-beta2</version>
<version>3.0.1</version>
<licence>MIT</licence>
<author>Klaus Herberth, Tobia De Koninck</author>
<requiremin>8.0</requiremin>
Expand Down
2 changes: 1 addition & 1 deletion build/appinfo/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1-beta2
3.0.1
4 changes: 2 additions & 2 deletions build/css/jsxc.oc.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* ojsxc v3.0.1-beta2 - 2016-10-14
* ojsxc v3.0.1 - 2016-10-28
*
* Copyright (c) 2016 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <[email protected]>
* @version 3.0.1-beta2
* @version 3.0.1
* @license MIT
*/

Expand Down
4 changes: 2 additions & 2 deletions build/js/admin.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* ojsxc v3.0.1-beta2 - 2016-10-14
* ojsxc v3.0.1 - 2016-10-28
*
* Copyright (c) 2016 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <[email protected]>
* @version 3.0.1-beta2
* @version 3.0.1
* @license MIT
*/

Expand Down
4 changes: 2 additions & 2 deletions build/js/eof.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* ojsxc v3.0.1-beta2 - 2016-10-14
* ojsxc v3.0.1 - 2016-10-28
*
* Copyright (c) 2016 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <[email protected]>
* @version 3.0.1-beta2
* @version 3.0.1
* @license MIT
*/

Expand Down
11 changes: 8 additions & 3 deletions build/js/jsxc/jsxc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* jsxc v3.0.1-beta2 - 2016-10-14
* jsxc v3.0.1 - 2016-10-28
*
* Copyright (c) 2016 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <[email protected]>
* @version 3.0.1-beta2
* @version 3.0.1
* @license MIT
*/

Expand All @@ -25,7 +25,7 @@ var jsxc = null, RTC = null, RTCPeerconnection = null;
*/
jsxc = {
/** Version of jsxc */
version: '3.0.1-beta2',
version: '3.0.1',

/** True if i'm the master */
master: false,
Expand Down Expand Up @@ -5927,6 +5927,11 @@ jsxc.muc = {
var dialog = jsxc.gui.dialog.open(jsxc.muc.helper.formToHTML(config));
var form = dialog.find('form');

// work around Strophe.x behaviour
form.find('[type="checkbox"]').change(function(){
$(this).val(this.checked ? 1 : 0);
});

var submit = $('<button>');
submit.addClass('btn btn-primary');
submit.attr('type', 'submit');
Expand Down
12 changes: 6 additions & 6 deletions build/js/jsxc/jsxc.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/jsxc/jsxc.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/js/jsxc/lib/jsxc.dep.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions build/js/jsxc/lib/jsxc.dep.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/jsxc/lib/jsxc.dep.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/jsxc/lib/translation.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/js/ojsxc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* ojsxc v3.0.1-beta2 - 2016-10-14
* ojsxc v3.0.1 - 2016-10-28
*
* Copyright (c) 2016 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <[email protected]>
* @version 3.0.1-beta2
* @version 3.0.1
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion js/jsxc
Submodule jsxc updated from ce7bca to a586e9
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ojsxc",
"version": "3.0.1-beta2",
"version": "3.0.1",
"description": "Real-time chat app for owncloud",
"homepage": "http://www.jsxc.org/",
"bugs": "https://github.com/jsxc/jsxc/issues",
Expand Down

0 comments on commit c7cf573

Please sign in to comment.