Passman 2.0.1

Merge branch 'fixes'

Signed-off-by: Passman Bot <info@passman.cc>

5 files changed, 200 insertions, 15 deletions

diff --git a/README.md b/README.md
index 8a577a28..d2b4926d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-#Currently in BETA
 #Passman
 
 [![Build Status](https://travis-ci.org/nextcloud/passman.svg?branch=master)](https://travis-ci.org/nextcloud/passman)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 36792fde..37f8e5e2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -3,21 +3,22 @@
     <id>passman</id>
     <name>Passman</name>
     <summary>Passman is a full featured password manager.</summary>
-    <description><![CDATA[Passman is a full featured password manager.\n
-Features:\n
-- Vaults\n
-- Vault key is never sent to the server\n
-- Credentials are stored with 256 bit AES\n
-- Ability to add custom fields to credentials\n
-- Built-in OTP (One Time Password) generator\n
-- Password analyzer\n
-- Share passwords internally and via link in a secure manner.\n
-- Import from various password managers (KeePass, LastPass, DashLane, ZOHO, Clipperz.is )\n
+    <description><![CDATA[Passman is a full featured password manager.
+Features:
+- Vaults
+- Vault key is never sent to the server
+- Credentials are client side encrypted with 256bit AES
+- Credentials are server side encrypted with 256bit AES
+- Ability to add custom fields to credentials
+- Built-in OTP (One Time Password) generator
+- Password analyzer
+- Share passwords internally and via link in a secure manner.
+- 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>
 
     <licence>AGPL</licence>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <author homepage="https://github.com/brantje">Sander Brand</author>
     <author homepage="https://github.com/animalillo">Marcos Zuriaga</author>
     <namespace>Passman</namespace>
diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php
index 7d47ecd4..1b116b64 100644
--- a/controller/credentialcontroller.php
+++ b/controller/credentialcontroller.php
@@ -292,7 +292,10 @@ class CredentialController extends ApiController {
 			'', $this->userId, Activity::TYPE_ITEM_ACTION);
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
-				$this->credentialRevisionService->deleteRevision($revision['id'], $this->userId);
+				$id = $revision->getId();
+				if(isset($id)){
+					$this->credentialRevisionService->deleteRevision($id, $this->userId);
+				}
 		}
 	}
 
diff --git a/css/bookmarklet.css b/css/bookmarklet.css
index 8df02a33..58742fab 100644
--- a/css/bookmarklet.css
+++ b/css/bookmarklet.css
@@ -1 +1,56 @@
-header,nav{display:none}#content-wrapper{padding-top:0}#app-content-wrapper{min-height:inherit!important}.warning_bar .fa-times{margin-right:20px}.tab_container{padding-top:10px;margin-bottom:20px}.tab_container div{margin-bottom:5px;overflow:hidden}.vault_wrapper{margin-top:70px}.active_vault{float:right;text-align:right;padding-right:5px;font-size:10px}.tab_header{margin:0}.angularjs-datetime-picker{z-index:9999}
\ No newline at end of file
+/**
+ * Nextcloud - passman
+ *
+ * @copyright Copyright (c) 2016, Sander Brand (brantje@gmail.com)
+ * @copyright Copyright (c) 2016, Marcos Zuriaga Miguel (wolfi@wolfi.es)
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+header, nav {
+  display: none; }
+
+#content-wrapper {
+  padding-top: 0; }
+
+#app-content-wrapper {
+  min-height: inherit !important; }
+
+.warning_bar .fa-times {
+  margin-right: 20px; }
+
+.tab_container {
+  padding-top: 10px;
+  margin-bottom: 20px; }
+  .tab_container div {
+    margin-bottom: 5px;
+    overflow: hidden; }
+
+.vault_wrapper {
+  margin-top: 70px; }
+
+.active_vault {
+  float: right;
+  text-align: right;
+  padding-right: 5px;
+  font-size: 10px; }
+
+.tab_header {
+  margin: 0; }
+
+.angularjs-datetime-picker {
+  z-index: 9999; }
+
+/*# sourceMappingURL=bookmarklet.css.map */
diff --git a/css/public-page.css b/css/public-page.css
index 408e704b..2641c533 100644
--- a/css/public-page.css
+++ b/css/public-page.css
@@ -1 +1,128 @@
-.credential_container .text,.footer{text-align:center}header{display:none}#content-wrapper{padding-top:0}.credential_container{margin-top:20px;margin-bottom:20px;padding:20px;background:#f8f8f8;border:1px solid #c9c9c9;-webkit-border-radius:5px;border-radius:5px;background-clip:padding-box}.credential_container h2{font-weight:700}.credential_container .text,.credential_container button{margin:0 auto;display:block}.credential_container .text i,.credential_container button i{margin-right:5px}.credential_field{overflow:hidden}.credential_field .cell,.credential_field .value{float:left}.credential_field .tools{margin-left:10px;overflow:hidden;float:left}.credential_field .tools .cell{cursor:pointer;margin-right:4px}table{white-space:normal}table td:first-child{min-width:110px}table td{padding-bottom:1em;vertical-align:top}.tags .tag{background-color:rgba(240,240,240,.9);padding:4px;font-size:12px;margin-right:3px;-webkit-border-radius:5px;border-radius:5px;background-clip:padding-box}.tags .tag:last-child{margin-right:8px}.footer{font-size:10px;position:relative;bottom:-20px}
\ No newline at end of file
+/**
+ * Nextcloud - passman
+ *
+ * @copyright Copyright (c) 2016, Sander Brand (brantje@gmail.com)
+ * @copyright Copyright (c) 2016, Marcos Zuriaga Miguel (wolfi@wolfi.es)
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+/**
+ * Nextcloud - passman
+ *
+ * @copyright Copyright (c) 2016, Sander Brand (brantje@gmail.com)
+ * @copyright Copyright (c) 2016, Marcos Zuriaga Miguel (wolfi@wolfi.es)
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+/**
+ * Nextcloud - passman
+ *
+ * @copyright Copyright (c) 2016, Sander Brand (brantje@gmail.com)
+ * @copyright Copyright (c) 2016, Marcos Zuriaga Miguel (wolfi@wolfi.es)
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+header {
+  display: none; }
+
+#content-wrapper {
+  padding-top: 0; }
+
+.credential_container {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  padding: 20px;
+  background: #f8f8f8;
+  border: 1px solid #c9c9c9;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  background-clip: padding-box;
+  /* stops bg color from leaking outside the border: */ }
+  .credential_container .text {
+    text-align: center; }
+  .credential_container h2 {
+    font-weight: bold; }
+  .credential_container button, .credential_container .text {
+    margin: 0 auto;
+    display: block; }
+    .credential_container button i, .credential_container .text i {
+      margin-right: 5px; }
+
+.credential_field {
+  overflow: hidden; }
+  .credential_field .cell, .credential_field .value {
+    float: left; }
+  .credential_field .tools {
+    margin-left: 10px;
+    overflow: hidden;
+    float: left; }
+    .credential_field .tools .cell {
+      cursor: pointer;
+      margin-right: 4px; }
+
+table {
+  white-space: normal; }
+  table td:first-child {
+    min-width: 110px; }
+  table td {
+    padding-bottom: 1em;
+    vertical-align: top; }
+
+.tags .tag {
+  background-color: rgba(240, 240, 240, 0.9);
+  padding: 4px;
+  font-size: 12px;
+  margin-right: 3px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  background-clip: padding-box;
+  /* stops bg color from leaking outside the border: */ }
+.tags .tag:last-child {
+  margin-right: 8px; }
+
+.footer {
+  font-size: 10px;
+  position: relative;
+  bottom: -20px;
+  text-align: center; }
+
+/*# sourceMappingURL=public-page.css.map */