Merge branch 'master' into develop

Conflicts:
	release-notes.md
This commit is contained in:
antelle 2016-07-17 15:56:01 +03:00
commit 43b627674e
No known key found for this signature in database
GPG Key ID: 26C38FADD3BDF3CA
5 changed files with 14 additions and 13 deletions

View File

@ -107,12 +107,12 @@
{{#if minimizeOnClose}}checked{{/if}} />
<label for="settings__general-minimize">{{res 'setGenMinInstead'}}</label>
</div>
{{/if}}
<div>
<input type="checkbox" class="settings__input input-base settings__general-lock-on-minimize" id="settings__general-lock-on-minimize"
{{#if lockOnMinimize}}checked{{/if}} />
{{#if lockOnMinimize}}checked{{/if}} />
<label for="settings__general-lock-on-minimize">{{res 'setGenLockMinimize'}}</label>
</div>
{{/if}}
<div>
<input type="checkbox" class="settings__input input-base settings__general-lock-on-copy" id="settings__general-lock-on-copy"
{{#if lockOnCopy}}checked{{/if}} />

View File

@ -25,7 +25,7 @@
"backbone": "1.3.3",
"baron": "2.2.2",
"bourbon": "4.2.7",
"dropbox": "keeweb/dropbox-js#0.10.8",
"dropbox": "keeweb/dropbox-js#3364af7617ea5c0edac94034e658375968759b06",
"font-awesome": "4.6.3",
"kdbxweb": "0.4.1",
"normalize.css": "4.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.2.2",
"version": "1.2.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.2.2",
"version": "1.2.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"homepage": "https://keeweb.info",

View File

@ -4,6 +4,11 @@ Release notes
##### v1.3.0 (TBD)
`+` solarized themes
##### v1.2.3 (2016-07-17)
`+` option to skip lock on minimize under mac
`-` fix dropbox popup error
`-` fix auto-type input
##### v1.2.2 (2016-07-14)
`-` fix special keys auto-type in linux
@ -41,16 +46,14 @@ Auto-type, ui improvements
`-` fix generator preset for empty passwords
`+` export settings get/set interface
##### v1.1.2 (2016-04-10)
Hotfix
##### v1.1.2 (2016-04-10)
`+` option to try beta version in desktop app
`-` fix notes field text color
`-` fix some console assertions
`-` fix message about not found files
`-` fix deletion to trash when there's no trash folder
##### v1.1.1 (2016-04-07)
Hotfix
##### v1.1.1 (2016-04-07)
`+` minimize app on linux
`+` display remembered keyfile name
`-` fix #182: save window position on Windows
@ -92,15 +95,13 @@ Storage providers, one-time passwords, usability improvements
Workaround for Chrome bug
`-` #110: fix font rendering in Chrome
##### v1.0.3 (2016-02-23)
Hotfix
##### v1.0.3 (2016-02-23)
`+` #94: warn user about local files
`-` #92: save files on exit
`-` #95: unlock by opening settings
`-` fix crash on arch linux startup
##### v1.0.2 (2016-02-17)
Hotfix
##### v1.0.2 (2016-02-17)
`-` #80: dragdrop bug
##### v1.0.1 (2016-02-14)