From 3e050c9a15c4c8339580c5a09cced5eaf39c09b4 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Fri, 28 Sep 2018 14:07:40 +0200 Subject: [PATCH 001/119] Updated Css Signed-off-by: fnuesse --- appinfo/info.xml | 4 ++-- css/app.css | 22 ++++++++++++++++------ templates/views/show_vault.html | 12 +++++++----- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 6bdb634d..109754bc 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -42,8 +42,8 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) pgsql mysql openssl - - + + diff --git a/css/app.css b/css/app.css index 4833647f..71e32af7 100644 --- a/css/app.css +++ b/css/app.css @@ -275,7 +275,8 @@ padding: 12px; font-weight: bold; text-align: center; - z-index: 800; + z-index: 18000; + visibility: hidden; /* TODO remove */ background-color: red; color: white; } .warning_bar .fa-times { @@ -386,8 +387,11 @@ @media screen and (min-width: 769px) and (max-width: 820px) { #app-content #app-content-wrapper .title { display: none; } } - #app-content #app-content-wrapper .actions.creatable { + #app-content #app-content-wrapper .breadcrumb { float: left; + } + #app-content #app-content-wrapper .actions.creatable { + float: right; overflow: hidden; } #app-content #app-content-wrapper .actions.creatable .bubble { position: relative; @@ -665,7 +669,7 @@ cursor: pointer; } #app-content #app-content-wrapper .app_sidebar.item_selected { height: 25%; - display: inline-block; } + display: inline-block; } #app-content #app-content-wrapper .app_sidebar .credential-data .row { margin-bottom: 11px; } #app-content #app-content-wrapper .app_sidebar .credential-data .tags { @@ -1004,7 +1008,9 @@ margin-right: 0 !important; } #app-content #app-content-wrapper #passman-controls { - border-bottom: 1px solid #c9c9c9; } + margin-top: 5px; + border-bottom: 1px solid #c9c9c9; +} #passman-controls { box-sizing: border-box; @@ -1027,8 +1033,12 @@ width: 100%; } } @media only screen and (min-width: 768px) { #app-navigation + #app-content #passman-controls { - left: 250px; - width: calc( 100% - 250px ) !important; } } + left: 300px; + width: calc( 100% - 300px ) !important; } + #passman-controls { + right: 0px; + width: 50%;} +} #passman-controls .button, #passman-controls, #passman-controls input[type='submit'], #passman-controls input[type='text'], #passman-controls input[type='password'], #passman-controls select { box-sizing: border-box; display: inline-block; diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 6175deba..f801f819 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -11,10 +11,6 @@ -
- - + -
+
@@ -86,59 +86,62 @@
-
-

{{selectedCredential.label}}

- -
- -
- - - -
-
- - - - - - - - -
-
-
+
+

{{selectedCredential.label}}

+ + +
+ +
+ + + +
+
+ + + + + + + + +
+
+
+ + @@ -58,7 +57,7 @@ ng-click="createVault(vault_name, vault_key, vault_key2)" ng-disabled="vault_key_score.score < minimal_value_key_strength || vault_key !== vault_key2 || vault_key === ''"> {{ 'new.vault.create' | translate }} -
+
{{creating_keys}} From 677ae51b425bf3a2183fd7a18ddb051e22bf0a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 29 Sep 2018 20:52:51 +0200 Subject: [PATCH 003/119] Moved Search from passman-controls to nextcloud-default-searchicon --- js/app/controllers/credential.js | 21 +++++++++++++++++++-- js/app/controllers/main.js | 14 ++------------ sass/credentials.scss | 5 ++++- templates/views/show_vault.html | 5 ++++- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 303635f1..e6ffe575 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -33,8 +33,8 @@ */ angular.module('passmanApp') .controller('CredentialCtrl', ['$scope', 'VaultService', 'SettingsService', '$location', 'CredentialService', - '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval', '$filter', '$routeParams', '$sce', '$translate', - function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval, $filter, $routeParams, $sce, $translate) { + '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval', '$filter', '$routeParams', '$sce', '$translate','$compile', + function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval, $filter, $routeParams, $sce, $translate, $compile) { $scope.active_vault = VaultService.getActiveVault(); if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!$scope.active_vault) { @@ -326,6 +326,23 @@ }; + + //searchboxfix + var native_search = document.getElementById("searchbox"); + native_search.classList.remove('hidden'); + native_search.addEventListener('keypress', function (e) { + if(e.keyCode == 13){ + e.preventDefault(); + } + }); + + native_search.addEventListener('keyup', function (e) { + console.log("keyup"); + $scope.$apply(function () { + $scope.filterOptions.filterText=native_search.value; + }); + }); + $scope.filtered_credentials = []; $scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function () { if (!$scope.active_vault) { diff --git a/js/app/controllers/main.js b/js/app/controllers/main.js index 29fa5d3e..bce529ca 100644 --- a/js/app/controllers/main.js +++ b/js/app/controllers/main.js @@ -31,21 +31,11 @@ * Controller of the passmanApp */ angular.module('passmanApp') + + .controller('MainCtrl', ['$scope', '$rootScope', '$location', 'SettingsService', '$window', '$interval', '$filter', function ($scope, $rootScope, $location, SettingsService, $window, $interval, $filter) { $scope.selectedVault = false; - - var native_search = document.getElementById("searchbox"); - var old_search = document.getElementById("searchBox"); - - native_search.classList.remove('hidden'); - native_search.classList.add('searchbox','ng-valid','ng-touched','ng-dirty','ng-valid-parse','ng-empty'); - native_search.setAttribute("ng-model","filterOptions.filterText"); - - native_search.addEventListener("change", function(){ - old_search.value=native_search.innerText; - }); - $scope.http_warning_hidden = true; if ($location.$$protocol === 'http' && $location.$$host !== 'localhost' && $location.$host !== '127.0.0.1') { $scope.using_http = true; diff --git a/sass/credentials.scss b/sass/credentials.scss index 4f471002..8b07a1ec 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -113,7 +113,10 @@ } .searchboxContainer { - display: inline-block; + + /*display: inline-block;*/ + visibility: hidden; + display: none; margin-right: 14px; float: right; .searchbox { diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 88848688..30fbc62f 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -28,7 +28,10 @@
- + + + + +
From c7c54ad299b7228ce99b07fb383380b9c64b666b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 29 Sep 2018 21:02:23 +0200 Subject: [PATCH 004/119] Fixed Missing Remove function for searchfield-reset-button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- js/app/controllers/credential.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index e6ffe575..ab8a3d29 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -329,6 +329,12 @@ //searchboxfix var native_search = document.getElementById("searchbox"); + native_search.nextElementSibling.addEventListener('click', function (e) { + $scope.$apply(function () { + $scope.filterOptions.filterText=""; + }); + }); + native_search.classList.remove('hidden'); native_search.addEventListener('keypress', function (e) { if(e.keyCode == 13){ From 44276dfafd7ffd935233c076fb10d8c3e6f2c51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 29 Sep 2018 23:08:12 +0200 Subject: [PATCH 005/119] Updated Navigationbar to latest styleguide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- js/app/controllers/menu.js | 40 +++++++++++++++++++++++++++++++++++--- sass/admin.scss | 9 --------- sass/app.scss | 1 - sass/menu.scss | 24 ++++++++++++++++------- sass/partials/button.scss | 7 ------- templates/main.php | 38 +++++++++++++++++++++++------------- 6 files changed, 78 insertions(+), 41 deletions(-) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index f892af38..31165cb7 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -77,8 +77,38 @@ $rootScope.$broadcast('selected_tags_updated', $scope.selectedTags); }, true); + $scope.tagSelected = function (tag) { + for (var i = 0; i < $scope.selectedTags.length; i++) { + if($scope.selectedTags[i].text === tag.text){ + return true; + } + } + return false; + }; + + $scope.removeTagFromSelected = function (tag) { + var where =-1; + for (var i = 0; i < $scope.selectedTags.length; i++) { + if($scope.selectedTags[i].text === tag.text){ + where=i; + } + } + if(where === -1){ + console.log("Cant remove selected Tag, Tag not present!"); + }else{ + + } + $scope.selectedTags.splice(where, 1); + }; + $scope.tagClicked = function (tag) { - $scope.selectedTags.push(tag); + //check if tag already selected + if(!$scope.tagSelected(tag)){ + $scope.selectedTags.push(tag); + }else{ + //console.log("Already selected Tag!"); + $scope.removeTagFromSelected(tag); + } }; $rootScope.$on('credentials_loaded', function () { @@ -91,10 +121,14 @@ if ($scope.selectedTags.length === 0) { return TagService.getTags(); } else { - return $scope.filtered_tags; + return TagService.getTags(); + //Always show all tags + //return $scope.filtered_tags; } }, function (tags) { - $scope.available_tags = tags; + //Always show all tags + //$scope.available_tags = tags; + $scope.available_tags = TagService.getTags(); }, true); $scope.toggleDeleteTime = function () { diff --git a/sass/admin.scss b/sass/admin.scss index 8bac6f46..2eae188d 100644 --- a/sass/admin.scss +++ b/sass/admin.scss @@ -12,13 +12,4 @@ #requests-table{ width: 100%; } - - - .link{ - color: rgb(0, 102, 255) !important; - cursor: pointer; - } - .link:hover{ - text-decoration: underline; - } } \ No newline at end of file diff --git a/sass/app.scss b/sass/app.scss index 6ec78345..92f66161 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -33,7 +33,6 @@ @import 'settings'; #app-settings-content:not(.ng-hide) { - height: 90px; display: inherit !important; padding: 0; transition: height 0.15s ease-out; diff --git a/sass/menu.scss b/sass/menu.scss index 9138c431..a0e952e8 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -23,41 +23,51 @@ .settings-container { div { padding-left: 15px; - + } + button { + width: 80%; + margin-left: 15px; + margin-right: 15px; } } #app-navigation > ul{ - padding-bottom: 80px; > li > a{ - padding-left: 12px !important; z-index: auto; } } .nav-trashbin { - position: fixed !important; - bottom: 44px; + //position: fixed !important; + //bottom: 44px; width: inherit !important; border-right: 1px solid #eee; a { &.active{ - border-left: 3px solid #0082c9; + #border-left: 3px solid #0082c9; } background-color: #fff !important; opacity: 1 !important; z-index: 140; - padding: 0 20px; + //padding: 0 20px; .fa { margin-right: 15px; } } } +//to remove old entry +#taginput{ + visibility: hidden; + display: none; +} + #app-navigation { li{ a.taginput{ + visibility: hidden; + display: none; opacity: 1; } a{ diff --git a/sass/partials/button.scss b/sass/partials/button.scss index 5275fc04..f819ef8f 100644 --- a/sass/partials/button.scss +++ b/sass/partials/button.scss @@ -36,11 +36,4 @@ .button-red:hover{ background: lighten(#ce3702, 2%); color: #fff; -} -.link{ - color: rgb(0, 102, 255) !important; - cursor: pointer; -} -.link:hover{ - text-decoration: underline; } \ No newline at end of file diff --git a/templates/main.php b/templates/main.php index 0e8c79c4..a85ccd66 100644 --- a/templates/main.php +++ b/templates/main.php @@ -125,7 +125,7 @@ style('passman', 'app');
-
From da4bd08878890d4393ee84dbf5a2531d318e2550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sun, 30 Sep 2018 00:06:54 +0200 Subject: [PATCH 006/119] Fixed main password list width MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 21 ++++++++++++++++----- templates/main.php | 6 +++--- templates/views/show_vault.html | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 8b07a1ec..5e34879d 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -20,12 +20,24 @@ * */ +//override nc style to fix wrong offset +#content { + padding-top: 47px !important; // 45px but +2 because of borders +} + +#app-content{ + //width: calc(100% - 300px); + margin-left: 300px; + width: calc(100vw - 300px); +} + #app-content { overflow-x: hidden; - width: 100%; + //width: 100%; #app-content-wrapper { min-height: 95%; - width: 100%; + display: block; + //width: 100%; #passman-controls { text-align: center; &.sidebar-shown { @@ -144,10 +156,9 @@ @include border-bottom-radius(3px); } } + .credential-table { - /*width: 100%; - margin-top: 44px; - */ + width: calc(100vw - 300px); tr:hover { background-color: darken(#fff, 4%); } diff --git a/templates/main.php b/templates/main.php index a85ccd66..33014a47 100644 --- a/templates/main.php +++ b/templates/main.php @@ -177,9 +177,9 @@ style('passman', 'app');
-
-
-
+
+
+
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 30fbc62f..22ac9854 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -45,7 +45,7 @@
-
+
Date: Sun, 30 Sep 2018 00:21:05 +0200 Subject: [PATCH 007/119] Fixed main password list width with sidebar opened MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 12 +++++++----- templates/main.php | 6 +++--- templates/views/show_vault.html | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 5e34879d..61bffb97 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -25,14 +25,16 @@ padding-top: 47px !important; // 45px but +2 because of borders } -#app-content{ - //width: calc(100% - 300px); - margin-left: 300px; - width: calc(100vw - 300px); +//this fixes the scrollbars, because passman-contols are shown above the sidebar. +#app-sidebar{ + height: auto; } #app-content { + margin-left: 300px; + width: calc(100vw - 300px); overflow-x: hidden; + //width: 100%; #app-content-wrapper { min-height: 95%; @@ -41,7 +43,7 @@ #passman-controls { text-align: center; &.sidebar-shown { - padding-right: 27% !important; + //padding-right: 27% !important; .title { @media screen and (max-width: 765px) { display: none; diff --git a/templates/main.php b/templates/main.php index 33014a47..a85ccd66 100644 --- a/templates/main.php +++ b/templates/main.php @@ -177,9 +177,9 @@ style('passman', 'app'); -
-
-
+
+
+
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 22ac9854..a0b09442 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -45,7 +45,7 @@
-
+
-

{{selectedCredential.label}}

Date: Sun, 30 Sep 2018 00:43:11 +0200 Subject: [PATCH 008/119] Fixed main password list gridview MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 61bffb97..d0b75558 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -234,7 +234,9 @@ } .grid-view { - margin-top: 44px; + width: calc(100vw - 300px); + height: 100%; + //margin-top: 44px; display: flex; flex-wrap: wrap; .credential { From d5220573def869fab035d72d55659737d272346a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sun, 30 Sep 2018 00:48:46 +0200 Subject: [PATCH 009/119] Fixed Missing Sidebarseperator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index d0b75558..b87389cb 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -23,6 +23,7 @@ //override nc style to fix wrong offset #content { padding-top: 47px !important; // 45px but +2 because of borders + height: 100%; } //this fixes the scrollbars, because passman-contols are shown above the sidebar. @@ -39,7 +40,8 @@ #app-content-wrapper { min-height: 95%; display: block; - //width: 100%; + //hack for missing separatorbar when app-sidebar is opened + height: calc(100vh - 49px); #passman-controls { text-align: center; &.sidebar-shown { From 5a9450a374fa84fb61547fbe4b23d9b144ced2c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sun, 30 Sep 2018 01:04:57 +0200 Subject: [PATCH 010/119] Centered Vaultlist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/vaults.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/vaults.scss b/sass/vaults.scss index 4d7390c1..5a1d80b9 100644 --- a/sass/vaults.scss +++ b/sass/vaults.scss @@ -36,9 +36,9 @@ } } .vault_wrapper{ - margin: 0 auto; - margin-top: 20px; - width: 100%; + margin:0 auto auto auto; + transform: translate(-150px); + max-width: 420px; @include border-radius(5px); box-shadow: 0 1px 1px #777; From 0f634ef8204508c44d089afde7d5179490ede266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sun, 30 Sep 2018 19:32:00 +0200 Subject: [PATCH 011/119] Fix credential-editing layout WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/app.scss | 2 +- sass/credentials.scss | 13 +++++++------ sass/partials/tabs.scss | 19 +++++++++++++------ templates/views/edit_credential.html | 7 +++---- templates/views/partials/icon-picker.html | 4 +++- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index 92f66161..e41c491c 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -67,7 +67,7 @@ top: 45px; right: 0; left: 0; - + border-bottom: 1px solid #c9c9c9; padding: 0 !important; margin: 0; background-color: rgba(255, 255, 255, .95); diff --git a/sass/credentials.scss b/sass/credentials.scss index b87389cb..b5c3892e 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -573,21 +573,22 @@ @include border-left-radius(0) } .icon-picker { - float: left; + //float: left; margin-top: 3px; margin-left: -3px; - @include border-left-radius(3px); + //@include border-left-radius(3px); .cell { + //min-height: 44px; padding: 7px 12px 2px 12px; display: inline-block; font-size: 14px; border: 1px solid #ddd; background-color: lighten(#ddd, 5%); cursor: pointer; - @include border-left-radius(6px); - img { - height: 16px; - } + //@include border-left-radius(6px); + //img { + // height: 16px; + //} } .cell:hover { color: rgb(0, 102, 255); diff --git a/sass/partials/tabs.scss b/sass/partials/tabs.scss index d9e33964..7a5a0ca6 100644 --- a/sass/partials/tabs.scss +++ b/sass/partials/tabs.scss @@ -21,7 +21,9 @@ */ .tab_header { - margin: 44px 0 0; + width: calc(100vw - 300px); + // margin: 44px 0 0; + margin: 0 0 0; list-style: none; padding: 0; li.tab:first-child { @@ -45,9 +47,15 @@ display: none; } } + + li.inactive { + background-color: #fff !important; + color: unset !important; + } + li.active { - color: #fff; - position: relative; + + //position: relative; .indicator { display: inline-block; position: absolute; @@ -60,10 +68,9 @@ } .tab_container { - border: 1px solid; - border-color: #eee; + border: 1px solid #eee; border-top-color: #0082c9; - border-bottom: 0; + border-bottom-width: 0; clear: both; padding: 0 1em; } diff --git a/templates/views/edit_credential.html b/templates/views/edit_credential.html index 10ee9e7f..b03e8031 100644 --- a/templates/views/edit_credential.html +++ b/templates/views/edit_credential.html @@ -1,7 +1,6 @@
-
  • {{tab.title}}
    diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html index 892244be..7de7b864 100644 --- a/templates/views/partials/icon-picker.html +++ b/templates/views/partials/icon-picker.html @@ -1,6 +1,8 @@
    - + + +
    • - - -
  • {{tag.text}}
    • @@ -143,11 +140,7 @@ style('passman', 'app'); {{ 'deleted.credentials' | translate }} - - - -
@@ -160,7 +153,7 @@ style('passman', 'app');
- +
diff --git a/templates/views/settings.html b/templates/views/settings.html index 3c279f58..b9601cd5 100644 --- a/templates/views/settings.html +++ b/templates/views/settings.html @@ -1,29 +1,30 @@ - -
    -
  • {{tab.title}} -
    -
    • - -
- -
-
+ +
+
    +
  • {{tab.title | translate}} +
    +
    • +
+ +
+
+
+
\ No newline at end of file From 93e94d5c70c785bc4ee22d80de0f9e9614dbcf98 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:11:25 +0200 Subject: [PATCH 014/119] Changed + to New Signed-off-by: fnuesse --- templates/views/show_vault.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index a0b09442..2a60a5ec 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -5,9 +5,12 @@
-
+
{{active_vault.name}}
+
+ {{ 'New' | translate}} +
@@ -26,13 +29,12 @@
-
+ + <!–normal nc add–> -
+
-->
Date: Sun, 30 Sep 2018 23:16:39 +0200 Subject: [PATCH 015/119] Tried to fix cursor Signed-off-by: fnuesse --- sass/credentials.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 6ad3e2ea..ad8aa282 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -171,7 +171,7 @@ background-color: #f8f8f8; } td { - cursor: pointer; + cursor: pointer !important; padding: 5px; border-bottom: 1px solid #eeeeee; .icon { @@ -189,7 +189,7 @@ opacity: 0.4; height: 20px; width: 32px; - cursor: pointer; + cursor: pointer !important; } .icon-more:hover { opacity: 1; @@ -252,7 +252,7 @@ padding: 2px; flex-direction: column; width: 100%; - cursor: pointer; + cursor: pointer !important; font-size: 1.75em; text-align: center; .label { @@ -381,7 +381,7 @@ font-size: 13px; width: 15%; i { - cursor: pointer; + cursor: pointer !important; } } td, th { @@ -590,7 +590,7 @@ font-size: 14px; border: 1px solid #ddd; background-color: lighten(#ddd, 5%); - cursor: pointer; + cursor: pointer !important; @include border-left-radius(6px); //img { // height: 16px; From 4489c7aa38a61f6038000b451c0953e0651ad2ea Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:22:45 +0200 Subject: [PATCH 016/119] Fixed Trashbin not working Signed-off-by: fnuesse --- templates/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main.php b/templates/main.php index 4bb3083b..604ce292 100644 --- a/templates/main.php +++ b/templates/main.php @@ -137,7 +137,7 @@ style('passman', 'app'); {{tag.text}}
  • - + {{ 'deleted.credentials' | translate }}
    • From 438da495837a06954ac9aecb55ee5993d16dfded Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:25:51 +0200 Subject: [PATCH 017/119] Removed new entry from showing if trashbin is selected Signed-off-by: fnuesse --- templates/views/show_vault.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 2a60a5ec..04dd8241 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -8,7 +8,7 @@
    {{active_vault.name}}
    -
    +
    {{ 'New' | translate}}
    From a669c88493f92a65e0f254c99cee9df05c749568 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:37:10 +0200 Subject: [PATCH 018/119] Updated Buildtools Signed-off-by: fnuesse --- .travis.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe5c0511..595b9968 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: php php: - - 5.6 - 7 + - 7.0 + - 7.1 + - 7.2 env: global: - CORE_BRANCH=master @@ -83,17 +85,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 + env: DB=sqlite;CLOUD=nextcloud;SERVER_FOLDER=core - php: 7.0 - env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core + env: DB=mysql;CLOUD=nextcloud;SERVER_FOLDER=core + - php: 7.0 + env: DB=mysql;JSTESTS=1; allow_failures: - env: DB=sqlite;CODECHECK=2 From d643b1bb806d52088255b898f037017201e5bb01 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:41:18 +0200 Subject: [PATCH 019/119] Updated info.xml Signed-off-by: fnuesse --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index a08f4265..2e8a4f32 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -42,8 +42,8 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) pgsql mysql openssl - - + + From 8dd47725e556794d3188c29fb35115b8597cbcb9 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 30 Sep 2018 23:45:54 +0200 Subject: [PATCH 020/119] Increased max-version to 15 for nextcloud testing Signed-off-by: fnuesse --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 2e8a4f32..f5ee4e8d 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -42,8 +42,8 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) pgsql mysql openssl - - + + From b03e975c48c06bec2cb4b3ec5ce00a4c426893be Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 1 Oct 2018 00:01:18 +0200 Subject: [PATCH 021/119] Switched test back to owncloud Signed-off-by: fnuesse --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 595b9968..b3d3a591 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,9 +88,9 @@ matrix: - php: 7.0 env: DB=mysql; - php: 7.0 - env: DB=sqlite;CLOUD=nextcloud;SERVER_FOLDER=core + env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core - php: 7.0 - env: DB=mysql;CLOUD=nextcloud;SERVER_FOLDER=core + env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core - php: 7.0 env: DB=mysql;JSTESTS=1; allow_failures: From 2b22daeeceb9d6bb312e4051da1773e00654a45b Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 1 Oct 2018 00:02:52 +0200 Subject: [PATCH 022/119] Removed unsafe comparison in javascript Signed-off-by: fnuesse --- js/app/controllers/credential.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index ab8a3d29..59bf7310 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -337,7 +337,7 @@ native_search.classList.remove('hidden'); native_search.addEventListener('keypress', function (e) { - if(e.keyCode == 13){ + if(e.keyCode === 13){ e.preventDefault(); } }); From 714d8768d926a1a4f4f8795a512289fca01f82dd Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 1 Oct 2018 00:11:53 +0200 Subject: [PATCH 023/119] removal of broken test Signed-off-by: fnuesse --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3d3a591..c88efc17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,10 +87,10 @@ matrix: include: - 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 - php: 7.0 env: DB=mysql;JSTESTS=1; allow_failures: From b71970d9c9b5722a0a218e14afc8fc2fe96a7220 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 1 Oct 2018 00:24:14 +0200 Subject: [PATCH 024/119] Removed unused parameter from credentialscontroller added nullcheck on native searchbox Signed-off-by: fnuesse --- js/app/controllers/credential.js | 40 +++++++++++++++++--------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 59bf7310..181481f1 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -33,8 +33,8 @@ */ angular.module('passmanApp') .controller('CredentialCtrl', ['$scope', 'VaultService', 'SettingsService', '$location', 'CredentialService', - '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval', '$filter', '$routeParams', '$sce', '$translate','$compile', - function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval, $filter, $routeParams, $sce, $translate, $compile) { + '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval', '$filter', '$routeParams', '$sce', '$translate', + function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval, $filter, $routeParams, $sce, $translate) { $scope.active_vault = VaultService.getActiveVault(); if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!$scope.active_vault) { @@ -329,25 +329,27 @@ //searchboxfix var native_search = document.getElementById("searchbox"); - native_search.nextElementSibling.addEventListener('click', function (e) { - $scope.$apply(function () { - $scope.filterOptions.filterText=""; - }); - }); + if(native_search !== null){ + native_search.nextElementSibling.addEventListener('click', function (e) { + $scope.$apply(function () { + $scope.filterOptions.filterText=""; + }); + }); - native_search.classList.remove('hidden'); - native_search.addEventListener('keypress', function (e) { - if(e.keyCode === 13){ - e.preventDefault(); - } - }); + native_search.classList.remove('hidden'); + native_search.addEventListener('keypress', function (e) { + if(e.keyCode === 13){ + e.preventDefault(); + } + }); - native_search.addEventListener('keyup', function (e) { - console.log("keyup"); - $scope.$apply(function () { - $scope.filterOptions.filterText=native_search.value; - }); - }); + native_search.addEventListener('keyup', function (e) { + console.log("keyup"); + $scope.$apply(function () { + $scope.filterOptions.filterText=native_search.value; + }); + }); + } $scope.filtered_credentials = []; $scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function () { From 2bd9dcf28e4de4e588ea47f59cc43ebb23a23c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 13 Oct 2018 12:45:52 +0200 Subject: [PATCH 025/119] Fixed wrong listlayout which added the sidebar as an overlay which scrolls with the list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 16 ++++++++++++++-- templates/views/show_vault.html | 3 +-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index ad8aa282..36aea562 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -24,6 +24,7 @@ #content { padding-top: 47px !important; // 45px but +2 because of borders height: 100%; + width: 100%; } //this fixes the scrollbars, because passman-contols are shown above the sidebar. @@ -39,7 +40,8 @@ //width: 100%; #app-content-wrapper { min-height: 95%; - display: block; + //display: block; + display:flex; //hack for missing separatorbar when app-sidebar is opened height: calc(100vh - 49px); #passman-controls { @@ -162,7 +164,7 @@ } .credential-table { - width: calc(100vw - 300px); + width: 100%; tr:hover { background-color: darken(#fff, 4%); } @@ -405,7 +407,17 @@ padding-right: 10px; } } + + .main_list{ + flex:1; + float:left; + height:auto; + overflow:auto; + width:100%; + } + .app_sidebar { + float:right; h2 { margin-bottom: 10px; font-weight: 400; diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 04dd8241..e956f610 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -1,4 +1,4 @@ -
    +
    @@ -146,7 +146,6 @@
    -
    - {{active_vault.name}} + {{active_vault.name}}
    - {{ 'New' | translate}} + {{ 'New' | translate}}
    From 6060efe2ee1c99250f0323722f1092a11ec1e7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 13 Oct 2018 12:54:12 +0200 Subject: [PATCH 027/119] Added cursor:pointer to main_list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- templates/views/show_vault.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index d73d5a48..60dded5f 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -67,7 +67,7 @@ - {{ ::credential.label}} + {{ ::credential.label}} From 4d079d2cbd35ee04b766782cb187a976170fdf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 13 Oct 2018 13:30:41 +0200 Subject: [PATCH 028/119] Udated Codestyle and cleaned files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- css/app.css | 1 - js/app/controllers/main.js | 2 -- js/app/controllers/menu.js | 1 - sass/app.scss | 3 --- sass/credentials.scss | 3 --- templates/views/show_vault.html | 12 ------------ 6 files changed, 22 deletions(-) diff --git a/css/app.css b/css/app.css index cd574b01..d8374021 100644 --- a/css/app.css +++ b/css/app.css @@ -276,7 +276,6 @@ font-weight: bold; text-align: center; z-index: 18000; - visibility: hidden; /* TODO remove */ background-color: red; color: white; } .warning_bar .fa-times { diff --git a/js/app/controllers/main.js b/js/app/controllers/main.js index bce529ca..c122501c 100644 --- a/js/app/controllers/main.js +++ b/js/app/controllers/main.js @@ -31,8 +31,6 @@ * Controller of the passmanApp */ angular.module('passmanApp') - - .controller('MainCtrl', ['$scope', '$rootScope', '$location', 'SettingsService', '$window', '$interval', '$filter', function ($scope, $rootScope, $location, SettingsService, $window, $interval, $filter) { $scope.selectedVault = false; diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 31165cb7..bb42f59e 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -23,7 +23,6 @@ (function () { 'use strict'; - /** * @ngdoc function * @name passmanApp.controller:MenuCtrl diff --git a/sass/app.scss b/sass/app.scss index e41c491c..df7025e2 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -53,14 +53,11 @@ } } - -// #app-content #app-content-wrapper #passman-controls { border-bottom: 1px solid #c9c9c9; margin-top: 5px; } - #passman-controls { box-sizing: border-box; position: fixed; diff --git a/sass/credentials.scss b/sass/credentials.scss index e74a94c8..f4514db5 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -604,9 +604,6 @@ background-color: lighten(#ddd, 5%); cursor: pointer; @include border-left-radius(6px); - //img { - // height: 16px; - //} } .cell:hover { color: rgb(0, 102, 255); diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 60dded5f..cf711b1d 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -15,11 +15,6 @@
    -
    - -
    From 073ee202ac4eafcd0a612a1aa946e1bea84c79c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 13 Oct 2018 13:35:57 +0200 Subject: [PATCH 029/119] Added obstrusive highlighting in appnavigation (WIP) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/credentials.scss | 1 - sass/menu.scss | 3 +++ templates/main.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index f4514db5..5b0241bb 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -611,7 +611,6 @@ } } - #iconPicker { .iconList { float: left; diff --git a/sass/menu.scss b/sass/menu.scss index a0e952e8..4896c5cb 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -65,6 +65,9 @@ #app-navigation { li{ + .highlight-selected{ + background-color: var(--color-primary); + } a.taginput{ visibility: hidden; display: none; diff --git a/templates/main.php b/templates/main.php index 604ce292..00ed6b46 100644 --- a/templates/main.php +++ b/templates/main.php @@ -134,7 +134,7 @@ style('passman', 'app');
  • - {{tag.text}} + {{tag.text}}
  • From 1a99044447119ec64082e931c32c7bc00e67fb9d Mon Sep 17 00:00:00 2001 From: newhinton Date: Sat, 13 Oct 2018 15:33:49 +0200 Subject: [PATCH 030/119] Updated Readme with Telegram links --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ed6ad1f..eea17f9c 100644 --- a/README.md +++ b/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 From 06a62acbd47faf589135a5adbd6a015b6b8a0c86 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 14 Oct 2018 00:40:46 +0200 Subject: [PATCH 031/119] Added Icon to sidebar --- js/app/directives/icon.js | 2 +- sass/credentials.scss | 21 +++++++++++++++++++++ templates/views/show_vault.html | 20 ++++++++++++-------- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/js/app/directives/icon.js b/js/app/directives/icon.js index 21e70d1d..646dec01 100644 --- a/js/app/directives/icon.js +++ b/js/app/directives/icon.js @@ -32,7 +32,7 @@ angular.module('passmanApp').directive('credentialIcon', [ '$window', function($window) { return { - template: '', + template: '', restrict: 'E', scope: { credential: '=', diff --git a/sass/credentials.scss b/sass/credentials.scss index 5b0241bb..7c4085e8 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -27,9 +27,30 @@ width: 100%; } +//fix for different heights of passwordicon +.icon-image{ + width: 16px; +} + //this fixes the scrollbars, because passman-contols are shown above the sidebar. #app-sidebar{ height: auto; + .sidebar{ + display: inline-block; + .sidebar-icon { + margin-right: 15px; + .icon-image{ + width: 44px; + } + i { + width: 44px; + } + } + .sidebar-label{ + float:right; + line-height: 44px; + } + } } #app-content { diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index cf711b1d..959300ab 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -83,17 +83,21 @@
    • -
    -

    {{selectedCredential.label}}

    - +
    -
    - -
    + +
    + + + + + + +

    {{selectedCredential.label}}

    +
    +
    From ee55ca7119c0965f16424c559741362c1927581c Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 14 Oct 2018 00:46:52 +0200 Subject: [PATCH 032/119] Fix gridview-size --- sass/credentials.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 7c4085e8..2c78ae04 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -259,7 +259,7 @@ } .grid-view { - width: calc(100vw - 300px); + width: 100%; height: 100%; //margin-top: 44px; display: flex; From 95d70771f2b102e10b0693c318caa71e8afdaf8b Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 14 Oct 2018 01:05:10 +0200 Subject: [PATCH 033/119] Updated Gridview to new design --- sass/credentials.scss | 12 +++++++++--- templates/views/show_vault.html | 12 +++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 2c78ae04..284ec848 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -277,20 +277,26 @@ width: 100%; cursor: pointer; font-size: 1.75em; - text-align: center; + //text-align: center; .label { padding-top: 0.5em; - padding-left: 1em; + //padding-left: 1em; padding-right: 1em; line-height: 1.3em; word-wrap: break-word; + float: right; + } + .icon{ } .tags { - margin-bottom: 0.5em; + margin: 0 0 auto; + text-align: right; + //margin-bottom: 0.5em; .tag { color: #000 !important; margin-top: 5px; display: inline-block; + left:0; } } } diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 959300ab..4b262b41 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -69,7 +69,17 @@ ng-click="selectCredential(credential)" use-theme type="'border-color'">
    -
    {{ ::credential.label}}
    +
    + + + + + + + + +
    {{ ::credential.label}}
    +
    {{ ::tag.text}} From 1f0b6811e3a06776283501809ecff21a71b88bce Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 16 Oct 2018 19:41:00 +0200 Subject: [PATCH 034/119] Changed add-button --- templates/views/show_vault.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 4b262b41..514d8c7d 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -8,9 +8,10 @@
    {{active_vault.name}}
    -
    - {{ 'New' | translate}} -
    + +
    +
    +
    From 201a070e19762d0097552e276b6824e14d3298ab Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 16 Oct 2018 19:48:59 +0200 Subject: [PATCH 035/119] Fixed Revisions --- templates/views/credential_revisions.html | 33 +++++++++++------------ templates/views/show_vault.html | 2 -- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/templates/views/credential_revisions.html b/templates/views/credential_revisions.html index 6cea920f..f2d9f188 100644 --- a/templates/views/credential_revisions.html +++ b/templates/views/credential_revisions.html @@ -1,21 +1,19 @@ -
    {{ 'no.revisions' | translate}}
    +
    -
    @@ -237,4 +236,4 @@
    -
    + diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 514d8c7d..772e7db3 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -90,8 +90,6 @@
    - -
    From 35b5a1487ffb2ce61c77f9dc84f15a59fd081902 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 16 Oct 2018 19:56:22 +0200 Subject: [PATCH 036/119] Fixed Shares --- sass/credentials.scss | 3 +++ templates/views/credential_revisions.html | 2 +- templates/views/share_credential.html | 23 +++++++++++------------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sass/credentials.scss b/sass/credentials.scss index 284ec848..b32aaea2 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -441,6 +441,9 @@ height:auto; overflow:auto; width:100%; + .share{ + overflow:hidden; + } } .app_sidebar { diff --git a/templates/views/credential_revisions.html b/templates/views/credential_revisions.html index f2d9f188..60cf41c3 100644 --- a/templates/views/credential_revisions.html +++ b/templates/views/credential_revisions.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/views/share_credential.html b/templates/views/share_credential.html index 45fe8c9d..d0ac326e 100644 --- a/templates/views/share_credential.html +++ b/templates/views/share_credential.html @@ -1,4 +1,5 @@ -
    +
    +
    @@ -15,21 +16,19 @@
    -
      -
    • {{tab.title}} -
      -
      • - -
    - - From 7b99c2b85a9ca0e2cd8c3a96c89d8f8304808b5d Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 16 Oct 2018 19:59:31 +0200 Subject: [PATCH 037/119] fixed Donate-button --- templates/main.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/main.php b/templates/main.php index 00ed6b46..bc9d2f79 100644 --- a/templates/main.php +++ b/templates/main.php @@ -159,7 +159,9 @@ style('passman', 'app');
    - + + +
    From 28180ea6cf78538b285602a56e022fd1a0bbdfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Tue, 16 Oct 2018 09:22:25 +0200 Subject: [PATCH 038/119] updated binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- css/admin.css | 5 -- css/admin.css.map | 2 +- css/app.css | 181 ++++++++++++++++++++++++++-------------------- css/app.css.map | 2 +- js/templates.js | 10 +-- package.json | 2 +- 6 files changed, 109 insertions(+), 93 deletions(-) diff --git a/css/admin.css b/css/admin.css index e732ee21..f362cfb5 100644 --- a/css/admin.css +++ b/css/admin.css @@ -4,10 +4,5 @@ width: 350px; } #passwordSharingSettings #requests-table { width: 100%; } -#passwordSharingSettings .link { - color: #0066ff !important; - cursor: pointer; } -#passwordSharingSettings .link:hover { - text-decoration: underline; } /*# sourceMappingURL=admin.css.map */ diff --git a/css/admin.css.map b/css/admin.css.map index f71ec9fd..410bb786 100644 --- a/css/admin.css.map +++ b/css/admin.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAGM,wCAAE;EACA,OAAO,EAAE,GAAG;AAGhB,kDAAkB;EAChB,KAAK,EAAE,KAAK;AAGhB,wCAAe;EACb,KAAK,EAAE,IAAI;AAIb,8BAAK;EACH,KAAK,EAAE,kBAA2B;EAClC,MAAM,EAAE,OAAO;AAEjB,oCAAW;EACT,eAAe,EAAE,SAAS", +"mappings": "AAGM,wCAAE;EACA,OAAO,EAAE,GAAG;AAGhB,kDAAkB;EAChB,KAAK,EAAE,KAAK;AAGhB,wCAAe;EACb,KAAK,EAAE,IAAI", "sources": ["../sass/admin.scss"], "names": [], "file": "admin.css" diff --git a/css/app.css b/css/app.css index d8374021..1a967730 100644 --- a/css/app.css +++ b/css/app.css @@ -98,13 +98,6 @@ background: #d83a02; color: #fff; } -.link { - color: #0066ff !important; - cursor: pointer; } - -.link:hover { - text-decoration: underline; } - /** * Nextcloud - passman * @@ -148,7 +141,8 @@ * */ .tab_header { - margin: 44px 0 0; + width: calc(100vw - 300px); + margin: 0 0 0; list-style: none; padding: 0; } .tab_header li.tab:first-child { @@ -168,22 +162,21 @@ transition: background-color 250ms linear; } .tab_header li.tab .indicator { display: none; } - .tab_header li.active { - color: #fff; - position: relative; } - .tab_header li.active .indicator { - display: inline-block; - position: absolute; - height: 7px; - left: 0; - right: 0; - bottom: -1px; } + .tab_header li.inactive { + background-color: #fff !important; + color: unset !important; } + .tab_header li.active .indicator { + display: inline-block; + position: absolute; + height: 7px; + left: 0; + right: 0; + bottom: -1px; } .tab_container { - border: 1px solid; - border-color: #eee; + border: 1px solid #eee; border-top-color: #0082c9; - border-bottom: 0; + border-bottom-width: 0; clear: both; padding: 0 1em; } @@ -231,7 +224,8 @@ .pw-gen .generate_pw { float: left; margin-top: 3px; - margin-left: -3px; } + margin-left: -3px; + padding-bottom: 1px; } .pw-gen .generate_pw .cell { padding: 5px; display: inline-block; @@ -275,7 +269,7 @@ padding: 12px; font-weight: bold; text-align: center; - z-index: 18000; + z-index: 1800; background-color: red; color: white; } .warning_bar .fa-times { @@ -284,9 +278,8 @@ cursor: pointer; } .vault_wrapper { - margin: 0 auto; - margin-top: 20px; - width: 100%; + margin: 0 auto auto auto; + transform: translate(-150px); max-width: 420px; -webkit-border-radius: 5px; border-radius: 5px; @@ -360,21 +353,45 @@ * along with this program. If not, see . * */ +#content { + padding-top: 47px !important; + height: 100%; + width: 100%; } + +.icon-image { + width: 16px; } + +#app-sidebar { + height: auto; } + #app-sidebar .sidebar { + display: inline-block; } + #app-sidebar .sidebar .sidebar-icon { + margin-right: 15px; } + #app-sidebar .sidebar .sidebar-icon .icon-image { + width: 44px; } + #app-sidebar .sidebar .sidebar-icon i { + width: 44px; } + #app-sidebar .sidebar .sidebar-label { + float: right; + line-height: 44px; } + #app-content { + margin-left: 300px; + width: calc(100vw - 300px); overflow-x: hidden; } #app-content #app-content-wrapper { - min-height: 95%; } + min-height: 95%; + display: flex; + height: calc(100vh - 49px); } #app-content #app-content-wrapper #passman-controls { text-align: center; border-bottom: 1px solid #c9c9c9; } - #app-content #app-content-wrapper #passman-controls.sidebar-shown { - padding-right: 27% !important; } - @media screen and (max-width: 765px) { - #app-content #app-content-wrapper #passman-controls.sidebar-shown .title { - display: none; } } - @media screen and (min-width: 769px) and (max-width: 1120px) { - #app-content #app-content-wrapper #passman-controls.sidebar-shown .title { - display: none; } } + @media screen and (max-width: 765px) { + #app-content #app-content-wrapper #passman-controls.sidebar-shown .title { + display: none; } } + @media screen and (min-width: 769px) and (max-width: 1120px) { + #app-content #app-content-wrapper #passman-controls.sidebar-shown .title { + display: none; } } #app-content #app-content-wrapper .title { text-align: center; display: inline-block; @@ -387,10 +404,9 @@ #app-content #app-content-wrapper .title { display: none; } } #app-content #app-content-wrapper .breadcrumb { - float: left; - } + float: left; } #app-content #app-content-wrapper .actions.creatable { - float: right; + float: left; overflow: hidden; } #app-content #app-content-wrapper .actions.creatable .bubble { position: relative; @@ -440,7 +456,9 @@ display: inline-block; padding: 7px; } #app-content #app-content-wrapper .searchboxContainer { - display: inline-block; + /*display: inline-block;*/ + visibility: hidden; + display: none; margin-right: 14px; float: right; } #app-content #app-content-wrapper .searchboxContainer .searchbox { @@ -469,8 +487,7 @@ border-bottom-left-radius: 3px; background-clip: padding-box; } #app-content #app-content-wrapper .credential-table { - width: 100vh; - } + width: 100%; } #app-content #app-content-wrapper .credential-table tr:hover { background-color: whitesmoke; } #app-content #app-content-wrapper .credential-table tr.selected { @@ -483,8 +500,7 @@ font-size: 19px; float: left; margin-right: 5px; - margin-left: 3px; - } + margin-left: 3px; } #app-content #app-content-wrapper .credential-table tr td .icon-more { display: inline-block; float: right; @@ -528,7 +544,8 @@ #app-content #app-content-wrapper .tags .tag:last-child { margin-right: 8px; } #app-content #app-content-wrapper .grid-view { - margin-top: 44px; + width: 100%; + height: 100%; display: flex; flex-wrap: wrap; } #app-content #app-content-wrapper .grid-view .credential { @@ -546,20 +563,21 @@ flex-direction: column; width: 100%; cursor: pointer; - font-size: 1.75em; - text-align: center; } + font-size: 1.75em; } #app-content #app-content-wrapper .grid-view .credential .credential_content .label { padding-top: 0.5em; - padding-left: 1em; padding-right: 1em; line-height: 1.3em; - word-wrap: break-word; } + word-wrap: break-word; + float: right; } #app-content #app-content-wrapper .grid-view .credential .credential_content .tags { - margin-bottom: 0.5em; } + margin: 0 0 auto; + text-align: right; } #app-content #app-content-wrapper .grid-view .credential .credential_content .tags .tag { color: #000 !important; margin-top: 5px; - display: inline-block; } + display: inline-block; + left: 0; } @media all and (min-width: 40em) { #app-content #app-content-wrapper .grid-view .credential { width: 40%; } } @@ -652,7 +670,14 @@ vertical-align: middle; } #app-content #app-content-wrapper .edit_credential .otpText { padding-right: 10px; } + #app-content #app-content-wrapper .main_list { + flex: 1; + float: left; + height: auto; + overflow: auto; + width: 100%; } #app-content #app-content-wrapper .app_sidebar { + float: right; padding: 10px; overflow-y: auto; } #app-content #app-content-wrapper .app_sidebar h2 { @@ -669,7 +694,7 @@ cursor: pointer; } #app-content #app-content-wrapper .app_sidebar.item_selected { height: 25%; - display: inline-block; } + display: inline-block; } #app-content #app-content-wrapper .app_sidebar .credential-data .row { margin-bottom: 11px; } #app-content #app-content-wrapper .app_sidebar .credential-data .tags { @@ -765,9 +790,9 @@ cursor: pointer; /* "hand" cursor */ } - .btn-danger { - color: #fff; } + color: #000000; + background-color: #ff0000; } .icon-label { overflow: hidden; } @@ -792,15 +817,12 @@ .icon-label .icon-picker { float: left; margin-top: 3px; - margin-left: -3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - background-clip: padding-box; } + padding-top: 7px; } .icon-label .icon-picker .cell { + margin-top: 0px; + margin-left: -0px; padding: 7px 12px 2px 12px; - display: inline-block; + display: inline; font-size: 14px; border: 1px solid #ddd; background-color: #eaeaea; @@ -810,8 +832,6 @@ -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; background-clip: padding-box; } - .icon-label .icon-picker .cell img { - height: 16px; } .icon-label .icon-picker .cell:hover { color: #0066ff; } @@ -854,29 +874,35 @@ */ .settings-container div { padding-left: 15px; } +.settings-container button { + width: 80%; + margin-left: 15px; + margin-right: 15px; } -#app-navigation > ul { - padding-bottom: 80px; } - #app-navigation > ul > li > a { - padding-left: 12px !important; - z-index: auto; } +#app-navigation > ul > li > a { + z-index: auto; } .nav-trashbin { - position: fixed !important; - bottom: 44px; width: inherit !important; border-right: 1px solid #eee; } .nav-trashbin a { background-color: #fff !important; opacity: 1 !important; - z-index: 140; - padding: 0 20px; } + z-index: 140; } .nav-trashbin a.active { - border-left: 3px solid #0082c9; } + #border-left: 3px solid #0082c9; } .nav-trashbin a .fa { margin-right: 15px; } +#taginput { + visibility: hidden; + display: none; } + +#app-navigation li .highlight-selected { + background-color: var(--color-primary); } #app-navigation li a.taginput { + visibility: hidden; + display: none; opacity: 1; } #app-navigation li a { overflow: visible; } @@ -990,7 +1016,6 @@ padding: 3px 5px; } #app-settings-content:not(.ng-hide) { - height: 90px; display: inherit !important; padding: 0; transition: height 0.15s ease-out; } @@ -1009,9 +1034,8 @@ margin-right: 0 !important; } #app-content #app-content-wrapper #passman-controls { - margin-top: 5px; border-bottom: 1px solid #c9c9c9; -} + margin-top: 5px; } #passman-controls { box-sizing: border-box; @@ -1019,6 +1043,7 @@ top: 45px; right: 0; left: 0; + border-bottom: 1px solid #c9c9c9; padding: 0 !important; margin: 0; background-color: rgba(255, 255, 255, 0.95); @@ -1035,11 +1060,7 @@ @media only screen and (min-width: 768px) { #app-navigation + #app-content #passman-controls { left: 300px; - width: calc( 100% - 300px ) !important; } - #passman-controls { - right: 0px; - width: 50%;} -} + width: calc( 100% - 300px ) !important; } } #passman-controls .button, #passman-controls, #passman-controls input[type='submit'], #passman-controls input[type='text'], #passman-controls input[type='password'], #passman-controls select { box-sizing: border-box; display: inline-block; diff --git a/css/app.css.map b/css/app.css.map index 8e3e697a..42ee8f57 100644 --- a/css/app.css.map +++ b/css/app.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../sass/app.scss","../sass/variables.scss","../sass/mixins.scss","../sass/partials/button.scss","../sass/partials/popovermenu.scss","../sass/partials/tabs.scss","../sass/partials/pwgen.scss","../sass/vaults.scss","../sass/credentials.scss","../sass/menu.scss","../sass/share_credential.scss","../sass/settings.scss"], "names": [], "file": "app.css" diff --git a/js/templates.js b/js/templates.js index fe20bdc9..7555f7e2 100644 --- a/js/templates.js +++ b/js/templates.js @@ -9,7 +9,7 @@ angular.module('views/credential_revisions.html', []).run(['$templateCache', fun angular.module('views/edit_credential.html', []).run(['$templateCache', function ($templateCache) { 'use strict'; $templateCache.put('views/edit_credential.html', - '
    • {{tab.title}}
    '); + '
    • {{tab.title}}
    '); }]); angular.module('views/partials/credential_template.html', []).run(['$templateCache', function ($templateCache) { @@ -107,7 +107,7 @@ angular.module('views/partials/forms/share_credential/link_sharing.html', []).ru angular.module('views/partials/icon-picker.html', []).run(['$templateCache', function ($templateCache) { 'use strict'; $templateCache.put('views/partials/icon-picker.html', - '
    '); + '
    '); }]); angular.module('views/partials/password-meter.html', []).run(['$templateCache', function ($templateCache) { @@ -119,7 +119,7 @@ angular.module('views/partials/password-meter.html', []).run(['$templateCache', angular.module('views/settings.html', []).run(['$templateCache', function ($templateCache) { 'use strict'; $templateCache.put('views/settings.html', - '
    • {{tab.title}}
    '); + '
    • {{tab.title | translate}}
    '); }]); angular.module('views/share_credential.html', []).run(['$templateCache', function ($templateCache) { @@ -131,8 +131,8 @@ angular.module('views/share_credential.html', []).run(['$templateCache', functio angular.module('views/show_vault.html', []).run(['$templateCache', function ($templateCache) { 'use strict'; $templateCache.put('views/show_vault.html', - '
    {{active_vault.name}}
    +
    {{ \'use.regex\' | translate }}
    {{ ::tag.text}} {{ ::credential.label}}
    • {{ ::credential.label}}
      {{ ::tag.text}}

    {{selectedCredential.label}}

    '); + '
    {{active_vault.name}}
    {{ \'New\' | translate}}
    {{ \'use.regex\' | translate }}
    {{ ::tag.text}} {{ ::credential.label}}
    • {{ ::credential.label}}
      {{ ::tag.text}}

    {{selectedCredential.label}}

    '); }]); angular.module('views/vault_req_deletion.html', []).run(['$templateCache', function ($templateCache) { diff --git a/package.json b/package.json index b3d314c6..321224d0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "karma-verbose-reporter": "0.0.3" }, "dependencies": { - "grunt": "~0.4.5", + "grunt": "~1.0.3", "grunt-cli": "~1.2.0", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-concat": "^1.0.1", From ba194abccae2448cad2beb9ba38cde7d87fc1952 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 16 Oct 2018 20:29:36 +0200 Subject: [PATCH 039/119] fixed off-click --- templates/views/show_vault.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 772e7db3..59cbbe0e 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -1,4 +1,4 @@ -
    +
    @@ -92,7 +92,7 @@
    -
    +
    From 752678aa74d7e211c1ff4f7c29d2977591ed33c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 27 Oct 2018 16:26:32 +0200 Subject: [PATCH 040/119] Fixed action-link&list in password-audit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- templates/views/partials/forms/settings/tool.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/views/partials/forms/settings/tool.html b/templates/views/partials/forms/settings/tool.html index 64f1e027..44955dbf 100644 --- a/templates/views/partials/forms/settings/tool.html +++ b/templates/views/partials/forms/settings/tool.html @@ -28,15 +28,13 @@ {{result.label}} - + - + - + From 8eb1292cffc9796e64df46621e5d2f5fb03e6bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 27 Oct 2018 17:17:12 +0200 Subject: [PATCH 041/119] Improved Taghighlighting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- sass/partials/tabs.scss | 5 +++++ templates/main.php | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sass/partials/tabs.scss b/sass/partials/tabs.scss index 7a5a0ca6..c181c517 100644 --- a/sass/partials/tabs.scss +++ b/sass/partials/tabs.scss @@ -65,6 +65,11 @@ bottom: -1px; } } + +} + +.app-navigation-entry-bullet-color { + background-color: var(--color-primary); } .tab_container { diff --git a/templates/main.php b/templates/main.php index bc9d2f79..20c0cc67 100644 --- a/templates/main.php +++ b/templates/main.php @@ -133,8 +133,9 @@ style('passman', 'app'); -
  • - {{tag.text}} +
  • +
    + {{tag.text}}
  • From f1158485a8610c492e35d7d3c7fde59a265a49cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 27 Oct 2018 20:28:24 +0200 Subject: [PATCH 042/119] Moved tags to sublist in appnavigation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- css/app.css | 3 ++- js/app/controllers/menu.js | 12 ++++++++++++ sass/menu.scss | 11 +++++++++++ sass/partials/tabs.scss | 4 ---- templates/main.php | 22 ++++++++++++++++------ 5 files changed, 41 insertions(+), 11 deletions(-) diff --git a/css/app.css b/css/app.css index 1a967730..79444fc0 100644 --- a/css/app.css +++ b/css/app.css @@ -890,7 +890,8 @@ opacity: 1 !important; z-index: 140; } .nav-trashbin a.active { - #border-left: 3px solid #0082c9; } + #border-left: 3px solid #0082c9; + } .nav-trashbin a .fa { margin-right: 15px; } diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index bb42f59e..aa7ee543 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -110,6 +110,18 @@ } }; + $scope.tagCollapsibleClicked = function () { + if ($scope.tagCollapsibleOpen === true) + $scope.tagCollapsibleOpen = false; + else + $scope.tagCollapsibleOpen = true; + }; + + $scope.tagCollapsibleState = function () { + return $scope.tagCollapsibleOpen !== false; + + }; + $rootScope.$on('credentials_loaded', function () { $rootScope.$broadcast('selected_tags_updated', $scope.selectedTags); }); diff --git a/sass/menu.scss b/sass/menu.scss index 4896c5cb..1ff9d7e3 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -63,8 +63,19 @@ display: none; } +//Overrides transparent entry bullet on hover from server +#app-navigation .collapsible:hover .app-navigation-entry-bullet{ + background: var(--color-primary) !important; +} + #app-navigation { + li{ + .app-navigation-entry-bullet-color { + background-color: var(--color-primary); + } + + .highlight-selected{ background-color: var(--color-primary); } diff --git a/sass/partials/tabs.scss b/sass/partials/tabs.scss index c181c517..d4801c25 100644 --- a/sass/partials/tabs.scss +++ b/sass/partials/tabs.scss @@ -68,10 +68,6 @@ } -.app-navigation-entry-bullet-color { - background-color: var(--color-primary); -} - .tab_container { border: 1px solid #eee; border-top-color: #0082c9; diff --git a/templates/main.php b/templates/main.php index 20c0cc67..88beba5d 100644 --- a/templates/main.php +++ b/templates/main.php @@ -126,17 +126,27 @@ style('passman', 'app');
    +
    • -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    From ea01990672f4448a06cf191bec724dfe62f6f59f Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 29 Oct 2018 08:58:15 +0100 Subject: [PATCH 054/119] Reverted Refactoring --- .../forms/edit_credential/password.html | 172 +++++++++--------- 1 file changed, 85 insertions(+), 87 deletions(-) diff --git a/templates/views/partials/forms/edit_credential/password.html b/templates/views/partials/forms/edit_credential/password.html index a1446856..3e6868de 100644 --- a/templates/views/partials/forms/edit_credential/password.html +++ b/templates/views/partials/forms/edit_credential/password.html @@ -1,95 +1,93 @@
    -
    +
    - -
    - - -
    - -
    - -
    + +
    + + +
    + +
    + +
    + +
    + - {{ 'expire.date' | translate}} -
    - {{'no.expire.date' | translate}} - {{ storedCredential.expire_time | date:'dd-MM-yyyy @ HH:mm:ss'}} + close-on-select="false" + > {{'no.expire.date' | translate}} + - -
    - - -
    -
    -
    - {{ 'generation.settings' | translate}} + close-on-select="false"> {{ storedCredential.expire_time | date:'dd-MM-yyyy @ HH:mm:ss'}} -
    -
    -
    -
    + +
    + + +
    +
    +
    + {{ 'generation.settings' | translate}} - -
    + + +
    +
    + + + + + + +
    +
    +
    +
    From 7694c291b7ecbb5014f22bff5ff258660bb386b2 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 29 Oct 2018 09:20:07 +0100 Subject: [PATCH 055/119] Partialfix for #486 THIS DOES NOT CLOSE IT! v2 --- js/app/controllers/edit_credential.js | 28 +++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js index 5c9ad4f0..6f1abc9a 100644 --- a/js/app/controllers/edit_credential.js +++ b/js/app/controllers/edit_credential.js @@ -32,8 +32,8 @@ * Controller of the passmanApp */ angular.module('passmanApp') - .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', 'EncryptService', 'TagService', 'NotificationService', 'ShareService', '$translate', - function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService, EncryptService, TagService, NotificationService, ShareService, $translate) { + .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', 'EncryptService', 'TagService', 'NotificationService', 'ShareService', '$translate', '$rootScope', + function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService, EncryptService, TagService, NotificationService, ShareService, $translate, $rootScope) { $scope.active_vault = VaultService.getActiveVault(); if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!$scope.active_vault) { @@ -292,7 +292,7 @@ }; $scope.saving = false; $scope.saveCredential = function () { - $scope.saving = true; + $scope.saving = true; if ($scope.new_custom_field.label && $scope.new_custom_field.value) { @@ -301,8 +301,8 @@ if ($scope.storedCredential.password !== $scope.storedCredential.password_repeat){ - $scope.saving = false; - NotificationService.showNotification($translate.instant('password.do.not.match'), 5000); + $scope.saving = false; + NotificationService.showNotification($translate.instant('password.do.not.match'), 5000); return; } @@ -313,7 +313,7 @@ if (!$scope.storedCredential.credential_id) { $scope.storedCredential.vault_id = $scope.active_vault.vault_id; CredentialService.createCredential($scope.storedCredential).then(function () { - $scope.saving = false; + $scope.saving = false; $location.path('/vault/' + $routeParams.vault_id); NotificationService.showNotification($translate.instant('credential.created'), 5000); @@ -345,14 +345,26 @@ _credential.description = _credential.description.replace(regex, ""); } CredentialService.updateCredential(_credential, _useKey).then(function () { - $scope.saving = false; + $scope.saving = false; SettingsService.setSetting('edit_credential', null); $location.path('/vault/' + $routeParams.vault_id); NotificationService.showNotification($translate.instant('credential.updated'), 5000); }); } + $scope.refreshListWithSaved(); + }; - }; + $scope.refreshListWithSaved = function () { + var current_vault = $rootScope.vaultCache[$scope.active_vault.guid]; + var cv_credentials = current_vault.credentials; + for (var i = 0; i < cv_credentials.length; i++) { + if (cv_credentials[i].credential_id === $scope.storedCredential.credential_id) { + cv_credentials[i] = $scope.storedCredential; + } + } + current_vault.credentials=cv_credentials; + $rootScope.vaultCache[$scope.active_vault.guid] = current_vault; + }; $scope.cancel = function () { $location.path('/vault/' + $routeParams.vault_id); From e092c78563d2f9b84c00ba791c4eda8c6992424c Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 29 Oct 2018 09:27:45 +0100 Subject: [PATCH 056/119] Removed console output --- js/app/controllers/credential.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 1116adb8..7d505387 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -344,7 +344,6 @@ }); native_search.addEventListener('keyup', function (e) { - console.log("keyup"); $scope.$apply(function () { $scope.filterOptions.filterText=native_search.value; }); From 5ef92fc1e9874d064e45492dbef5d5a4c745ac01 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 29 Oct 2018 09:34:30 +0100 Subject: [PATCH 057/119] Removed hidden passwords from extended filters --- js/app/controllers/credential.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 7d505387..ae9fc1cf 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -388,7 +388,7 @@ $scope.filterAll = function(){ $scope.selectedtags=[]; $scope.filterOptions.filterText=""; - $scope.filtered_credentials=$scope.active_vault.credentials; + $scope.filtered_credentials=$scope.filterHidden($scope.active_vault.credentials); }; $scope.filterStrength = function(strength_min, strength_max){ @@ -402,7 +402,7 @@ postFiltered.push(initialCredentials[i]); } } - $scope.filtered_credentials=postFiltered; + $scope.filtered_credentials=$scope.filterHidden(postFiltered); }; $scope.filterExpired = function(){ @@ -417,9 +417,20 @@ postFiltered.push(initialCredentials[i]); } } - $scope.filtered_credentials=postFiltered; + $scope.filtered_credentials=$scope.filterHidden(postFiltered); }; + $scope.filterHidden = function(list){ + var list_without_hidden=[]; + for (var i = 0; i < list.length; i++) { + if(list[i].hidden!==1){ + list_without_hidden.push(list[i]); + } + } + return list_without_hidden; + }; + + $scope.selectedtags = []; var to; @@ -488,7 +499,7 @@ } $scope.active_vault = null; $scope.credentials = []; -// $scope.$parent.selectedVault = false; + //$scope.$parent.selectedVault = false; }); From 92898d236b45da680326b14ab57f68318826994a Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sat, 3 Nov 2018 12:25:03 +0100 Subject: [PATCH 058/119] fixed initial state of taglist in navbar --- js/app/controllers/menu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 3de134ec..ce81ac2b 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -114,6 +114,7 @@ $rootScope.$broadcast('filterSpecial',string); }; + $scope.tagCollapsibleOpen=true; $scope.tagCollapsibleClicked = function () { if ($scope.tagCollapsibleOpen === true) $scope.tagCollapsibleOpen = false; From 730e9541764f311229db6cf2f383271d113cd11e Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sat, 3 Nov 2018 12:58:38 +0100 Subject: [PATCH 059/119] Added custom initial state to taglist Signed-off-by: fnuesse --- js/app/controllers/menu.js | 19 ++++++++++++------- js/app/services/vaultservice.js | 2 +- templates/main.php | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index ce81ac2b..ce453255 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -114,17 +114,22 @@ $rootScope.$broadcast('filterSpecial',string); }; - $scope.tagCollapsibleOpen=true; + $scope.collapsedDefaultValue=false; + $scope.tagCollapsibleOpen=VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue); + $scope.tagCollapsibleClicked = function () { - if ($scope.tagCollapsibleOpen === true) - $scope.tagCollapsibleOpen = false; - else - $scope.tagCollapsibleOpen = true; + if (VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue) === true) { + VaultService.setVaultSetting('vaultTagCollapsedState',false); + } else { + VaultService.setVaultSetting('vaultTagCollapsedState',true); + } }; $scope.tagCollapsibleState = function () { - return $scope.tagCollapsibleOpen !== false; - + if(VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue)){ + return ''; + } + return 'open'; }; $rootScope.$on('credentials_loaded', function () { diff --git a/js/app/services/vaultservice.js b/js/app/services/vaultservice.js index 4ca35ee6..11ded085 100644 --- a/js/app/services/vaultservice.js +++ b/js/app/services/vaultservice.js @@ -66,7 +66,7 @@ return false; } else { _activeVault.vault_settings[key] = value; - _this.updateVault(_activeVault); + this.updateVault(_activeVault); } }, diff --git a/templates/main.php b/templates/main.php index 2c282121..f24869b5 100644 --- a/templates/main.php +++ b/templates/main.php @@ -137,7 +137,7 @@ style('passman', 'app'); {{ 'Show All' | translate }} -
  • +
  • {{ 'Tags' | translate }}
      From 0884375b1fa03586a62949f44743f642e4e2cdb9 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sat, 3 Nov 2018 13:21:04 +0100 Subject: [PATCH 060/119] Added friendly reminder to create your first password Signed-off-by: fnuesse --- js/app/controllers/credential.js | 7 +++++++ sass/credentials.scss | 7 ++++++- templates/views/show_vault.html | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index ae9fc1cf..be99a769 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -385,6 +385,13 @@ }); + + $scope.getListSize = function(){ + var l = $scope.filtered_credentials;//$scope.active_vault.credentials.length + console.log(l.length); + return l.length; + }; + $scope.filterAll = function(){ $scope.selectedtags=[]; $scope.filterOptions.filterText=""; diff --git a/sass/credentials.scss b/sass/credentials.scss index a216889b..dd197fdd 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -168,7 +168,6 @@ } .searchboxContainer { - /*display: inline-block;*/ visibility: hidden; display: none; @@ -460,6 +459,12 @@ .share{ overflow:hidden; } + .nopasswords{ + margin-right: auto; + margin-left: auto; + margin-top: 10%; + text-align: center; + } } .app_sidebar { diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 59cbbe0e..eb512b75 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -89,6 +89,13 @@
    • +
    + {{'Hello there!' | translate}}
    +
    {{'It does not seem that you have any passwords. Do you want to add one?' | translate}}
    +
    + +
    +
    From b7bcc9f6d73e7ef340487eb3c6b8cd96236b544f Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sat, 3 Nov 2018 13:31:22 +0100 Subject: [PATCH 061/119] Prevent update on nc13 and earlier Signed-off-by: fnuesse --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index f5ee4e8d..53235901 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -42,8 +42,8 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) pgsql mysql openssl - - + + From 9e88107e1183270acb45621df8ca87027f66da30 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 10:03:51 +0100 Subject: [PATCH 062/119] show welcome message if vault only contains deleted credentials Signed-off-by: fnuesse --- js/app/controllers/credential.js | 10 +++++++++- templates/views/show_vault.html | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index be99a769..22f92f0a 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -389,7 +389,15 @@ $scope.getListSize = function(){ var l = $scope.filtered_credentials;//$scope.active_vault.credentials.length console.log(l.length); - return l.length; + + var deleted=0; + for (var i = 0; i < l.length; i++) { + if(l[i].delete_time>0){ + deleted++; + } + } + + return l.length-deleted; }; $scope.filterAll = function(){ diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index eb512b75..da3e7126 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -89,7 +89,7 @@
    -
    +
    {{'Hello there!' | translate}}
    {{'It does not seem that you have any passwords. Do you want to add one?' | translate}}
    From cb4def26ea8c7296e74100745374aad0cae0393d Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 10:20:05 +0100 Subject: [PATCH 063/119] fixed trashbin-navigation behaviour Signed-off-by: fnuesse --- js/app/controllers/credential.js | 14 ++++++++++++-- js/app/controllers/menu.js | 4 ++++ sass/menu.scss | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 22f92f0a..2a12d5b8 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -380,9 +380,11 @@ case "strength_low": $scope.filterStrength(0,1); break; case "expired": $scope.filterExpired(); break; case "all": $scope.filterAll(); break; - } + $scope.delete_time=0; + $rootScope.$broadcast('release_trashbin', $scope.delete_time); + }); @@ -403,7 +405,15 @@ $scope.filterAll = function(){ $scope.selectedtags=[]; $scope.filterOptions.filterText=""; - $scope.filtered_credentials=$scope.filterHidden($scope.active_vault.credentials); + var creds_filtered=[]; + + for (var i = 0; i < $scope.active_vault.credentials.length; i++) { + if($scope.active_vault.credentials[i].delete_time>0){ + creds_filtered.push($scope.active_vault.credentials[i]); + } + } + + $scope.filtered_credentials=$scope.filterHidden(creds_filtered); }; $scope.filterStrength = function(strength_min, strength_max){ diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index ce453255..97288bfa 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -152,6 +152,10 @@ $scope.available_tags = TagService.getTags(); }, true); + $scope.$on('release_trashbin', function(event, args) { + $scope.delete_time=args; + }); + $scope.toggleDeleteTime = function () { if ($scope.delete_time > 0) { $scope.delete_time = 0; diff --git a/sass/menu.scss b/sass/menu.scss index e0d04b71..fa03c6e2 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -49,6 +49,7 @@ a { &.active{ //border-left: 3px solid #0082c9; + background-image: var(--icon-delete-e9322d); } background-color: #fff !important; opacity: 1 !important; From 062a9d198c384472a4279ef791c4992eecc81795 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 11:04:13 +0100 Subject: [PATCH 064/119] added further hints to ui for user convenience Signed-off-by: fnuesse --- js/app/controllers/credential.js | 59 ++++++++++++++++++++++++-------- js/app/controllers/menu.js | 9 ++--- sass/credentials.scss | 6 ++++ templates/views/show_vault.html | 28 ++++++++++++++- 4 files changed, 83 insertions(+), 19 deletions(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 2a12d5b8..59b1bf2b 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -372,25 +372,51 @@ }, true); + $scope.no_credentials_label=[]; + $scope.no_credentials_label.all=true; + $scope.no_credentials_label.s_good=false; + $scope.no_credentials_label.s_medium=false; + $scope.no_credentials_label.s_low=false; + $scope.no_credentials_label.expired=false; + + $scope.disableAllLabels = function(){ + $scope.no_credentials_label.all=false; + $scope.no_credentials_label.s_good=false; + $scope.no_credentials_label.s_medium=false; + $scope.no_credentials_label.s_low=false; + $scope.no_credentials_label.expired=false; + }; + //watch for special tags $scope.$on('filterSpecial', function(event, args) { + + $scope.disableAllLabels(); switch (args) { - case "strength_good": $scope.filterStrength(3,1000); break; - case "strength_medium": $scope.filterStrength(2,3); break; - case "strength_low": $scope.filterStrength(0,1); break; - case "expired": $scope.filterExpired(); break; - case "all": $scope.filterAll(); break; + case "strength_good": + $scope.filterStrength(3,1000); + $scope.no_credentials_label.s_good=true; + break; + case "strength_medium": + $scope.filterStrength(2,3); + $scope.no_credentials_label.s_medium=true; + break; + case "strength_low": + $scope.filterStrength(0,1); + $scope.no_credentials_label.s_low=true; + break; + case "expired": + $scope.filterExpired(); + $scope.no_credentials_label.expired=true; + break; + case "all": + $scope.filterAll(); + $scope.no_credentials_label.all=true; + break; } - - $scope.delete_time=0; - $rootScope.$broadcast('release_trashbin', $scope.delete_time); - }); - - $scope.getListSize = function(){ - var l = $scope.filtered_credentials;//$scope.active_vault.credentials.length - console.log(l.length); + $scope.getListSizes = function(){ + var l = $scope.filtered_credentials; var deleted=0; for (var i = 0; i < l.length; i++) { @@ -399,7 +425,12 @@ } } - return l.length-deleted; + var result=[]; + result.listsize=l.length; + result.listsize_wout_deleted=l.length-deleted; + result.listsize_deleted=deleted; + + return result; }; $scope.filterAll = function(){ diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 97288bfa..aa415cb5 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -111,6 +111,10 @@ }; $scope.filterCredentialBySpecial = function (string) { + if(string !== 'nav_trashbin'){ + $scope.delete_time=0; + $rootScope.$broadcast('set_delete_time', $scope.delete_time); + } $rootScope.$broadcast('filterSpecial',string); }; @@ -152,15 +156,12 @@ $scope.available_tags = TagService.getTags(); }, true); - $scope.$on('release_trashbin', function(event, args) { - $scope.delete_time=args; - }); - $scope.toggleDeleteTime = function () { if ($scope.delete_time > 0) { $scope.delete_time = 0; } else { $scope.delete_time = 1; + this.filterCredentialBySpecial('nav_trashbin'); } $rootScope.$broadcast('set_delete_time', $scope.delete_time); }; diff --git a/sass/credentials.scss b/sass/credentials.scss index dd197fdd..00833acb 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -465,6 +465,12 @@ margin-top: 10%; text-align: center; } + .belowList{ + margin-right: auto; + margin-left: auto; + margin-top: 1%; + text-align: center; + } } .app_sidebar { diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index da3e7126..68981bb7 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -89,13 +89,39 @@
    -
    +
    {{'Hello there!' | translate}}
    {{'It does not seem that you have any passwords. Do you want to add one?' | translate}}
    + + +
    +
    {{ 'You don\'t have good credentials' | translate}}
    +
    + + +
    +
    {{ 'You don\'t have medium credentials' | translate}}
    +
    + + +
    +
    {{ 'You don\'t have bad credentials' | translate}}
    +
    + + +
    +
    {{ 'You don\'t have expired credentials' | translate}}
    +
    + + +
    +
    {{ 'You don\'t have deleted credentials' | translate}}
    +
    +
    From 98468fa1f7c82c9e343a722757c6018f605c1f52 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 11:09:36 +0100 Subject: [PATCH 065/119] autoclose settings in navbar Signed-off-by: fnuesse --- js/app/controllers/menu.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index aa415cb5..4785007e 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -116,6 +116,9 @@ $rootScope.$broadcast('set_delete_time', $scope.delete_time); } $rootScope.$broadcast('filterSpecial',string); + + //close settings when item is selected + $scope.settingsShown=false; }; $scope.collapsedDefaultValue=false; From 7ca36978a6f7d16ac8bcda99d9818aa67e8697b1 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 11:25:12 +0100 Subject: [PATCH 066/119] indicating which navbaritem is selected in current listview Signed-off-by: fnuesse --- js/app/controllers/menu.js | 2 ++ sass/menu.scss | 15 ++++++++++++--- templates/main.php | 10 +++++----- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 4785007e..dc5d49f3 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -110,7 +110,9 @@ } }; + $scope.clickedNavigationItem='all'; $scope.filterCredentialBySpecial = function (string) { + $scope.clickedNavigationItem=string; if(string !== 'nav_trashbin'){ $scope.delete_time=0; $rootScope.$broadcast('set_delete_time', $scope.delete_time); diff --git a/sass/menu.scss b/sass/menu.scss index fa03c6e2..75a75ece 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -68,12 +68,22 @@ } //Overrides transparent entry bullet on hover from server -#app-navigation .collapsible:hover .app-navigation-entry-bullet{ - background: var(--color-primary) !important; +#app-navigation{ + .collapsible:hover .app-navigation-entry-bullet{ + background: var(--color-primary) !important; + } } + #app-navigation { + a{ + .selected{ + opacity: 1!important; + box-shadow: inset 4px 0 var(--color-primary)!important; + } + } + li{ .app-navigation-entry-bullet-color { background-color: var(--color-primary); @@ -91,7 +101,6 @@ background-color: #4db728; } - .highlight-selected{ background-color: var(--color-primary); } diff --git a/templates/main.php b/templates/main.php index f24869b5..f39551b9 100644 --- a/templates/main.php +++ b/templates/main.php @@ -134,7 +134,7 @@ style('passman', 'app'); -->
  • - {{ 'Show All' | translate }} + {{ 'Show All' | translate }}
  • @@ -151,21 +151,21 @@ style('passman', 'app');
  • - {{ 'Bad Strength' | translate }} + {{ 'Bad Strength' | translate }}
  • - {{ 'Medium Strength' | translate }} + {{ 'Medium Strength' | translate }}
  • - {{ 'Good Strength' | translate }} + {{ 'Good Strength' | translate }}
  • - {{ 'Expired' | translate + {{ 'Expired' | translate }}
    • From fde97739740d3faaa9b3c7f7f1ca943dd8251992 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 11:50:04 +0100 Subject: [PATCH 067/119] CI testrun for vaultservice bug Signed-off-by: fnuesse --- js/app/services/vaultservice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/services/vaultservice.js b/js/app/services/vaultservice.js index 11ded085..9bddd0c4 100644 --- a/js/app/services/vaultservice.js +++ b/js/app/services/vaultservice.js @@ -66,7 +66,7 @@ return false; } else { _activeVault.vault_settings[key] = value; - this.updateVault(_activeVault); + _this.updateVault(_activeVault); } }, From 5ca7f06170326159926aa511a0c23af17ee08e7e Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 12:11:27 +0100 Subject: [PATCH 068/119] Added fix_layout_for_14 to ci-runs Signed-off-by: fnuesse --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c88efc17..09871b13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: branches: only: - master + - fix_layout_for_14 before_install: From 54365b5b9181a484e51c12870647ddcc190a3cd9 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 12:22:23 +0100 Subject: [PATCH 069/119] fixed codestyling Signed-off-by: fnuesse --- js/app/controllers/menu.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index dc5d49f3..7efcf1e6 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -93,9 +93,7 @@ } } if(where === -1){ - console.log("Cant remove selected Tag, Tag not present!"); - }else{ - + //console.log("Cant remove selected Tag, Tag not present!"); } $scope.selectedTags.splice(where, 1); }; @@ -110,10 +108,10 @@ } }; - $scope.clickedNavigationItem='all'; + $scope.clickedNavigationItem="all"; $scope.filterCredentialBySpecial = function (string) { $scope.clickedNavigationItem=string; - if(string !== 'nav_trashbin'){ + if(string !== "nav_trashbin"){ $scope.delete_time=0; $rootScope.$broadcast('set_delete_time', $scope.delete_time); } @@ -124,21 +122,21 @@ }; $scope.collapsedDefaultValue=false; - $scope.tagCollapsibleOpen=VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue); + $scope.tagCollapsibleOpen=VaultService.getVaultSetting("vaultTagCollapsedState",$scope.collapsedDefaultValue); $scope.tagCollapsibleClicked = function () { - if (VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue) === true) { - VaultService.setVaultSetting('vaultTagCollapsedState',false); + if (VaultService.getVaultSetting("vaultTagCollapsedState",$scope.collapsedDefaultValue) === true) { + VaultService.setVaultSetting("vaultTagCollapsedState",false); } else { - VaultService.setVaultSetting('vaultTagCollapsedState',true); + VaultService.setVaultSetting("vaultTagCollapsedState",true); } }; $scope.tagCollapsibleState = function () { if(VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue)){ - return ''; + return ""; } - return 'open'; + return "open"; }; $rootScope.$on('credentials_loaded', function () { From e211e5502421916d2c5df339f08fcb98bf973494 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 12:23:51 +0100 Subject: [PATCH 070/119] removed changes from CI testrun for vaultservice bug Signed-off-by: fnuesse --- js/app/services/vaultservice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/services/vaultservice.js b/js/app/services/vaultservice.js index 9bddd0c4..b24577d2 100644 --- a/js/app/services/vaultservice.js +++ b/js/app/services/vaultservice.js @@ -66,7 +66,7 @@ return false; } else { _activeVault.vault_settings[key] = value; - _this.updateVault(_activeVault); + this.updateVault(_activeVault); } }, From 39bddd1e3c86d6ee28fc983a5c3f51191fcebae3 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 13:37:27 +0100 Subject: [PATCH 071/119] fixed disappearing credentials on show-all Signed-off-by: fnuesse --- js/app/controllers/credential.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 59b1bf2b..b4a2929e 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -439,7 +439,7 @@ var creds_filtered=[]; for (var i = 0; i < $scope.active_vault.credentials.length; i++) { - if($scope.active_vault.credentials[i].delete_time>0){ + if($scope.active_vault.credentials[i].delete_time===0){ creds_filtered.push($scope.active_vault.credentials[i]); } } From 2aa01dd863748f7cbc2ef6cb88f1bcd560d21fdc Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 13:42:51 +0100 Subject: [PATCH 072/119] hide welcome-message on loadingscreen Signed-off-by: fnuesse --- templates/views/show_vault.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 68981bb7..8947ae0a 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -89,7 +89,7 @@
    -
    +
    {{'Hello there!' | translate}}
    {{'It does not seem that you have any passwords. Do you want to add one?' | translate}}
    From ce014390e882870a3142b398c6642cf861d6084b Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 17:32:16 +0100 Subject: [PATCH 073/119] remove all tags on show-all selection Signed-off-by: fnuesse --- js/app/controllers/menu.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 7efcf1e6..f2c94bf8 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -115,6 +115,9 @@ $scope.delete_time=0; $rootScope.$broadcast('set_delete_time', $scope.delete_time); } + if(string === "all"){ + $scope.selectedTags =[]; + } $rootScope.$broadcast('filterSpecial',string); //close settings when item is selected From 984b829f784918240a5b143ea221b63847afb7cf Mon Sep 17 00:00:00 2001 From: fnuesse Date: Sun, 4 Nov 2018 18:52:03 +0100 Subject: [PATCH 074/119] readded tagsearch to navbar Signed-off-by: fnuesse --- js/app/controllers/menu.js | 12 +++++++++++- sass/menu.scss | 13 +++++-------- templates/main.php | 29 +++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index f2c94bf8..5b692e2e 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -98,7 +98,17 @@ $scope.selectedTags.splice(where, 1); }; - $scope.tagClicked = function (tag) { + $scope.clearForm = function () { + document.getElementById('tagsearch').value=""; + }; + + $scope.tagClickedString = function (tagtext) { + var tag=[]; + tag.text=tagtext; + $scope.tagClicked(tag); + }; + + $scope.tagClicked = function (tag) { //check if tag already selected if(!$scope.tagSelected(tag)){ $scope.selectedTags.push(tag); diff --git a/sass/menu.scss b/sass/menu.scss index 75a75ece..6adc33b7 100644 --- a/sass/menu.scss +++ b/sass/menu.scss @@ -61,12 +61,6 @@ } } -//to remove old entry -#taginput{ - visibility: hidden; - display: none; -} - //Overrides transparent entry bullet on hover from server #app-navigation{ .collapsible:hover .app-navigation-entry-bullet{ @@ -104,9 +98,12 @@ .highlight-selected{ background-color: var(--color-primary); } + + .autocomplete{ + position: relative; + } + a.taginput{ - visibility: hidden; - display: none; opacity: 1; } a{ diff --git a/templates/main.php b/templates/main.php index f39551b9..0b816cb5 100644 --- a/templates/main.php +++ b/templates/main.php @@ -126,13 +126,7 @@ style('passman', 'app');
    +
    + + +
    +
    From c0aef3aebf652281c7aea2d52933dd0e966b86ee Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 5 Nov 2018 00:00:30 +0100 Subject: [PATCH 076/119] Fixed animation on settingsmenu Signed-off-by: fnuesse --- sass/app.scss | 17 +++++++++-------- templates/main.php | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index 630559cf..e81686f6 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -32,17 +32,18 @@ @import 'share_credential'; @import 'settings'; -#app-settings-content:not(.ng-hide) { + + + +.hide-animation { display: inherit !important; - padding: 0; - transition: height 0.15s ease-out; + transition: ease-in-out .5s; } -#app-settings-content.ng-hide{ - //display: inherit !important; - height: 0; - padding: 0; - transition: height 0.15s ease-in; +.hide-animation.ng-hide { + opacity: 0; } + + .ui-dialog{ z-index: 9999; } diff --git a/templates/main.php b/templates/main.php index 02b2f838..37f79d31 100644 --- a/templates/main.php +++ b/templates/main.php @@ -199,7 +199,7 @@ style('passman', 'app'); >{{ 'settings' | translate }}
    -
    +
    From 4214dba9a1a0013ba6b6b0327a47adedc5004baf Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 5 Nov 2018 00:04:15 +0100 Subject: [PATCH 077/119] reduced animation time Signed-off-by: fnuesse --- sass/app.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/app.scss b/sass/app.scss index e81686f6..eea0693d 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -37,7 +37,7 @@ .hide-animation { display: inherit !important; - transition: ease-in-out .5s; + transition: ease-in-out .15s; } .hide-animation.ng-hide { opacity: 0; From 82520e9153cd2230d08f7f4f3ca7c43116248e3d Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 6 Nov 2018 21:46:36 +0100 Subject: [PATCH 078/119] renamed navigationbar-switcher Signed-off-by: fnuesse --- templates/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main.php b/templates/main.php index 37f79d31..44620594 100644 --- a/templates/main.php +++ b/templates/main.php @@ -203,7 +203,7 @@ style('passman', 'app');
    - +
    From 93d6f1a7e8e903d09e287ffb662a4b1f1d7625b2 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Tue, 6 Nov 2018 21:47:33 +0100 Subject: [PATCH 079/119] renamed tagfilter-title Signed-off-by: fnuesse --- templates/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main.php b/templates/main.php index 44620594..1218cc8e 100644 --- a/templates/main.php +++ b/templates/main.php @@ -177,7 +177,7 @@ style('passman', 'app');
    From 25683cad0f6204289368279b83edac283e27868c Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 7 Nov 2018 09:36:50 +0100 Subject: [PATCH 083/119] fixed overlapping homebutton and burgermenu in mobile view Signed-off-by: fnuesse --- sass/app.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sass/app.scss b/sass/app.scss index eea0693d..8d224bcf 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -59,6 +59,11 @@ margin-top: 5px; } +//moves the burgermenu down to level it with passman-controls +#app-navigation-toggle{ + padding-top: 50px; +} + #passman-controls { box-sizing: border-box; position: fixed; @@ -76,6 +81,12 @@ user-select: none; height: 44px !important; + .breadcrumb{ + //Move Homeicon to the right to prevent overlap with burgermenu + @media only screen and (max-width: 769px) { + padding-left: 15px; + } + } } @media only screen and (max-width: 768px){ #passman-controls{ From bc38f810e56df2e411ad916eefd45aab40bb423b Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 7 Nov 2018 09:39:03 +0100 Subject: [PATCH 084/119] set the max nextcloud version to endless, removed owncloud version Signed-off-by: fnuesse --- appinfo/info.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 53235901..3c42610b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -42,8 +42,7 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) pgsql mysql openssl - - + From a0071cf83594541e03deec706f600bfa87bae692 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 7 Nov 2018 10:54:32 +0100 Subject: [PATCH 085/119] moved burgermenu back up to fix offset Signed-off-by: fnuesse --- sass/app.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index 8d224bcf..89d8df85 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -59,11 +59,6 @@ margin-top: 5px; } -//moves the burgermenu down to level it with passman-controls -#app-navigation-toggle{ - padding-top: 50px; -} - #passman-controls { box-sizing: border-box; position: fixed; From c27745d08d22853c600d1a96f8f65e82525084b3 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 12 Nov 2018 17:30:31 +0100 Subject: [PATCH 086/119] fixed jumping passman-control on mobileview Signed-off-by: fnuesse --- sass/app.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index 89d8df85..8510dd2a 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -56,18 +56,16 @@ #app-content #app-content-wrapper #passman-controls { border-bottom: 1px solid #c9c9c9; - margin-top: 5px; } #passman-controls { box-sizing: border-box; position: fixed; - top: 45px; + margin: -45px 0 0; right: 0; left: 0; border-bottom: 1px solid #c9c9c9; padding: 0 !important; - margin: 0; background-color: rgba(255, 255, 255, .95); z-index: 50; -webkit-user-select: none; From 80b7f6694b3985da62f1c8ca74406d3c0cf43a92 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Mon, 12 Nov 2018 18:18:50 +0100 Subject: [PATCH 087/119] fixed many smaller ui-bugs like offsets and missalignments Signed-off-by: fnuesse --- sass/app.scss | 3 +++ sass/credentials.scss | 26 ++++++++++++++----- sass/partials/pwgen.scss | 2 +- .../views/partials/forms/settings/import.html | 8 +++--- .../forms/settings/password_settings.html | 2 +- templates/views/show_vault.html | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index 8510dd2a..efaeb52d 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -79,6 +79,9 @@ @media only screen and (max-width: 769px) { padding-left: 15px; } + .addCredential{ + padding-top: 1px; + } } } @media only screen and (max-width: 768px){ diff --git a/sass/credentials.scss b/sass/credentials.scss index 7c4a3d27..9b4e85f8 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -381,6 +381,9 @@ float: left; } } + .password-settings-padding-left-fix{ + padding-left: 0 !important; + } } .field-value { .valueInput { @@ -394,7 +397,7 @@ } .selectType { padding-left: 0; - margin-left: -4px; + margin-left: 0px; select { @include border-left-radius(0); } @@ -454,6 +457,13 @@ .otpText { padding-right: 10px; } + + .import-selection{ + select{ + margin-left: 15px; + } + } + } .main_list{ @@ -634,7 +644,7 @@ .icon-label { overflow: hidden; input { - width: calc(100% - 45px) !important; + width: calc(100% - 28px) !important; float: left; background: #fff; color: #555; @@ -643,17 +653,19 @@ border: 1px solid #ddd; outline: none; border-radius: 3px; - margin: 3px 3px 3px 0; + margin: 3px 0 3px 0; padding: 7px 6px 5px; font-size: 13px; @include border-left-radius(0) } .icon-picker { - //position: relative; - //@include border-left-radius(3px); + position: relative; + @include border-left-radius(3px); + line-height: 25px; float: left; - margin-top: 3px; - padding-top: 7px; + transform:translateY(105%); + margin: 3px 0; + padding: 6px 0; .cell { //min-height: 44px; margin-top: 0px; diff --git a/sass/partials/pwgen.scss b/sass/partials/pwgen.scss index a94a1a92..db593ae2 100644 --- a/sass/partials/pwgen.scss +++ b/sass/partials/pwgen.scss @@ -23,7 +23,7 @@ .pw-gen{ overflow:hidden; input{ - width: calc(100% - 80px) !important; + width: calc(100% - 76px) !important; float: left; background: #fff; color: #555; diff --git a/templates/views/partials/forms/settings/import.html b/templates/views/partials/forms/settings/import.html index 97c01169..74007afa 100644 --- a/templates/views/partials/forms/settings/import.html +++ b/templates/views/partials/forms/settings/import.html @@ -8,16 +8,16 @@
    -