Merge 7e90160 into c10fc9e

.travis.yml

@@ -1,7 +1,9 @@
 language: php
 php:
-    - 5.6
     - 7
+    - 7.0
+    - 7.1
+    - 7.2
 env:
     global:
         - CORE_BRANCH=master
@@ -15,6 +17,7 @@ env:
 branches:
   only:
     - master
+    - fix_layout_for_14
 
 
 before_install:
@@ -83,17 +86,13 @@ addons:
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 5.6
-      env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 5.6
-      env: DB=mysql;JSTESTS=1;
     - php: 7.0
       env: DB=mysql;
+#    - php: 7.0
+#      env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
+#    - php: 7.0
+#      env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
     - php: 7.0
-      env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 7.0
-      env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
+      env: DB=mysql;JSTESTS=1;
   allow_failures:
     - env: DB=sqlite;CODECHECK=2

README.md

@@ -7,6 +7,13 @@ Passman is a full featured password manager.
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/749bb288c9fd4592a73056549d44a85e)](https://www.codacy.com/app/brantje/passman?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/passman&utm_campaign=Badge_Coverage)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/passman/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/passman/?branch=master)
 
+## Join us!
+There are Telegram-Groups:
+* [Passman General](https://t.me/passman_general)
+* [Passman Development](https://t.me/passman_dev)
+
+Those are mainly used to discuss all sorts of topics for Passman and it's apps!
+
 
 ## Contents
 * [Screenshots](https://github.com/nextcloud/passman#Screenshots) 
@@ -160,7 +167,7 @@ To run the unit tests install phpunit globally, and setup the environment variab
 
 ## Contributors
 Add yours when creating a [pull request](https://help.github.com/articles/creating-a-pull-request/)!
-- None
+- Newhinton
 
 
 ## FAQ

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.1.5</version>
+    <version>2.2.0</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="5.6"/>
+        <php min-version="7.0"/>
         <database>sqlite</database>
         <database>pgsql</database>
         <database min-version="5.5">mysql</database>
         <lib>openssl</lib>
-        <owncloud min-version="9" max-version="11" />
-        <nextcloud min-version="9" max-version="14" />
+        <nextcloud min-version="14" />
     </dependencies>
 
     <background-jobs>

bower.json

@@ -0,0 +1,43 @@
+{
+  "name": "Passman",
+  "description": "Passman is a fully featured password manager",
+  "main": "",
+  "authors": [
+    "Sander Brand <brantje(AT)gmail.com>"
+  ],
+  "license": "AGPLv3",
+  "homepage": "passman.cc",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "core/vendor",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular": "1.5.8",
+    "angular-animate": "1.5.8",
+    "angular-cookies": "1.5.8",
+    "angular-local-storage": "0.4.0",
+    "angular-mocks": "1.5.8",
+    "angular-off-click": "1.0.6",
+    "angular-resource": "1.5.8",
+    "angular-route": "1.5.8",
+    "angular-sanitize": "1.5.8",
+    "angular-touch": "1.5.8",
+    "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-tags-input": "3.1.1",
+    "papa-parse": "4.1.2",
+    "llqrcode": "0.0.2",
+    "sha": " 2.0.1",
+    "sjcl": " 1.0.8",
+    "ui-sortable": "0.19.0",
+    "zxcvbn": "4.4.2"
+  }
+}

controller/translationcontroller.php

@@ -347,6 +347,16 @@ public function getLanguageStrings() {
 			'decline' => $this->trans->t('Decline'),
 			'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'),
 			'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'),
+            'vault.hint.hello' => $this->trans->t('Hello there!'),
+            'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
+            'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
+            'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
+            'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
+            'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
+            'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
+            'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
+            'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
+
 
 			// templates/views/vaults.html
 			'last.access' => $this->trans->t('Last accessed'),
@@ -391,6 +401,16 @@ public function getLanguageStrings() {
 			'deleted.credentials' => $this->trans->t('Deleted credentials'),
 			'logout' => $this->trans->t('Logout'),
 			'donate' => $this->trans->t('Donate'),
+            'navigation.show.all' => $this->trans->t('Show All'),
+            'navigation.tags' => $this->trans->t('Tags'),
+            'navigation.tags.search' => $this->trans->t('Search Tags'),
+            'navigation.strength.good' => $this->trans->t('Good Strength'),
+            'navigation.strength.medium' => $this->trans->t('Medium Strength'),
+            'navigation.strength.bad' => $this->trans->t('Bad Strength'),
+            'navigation.expired' => $this->trans->t('Expired'),
+            'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
+            'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
+
 
 			// templates/public_share.php
 			'share.page.text' => $this->trans->t('Someone has shared a credential with you.'),