Merge branch 'master' into fix/noid/travismysqlerror

.travis.yml

@@ -27,11 +27,11 @@ services:
   - xvfb
 
 
-before_install:
-    # enable a display for running JavaScript tests
+  # enable a display for running JavaScript tests
     #- export DISPLAY=:99.0
    # - sh -e /etc/init.d/xvfb start
    # - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
+    - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
     # - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - wget https://raw.githubusercontent.com/$SERVER/before_install.sh
     - . ./before_install.sh "$APP_NAME" "$CORE_BRANCH" "$DB"

appinfo/info.xml

@@ -19,7 +19,7 @@ Features:
 - Import from various password managers (KeePass, LastPass, DashLane, ZOHO, Clipperz.is )
 For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
 ]]></description>
-    <version>2.3.2</version>
+    <version>2.3.7</version>
     <licence>agpl</licence>
     <author homepage="https://github.com/brantje">Sander Brand</author>
     <author homepage="https://github.com/animalillo">Marcos Zuriaga</author>
@@ -37,13 +37,12 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
     <screenshot small-thumbnail="https://img.passman.cc/thumbs/share_credential.png">https://img.passman.cc/share_credential.png</screenshot>
     <screenshot small-thumbnail="https://img.passman.cc/thumbs/password_audit.png">https://img.passman.cc/password_audit.png</screenshot>
     <dependencies>
-        <php min-version="7.0"/>
+        <php min-version="7.2"/>
         <database>sqlite</database>
         <database>pgsql</database>
         <database min-version="5.5">mysql</database>
         <lib>openssl</lib>
-        <nextcloud min-version="14" max-version="18"/>
-        <owncloud min-version="14" max-version="18"/>
+        <nextcloud min-version="20" max-version="22"/>
     </dependencies>
 
     <background-jobs>

bower.json

@@ -30,14 +30,17 @@
     "angular-translate": "2.9.0",
     "angular-xeditable": "0.3.0",
     "angular-datetime-picker": "",
-    "ng-clipboard": "1.5.10",
-    "ng-password-meter": "0.4.0",
+    "ng-clipboard": "1.0.2",
+    "ng-password-meter": "0.1.6",
     "ng-tags-input": "3.1.1",
     "papa-parse": "4.1.2",
     "llqrcode": "0.0.2",
-    "sha": " 2.0.1",
+    "jssha": " 2.0.1",
     "sjcl": " 1.0.8",
-    "ui-sortable": "0.19.0",
+    "ui-sortable": "1.0",
     "zxcvbn": "4.4.2"
+  },
+  "resolutions": {
+    "angular": "1.5.8"
   }
 }

controller/credentialcontroller.php

@@ -85,6 +85,7 @@ public function createCredential($changed, $created,
 			'username' => $username,
 			'password' => $password,
 			'url' => $url,
+			'icon' => $favicon,
 			'favicon' => $favicon,
 			'renew_interval' => $renew_interval,
 			'expire_time' => $expire_time,
@@ -94,7 +95,6 @@ public function createCredential($changed, $created,
 			'otp' => $otp,
 			'hidden' => $hidden,
 			'compromised' => $compromised
-
 		);
 
 		$credential = $this->credentialService->createCredential($credential);
@@ -353,4 +353,4 @@ public function updateRevision($revision_id, $credential_data) {
 		$this->credentialRevisionService->updateRevision($revision);
 		return new JSONResponse(array());
 	}
-}
+}

controller/translationcontroller.php

@@ -269,7 +269,7 @@ public function getLanguageStrings() {
 			'enable.link.sharing' => $this->trans->t('Enable link sharing'),
 			'share.until.date' => $this->trans->t('Share until date'),
 			'expire.views' => $this->trans->t('Expire after views'),
-			'click.share' => $this->trans->t('Click \"Share\" first'),
+			'click.share' => $this->trans->t('Click "Share" first'),
 			'show.files' => $this->trans->t('Show files'),
 
 
@@ -375,7 +375,7 @@ public function getLanguageStrings() {
 			'new.vault.name' => $this->trans->t('Please give your new vault a name.'),
 			'new.vault.pass' => $this->trans->t('Vault password'),
 			'new.vault.passr' => $this->trans->t('Repeat vault password'),
-			'new.vault.sharing_key_notice' => $this->trans->t('Your sharing keys will have a strength of 1024 bit, which you can change in \"Settings\" later .'),
+			'new.vault.sharing_key_notice' => $this->trans->t('Your sharing keys will have a strength of 1024 bit, which you can change in "Settings" later.'),
 			'new.vault.create' => $this->trans->t('Create vault'),
 			'go.back.vaults' => $this->trans->t('Go back to vaults'),
 			'input.vault.password' => $this->trans->t('Please input the password for'),
@@ -425,7 +425,7 @@ public function getLanguageStrings() {
 			'expired.share' => $this->trans->t('Awwhh… credential not found. Maybe it expired'),
 
 			//compromised credentials
-			'compromised.label' => $this->trans->t('Compromise!'),
+			'compromised.label' => $this->trans->t('Mark as Compromised'),
 			'compromised.warning.list' => $this->trans->t('Compromised!'),
 			'compromised.warning' => $this->trans->t('This password is compromised. You can only remove this warning by changing the password.'),
 
@@ -436,7 +436,7 @@ public function getLanguageStrings() {
 			'search.settings.input.custom_fields' => $this->trans->t('Custom Fields'),
 			'search.settings.input.password' => $this->trans->t('Password'),
 			'search.settings.input.description' => $this->trans->t('Description'),
-			'search.settings.input.url' => $this->trans->t('Url'),
+			'search.settings.input.url' => $this->trans->t('URL'),
 
 			'search.settings.title' => $this->trans->t('Custom Search:'),
 			'search.settings.defaults_button' => $this->trans->t('Revert to defaults'),