build v3.2.1

nextcloud · Jun 1, 2017 · 6ba0778 · 6ba0778
1 parent 1b9e939
commit 6ba0778
Show file tree

Hide file tree

Showing 23 changed files with 250 additions and 218 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## 3.2.1 - 2017-06-01
 ### Fixed
 - don't include Sabre if already loaded
 - prevent js strict warning

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.2.0</version>
+   <version>3.2.1</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

diff --git a/build/appinfo/app.php b/build/appinfo/app.php
@@ -62,6 +62,8 @@
 	$manager->addDefaultPolicy($policy);
 }
 
-require_once __DIR__ ."/../vendor/autoload.php";
+if (!class_exists("\\Sabre\\Xml\\Version")) {
+    require_once __DIR__ . "/../vendor/autoload.php";
+}
 
-?>
+?>
diff --git a/build/appinfo/application.php b/build/appinfo/application.php
@@ -137,7 +137,7 @@ private function getLock() {
 		if (self::$config['use_memcache']['locking'] === true) {
 			$cache = $c->getServer()->getMemCacheFactory();
 			$version = \OC::$server->getSession()->get('OC_Version');
-			if ($version[0] === 8 && $version[1] == 0){
+			if ($version[0] === 8 && $version[1] === 0){
 				$c->getServer()->getLogger()->warning('OJSXC is configured to use memcache as backend for locking, but ownCloud version 8  doesn\'t suppor this.');
 			} else if ($cache->isAvailable()) {
 				$memcache = $cache->create('ojsxc');
@@ -153,7 +153,8 @@ private function getLock() {
 		// default
 		return new DbLock(
 			$c->query('UserId'),
-			$c->query('OCP\IConfig')
+			$c->query('OCP\IConfig'),
+			$c->getServer()->getDatabaseConnection()
 		);
 
 	}

diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.2.0</version>
+   <version>3.2.1</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>
@@ -37,7 +37,7 @@
       <lib>xmlreader</lib>
       <lib>xmlwriter</lib>
       <lib>dom</lib>
-      <nextcloud min-version="12" max-version="12"/>
+      <nextcloud min-version="9" max-version="12"/>
    </dependencies>
 
    <ocsid>162257</ocsid>

diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.2.0 - 2017-05-17
+ * ojsxc v3.2.1 - 2017-06-01
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0
+ * @version 3.2.1
  * @license MIT
  */
 
@@ -3523,7 +3523,7 @@ div.jsxc_transfer {
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fade {
   padding-top: 44px; }
 
-.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_sendFile {
+.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video {
   display: none; }
 
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_members {

diff --git a/build/img/app.svg b/build/img/app.svg
diff --git a/build/js/eof.js b/build/js/eof.js
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.2.0 - 2017-05-17
+ * ojsxc v3.2.1 - 2017-06-01
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0
+ * @version 3.2.1
  * @license MIT
  */
 

diff --git a/build/js/jsxc/css/jsxc.css b/build/js/jsxc/css/jsxc.css
@@ -3276,7 +3276,7 @@ div.jsxc_transfer {
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fade {
   padding-top: 44px; }
 
-.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_sendFile {
+.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video {
   display: none; }
 
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_members {