mirror of https://github.com/keeweb/keeweb.git
Merge branch 'master' into develop
This commit is contained in:
commit
8df70602c0
|
@ -2,11 +2,11 @@
|
|||
|
||||
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: # Replace with a single Open Collective username
|
||||
open_collective: keeweb
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: # Replace with a single Liberapay username
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
otechie: # Replace with a single Otechie username
|
||||
custom: https://www.paypal.me/dvitkovsky
|
||||
custom: # for example PayPal links
|
||||
|
|
|
@ -12,6 +12,7 @@ Timeline: [Release Notes](release-notes.md), [TODO](https://github.com/keeweb/ke
|
|||
On one page: [Features](https://keeweb.info/#features), [FAQ](https://github.com/keeweb/keeweb/wiki/FAQ)
|
||||
Website: [keeweb.info](https://keeweb.info)
|
||||
Twitter: [kee_web](https://twitter.com/kee_web)
|
||||
Donate: [OpenCollective](https://opencollective.com/keeweb#support)
|
||||
|
||||
# Status
|
||||
|
||||
|
@ -81,7 +82,7 @@ Also you can help by [translating KeeWeb](https://keeweb.oneskyapp.com) to your
|
|||
|
||||
KeeWeb is not free to develop. It takes time, requires paid code signing certificates and domains.
|
||||
You can help the project or say "thank you" with this button:
|
||||
[<img src="img/paypal-donate.png" alt="Donate with PayPal" width="100">](https://www.paypal.me/dvitkovsky)
|
||||
[<img src="https://opencollective.com/keeweb/tiers/backer.svg?avatarHeight=50" alt="OpenCollective">](https://opencollective.com/keeweb#support)
|
||||
|
||||
Please note: donation does not imply any type of service contract.
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ const Links = {
|
|||
Manifest: 'https://app.keeweb.info/manifest.appcache',
|
||||
AutoType: 'https://github.com/keeweb/keeweb/wiki/Auto-Type',
|
||||
Translation: 'https://keeweb.oneskyapp.com/',
|
||||
Donation: 'https://www.paypal.me/dvitkovsky',
|
||||
Donation: 'https://opencollective.com/keeweb#support',
|
||||
Plugins: 'https://plugins.keeweb.info',
|
||||
PluginDevelopStart: 'https://github.com/keeweb/keeweb/wiki/Plugins'
|
||||
};
|
||||
|
|
|
@ -179,37 +179,6 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
&__donate-btn {
|
||||
margin-bottom: $base-padding-h;
|
||||
background: #ffae32;
|
||||
display: inline-block;
|
||||
padding: 2px 20px;
|
||||
text-decoration: none;
|
||||
color: #043667;
|
||||
font-family: sans-serif;
|
||||
font-size: 16px;
|
||||
line-height: 20px;
|
||||
font-style: italic;
|
||||
font-weight: 900;
|
||||
border-radius: 26px;
|
||||
border: 1px solid #ffb163;
|
||||
outline: none;
|
||||
background: linear-gradient(to bottom, #fee1aa, #fee1aa 80%, #ffeed5);
|
||||
box-shadow: 0 -3px 2px 2px rgba(255, 238, 213, 0.3) inset, 0 -11px 1px 0px #ffb33c inset;
|
||||
&:active,
|
||||
&:hover,
|
||||
&:focus,
|
||||
&:visited {
|
||||
border-color: #ffb163;
|
||||
color: #043667;
|
||||
}
|
||||
&:hover {
|
||||
background: linear-gradient(to bottom, #fed891, #fed891 80%, #ffeed5);
|
||||
}
|
||||
&:active {
|
||||
background: linear-gradient(to bottom, #fed585, #fed585 80%, #ffeed5);
|
||||
}
|
||||
}
|
||||
&__plugins {
|
||||
&-install-error {
|
||||
margin-top: $base-padding-v;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "KeeWeb",
|
||||
"version": "1.9.2",
|
||||
"version": "1.9.3",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "KeeWeb",
|
||||
"version": "1.9.2",
|
||||
"version": "1.9.3",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "main.js",
|
||||
"homepage": "https://keeweb.info",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.9.2",
|
||||
"version": "1.9.3",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -4010,9 +4010,9 @@
|
|||
}
|
||||
},
|
||||
"eslint-utils": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
|
||||
"integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
|
||||
"version": "1.4.2",
|
||||
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
|
||||
"integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
|
||||
"requires": {
|
||||
"eslint-visitor-keys": "^1.0.0"
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.9.2",
|
||||
"version": "1.9.3",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "Gruntfile.js",
|
||||
"private": true,
|
||||
|
|
|
@ -5,6 +5,7 @@ Release notes
|
|||
`+` xml files can be now opened as regular files
|
||||
`-` fix #1154: relative Destination header in WebDAV MOVE
|
||||
`-` fix #1129: webdav storage error on Unicode filenames
|
||||
`*` donation link changed
|
||||
|
||||
##### v1.9.3 (2019-09-07)
|
||||
`-` fixed group settings not being displayed
|
||||
|
|
Loading…
Reference in New Issue