build v3.4.0

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## 3.4.0 - 2018-05-23
 ### Added
 - option to show only group members in the roster (internal)
 - [jsxc/jsxc#477](https://github.com/jsxc/jsxc/issues/477) add admin setting to change log in behavior

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.4.0-beta.1</version>
+   <version>3.4.0</version>
    <licence>agpl</licence>
    <author mail="klaus@jsxc.org">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

build/appinfo/application.php

@@ -112,6 +112,7 @@ public function __construct(array $urlParams=array()){
 				$c->query('OCP\ILogger'),
 				$c->query('DataRetriever'),
 				$c->query('OCP\Security\ISecureRandom'),
+				$c->query('OCP\App\IAppManager'),
 				'https://xmpp.jsxc.ch/registration'
 			);
 		});

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.4.0-beta.1</version>
+   <version>3.4.0</version>
    <licence>agpl</licence>
    <author mail="klaus@jsxc.org">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

build/css/jsxc.oc.css

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.4.0-beta.1 - 2018-05-17
+ * ojsxc v3.4.0 - 2018-05-23
  * 
  * Copyright (c) 2018 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 3.4.0-beta.1
+ * @version 3.4.0
  * @license MIT
  */
 
@@ -4232,7 +4232,7 @@ div.jsxc_video {
     opacity: 1; }
 
 @media (min-width: 768px) {
-  #content-wrapper, #filestable > thead, #controls {
+  #content-wrapper, #filestable > thead {
     padding-right: 0;
     transition: padding-right 0.5s; }
   #mainContainer, #odf-toolbar, #app-sidebar {
@@ -4242,7 +4242,7 @@ div.jsxc_video {
     transition: right 0.5s; }
     .app-mail .submit-message-wrapper .submit-message {
       transition: right 0.5s; }
-  .jsxc-roster-shown #content-wrapper, .jsxc-roster-shown #filestable > thead, .jsxc-roster-shown #controls {
+  .jsxc-roster-shown #content-wrapper, .jsxc-roster-shown #filestable > thead {
     padding-right: 210px; }
   .jsxc-roster-shown #mainContainer, .jsxc-roster-shown #odf-toolbar, .jsxc-roster-shown #app-sidebar {
     right: 210px; }

build/js/eof.js

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.4.0-beta.1 - 2018-05-17
+ * ojsxc v3.4.0 - 2018-05-23
  * 
  * Copyright (c) 2018 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 3.4.0-beta.1
+ * @version 3.4.0
  * @license MIT
  */
 

build/js/jsxc/jsxc.js

@@ -1,13 +1,13 @@
 /*!
- * jsxc v3.4.0-beta.1 - 2018-05-17
+ * jsxc v3.4.0 - 2018-05-23
  * 
  * Copyright (c) 2018 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
  * 
  * Please see https://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 3.4.0-beta.1
+ * @version 3.4.0
  * @license MIT
  */
 
@@ -25,7 +25,7 @@ var jsxc = null, RTC = null, RTCPeerconnection = null;
  */
 jsxc = {
    /** Version of jsxc */
-   version: '3.4.0-beta.1',
+   version: '3.4.0',
 
    /** True if i'm the master */
    master: false,

build/js/ojsxc.js

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.4.0-beta.1 - 2018-05-17
+ * ojsxc v3.4.0 - 2018-05-23
  * 
  * Copyright (c) 2018 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 3.4.0-beta.1
+ * @version 3.4.0
  * @license MIT
  */
 

build/js/settings/admin.js

@@ -284,7 +284,7 @@ $(document).ready(function() {
       $('.ojsxc-managed-registration').show();
    });
 
-   $('#ojsxc-legal').on('change', function() {
-      $('#ojsxc-register').prop('disabled', !$(this).prop('checked'));
+   $('#ojsxc-legal, #ojsxc-dp').on('change', function() {
+      $('#ojsxc-register').prop('disabled', !$('#ojsxc-legal').prop('checked') || !$('#ojsxc-dp').prop('checked'));
    })
 });

build/lib/Controller/ManagedServerController.php

@@ -14,6 +14,7 @@
 use OCA\OJSXC\IDataRetriever;
 use OCA\OJSXC\AppInfo\Application;
 use OCP\Security\ISecureRandom;
+use OCP\App\IAppManager;
 
 class ManagedServerController extends Controller
 {
@@ -34,6 +35,7 @@ public function __construct(
 								 ILogger $logger,
 								 IDataRetriever $dataRetriever,
 								 ISecureRandom $random,
+								 IAppManager $appManager,
 								 $registrationUrl
    ) {
 		parent::__construct($appName, $request);
@@ -44,6 +46,7 @@ public function __construct(
 		$this->logger = $logger;
 		$this->dataRetriever = $dataRetriever;
 		$this->random = $random;
+		$this->appManager = $appManager;
 		$this->registrationUrl = $registrationUrl;
 	}
 
@@ -83,14 +86,16 @@ private function doRegistration($promotionCode, $requestId)
 		$apiUrl = $this->urlGenerator->linkToRouteAbsolute('ojsxc.externalApi.index');
 		$apiSecret = $this->config->getAppValue('ojsxc', 'apiSecret');
 		$userId = $this->userSession->getUser()->getUID();
+		$appVersion = '3.4.0'; //$this->appManager->getAppVersion('ojsxc'); from NC 14
 
 		$data = [
 		  'apiUrl' => $apiUrl,
 		  'apiSecret' => $apiSecret,
 		  'apiVersion' => 1,
 		  'userId' => $userId,
+		  'appVersion' => $appVersion,
 		  'promotionCode' => $promotionCode
-	  ];
+		];
 
 		$response = $this->dataRetriever->fetchUrl($this->registrationUrl.'?rid='.$requestId, $data);
 

build/templates/settings/admin.php

@@ -121,7 +121,10 @@
 						</div>
 					</div>
 					<div class="form-col-offset">
-						<label><input id="ojsxc-legal" type="checkbox" /> I acknowledge that this is a beta service offered by the <a href="https://jsxc.ch/federated-communication-association">Federated Communication Association</a> without any warranty whatsoever.</label>
+						<label><input id="ojsxc-legal" type="checkbox" /> I acknowledge that this is a beta service offered by the <a target="_blank" href="https://jsxc.ch/federated-communication-association">Federated Communication Association</a> without any warranty whatsoever.</label>
+					</div>
+					<div class="form-col-offset">
+						<label><input id="ojsxc-dp" type="checkbox" /> I have read and accept the <a target="_blank" href="https://jsxc.ch/privacy-policy">privacy policy</a>.</label>
 					</div>
 					<div class="form-col-offset">
 						<input id="ojsxc-register" type="button" value="Register" data-toggle-value="Processing registration" disabled="disabled" />

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ojsxc",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.0",
   "description": "Real-time chat app for Nextcloud",
   "homepage": "http://www.jsxc.org/",
   "bugs": "https://github.com/jsxc/jsxc/issues",