summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-07-26 23:47:31 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-08-21 21:05:13 +0200
commit50200fb13ab6f0ae9f1d19c29c756746ac03c27b (patch)
treeb253007b5050dc2f91b5bb98d8ffce5d254cfbae
parent04c051035dc8825c096c1b3656176f3d64ff5ffb (diff)
Remove export version comparison
Bump min nextcloud version Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--appinfo/info.xml6
-rw-r--r--js/components/addressBook/addressBook_controller.js18
-rw-r--r--templates/addressBook.html2
3 files changed, 4 insertions, 22 deletions
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 55be4fd8..2636e14d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,7 +11,7 @@
* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!
* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.
</description>
- <version>1.5.3</version>
+ <version>1.5.4</version>
<licence>AGPL</licence>
<author>Alexander Weidinger</author>
<author>Jan-Christoph Borchardt</author>
@@ -29,8 +29,8 @@
<repository type="git">https://github.com/nextcloud/contacts.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
<dependencies>
- <owncloud min-version="9.0" max-version="9.2" />
- <nextcloud min-version="9" max-version="13" />
+ <owncloud min-version="9.2" />
+ <nextcloud min-version="11" max-version="13" />
</dependencies>
<ocsid>168708</ocsid>
<contactsmenu>
diff --git a/js/components/addressBook/addressBook_controller.js b/js/components/addressBook/addressBook_controller.js
index c0d52e62..1b72a3d4 100644
--- a/js/components/addressBook/addressBook_controller.js
+++ b/js/components/addressBook/addressBook_controller.js
@@ -51,24 +51,6 @@ angular.module('contactsApp')
ctrl.editing = true;
};
- /* globals oc_config */
- function compareVersion(version1, version2) {
- for (var i = 0; i < Math.max(version1.length, version2.length); i++) {
- var a = version1[i] || 0;
- var b = version2[i] || 0;
- if (Number(a) < Number(b)) {
- return true;
- }
- if (version1[i] !== version2[i]) {
- return false;
- }
- }
- return false;
- }
- /* eslint-disable camelcase */
- ctrl.canExport = compareVersion([9, 0, 2, 0], oc_config.version.split('.'));
- /* eslint-enable camelcase */
-
ctrl.closeMenus = function() {
$scope.$parent.ctrl.openedMenu = false;
};
diff --git a/templates/addressBook.html b/templates/addressBook.html
index 63116155..51162916 100644
--- a/templates/addressBook.html
+++ b/templates/addressBook.html
@@ -32,7 +32,7 @@
<span>{{ctrl.t.copyURL}}</span>
</a>
</li>
- <li ng-show="ctrl.canExport">
+ <li>
<a href="{{ctrl.addressBook.url}}?export" id="download_{{$id}}">
<span class="icon icon-download"></span>
<span>{{ctrl.t.download}}</span>