jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Jonathan White
2017-04-09 10:28:15 -04:00
parent 047fe9a422 cb283bb95a
commit 3de4395d5e
15 changed files with 3896 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/AccessControlDialog.cpp
View File

@@ -19,6 +19,8 @@ AccessControlDialog::AccessControlDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::AccessControlDialog())
{
this->setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
ui->setupUi(this);
connect(ui->allowButton, SIGNAL(clicked()), this, SLOT(accept()));
connect(ui->denyButton, SIGNAL(clicked()), this, SLOT(reject()));

2
src/http/Protocol.cpp
View File

@@ -28,7 +28,7 @@ static const char * const STR_SET_LOGIN = "set-login";
static const char * const STR_ASSOCIATE = "associate";
static const char * const STR_TEST_ASSOCIATE = "test-associate";
static const char * const STR_GENERATE_PASSWORD = "generate-password";
static const char * const STR_VERSION = "1.8.4.1";
static const char * const STR_VERSION = "1.8.4.2";
}/*namespace KeepassHttpProtocol*/