diff options
| author | Alexander Weidinger <irgendwie@users.noreply.github.com> | 2017-10-03 13:45:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 13:45:21 +0200 |
| commit | 49a4992963debedd1662d7879d4e9d5385c36fdf (patch) | |
| tree | 016a29e258d88895a29f86e5b6f619c00658bd96 | |
| parent | ee3e98779594c41f03d25804be1c85c41c63666e (diff) | |
| parent | a71daa3c39179ad50b3ce245639690e365bc6739 (diff) | |
Merge pull request #266 from nextcloud/bump-to-nc11-and-more2.0.0
Contacts 2.0.0
| -rw-r--r-- | appinfo/info.xml | 6 | ||||
| -rw-r--r-- | js/components/addressBook/addressBook_controller.js | 18 | ||||
| -rw-r--r-- | templates/addressBook.html | 2 |
3 files changed, 3 insertions, 23 deletions
diff --git a/appinfo/info.xml b/appinfo/info.xml index 55be4fd8..fbc5d460 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>2.0.0</version> <licence>AGPL</licence> <author>Alexander Weidinger</author> <author>Jan-Christoph Borchardt</author> @@ -29,10 +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" /> + <nextcloud min-version="11" max-version="13" /> </dependencies> - <ocsid>168708</ocsid> <contactsmenu> <provider>OCA\Contacts\ContactsMenu\Providers\DetailsProvider</provider> </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> |