1
0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-27 07:45:08 +02:00
Commit Graph

1861 Commits

Author SHA1 Message Date
antelle
fa1a16f140
added an explanation about auto-type issues on macOS 2021-02-04 20:54:13 +01:00
antelle
08d49ddc54
fix #679, fix #1383: Touch ID on macOS 2021-02-03 20:30:59 +01:00
antelle
4cdc80e530
Touch ID settings, see #679 2021-02-01 22:24:53 +01:00
antelle
acd360efb9
cleaned up old touch id implementation 2021-02-01 21:08:02 +01:00
antelle
c2663ca7d8
new completion page after storage provider authentication 2021-01-31 13:24:49 +01:00
antelle
50c43c4408
year 2021-01-30 23:41:32 +01:00
antelle
73eccd5308
added a message about delay 2021-01-30 21:37:09 +01:00
antelle
4449677e36
entering text as key codes 2021-01-30 21:34:08 +01:00
antelle
8dc3a4b51f
fixed vkey 2021-01-30 20:29:26 +01:00
antelle
cd2de3a1db
native auto type: unpressing keys 2021-01-30 20:22:13 +01:00
antelle
1fa0eebc3b
changed ipc method naming convention 2021-01-30 18:39:25 +01:00
antelle
e13002bab3
typing key codes 2021-01-30 18:24:42 +01:00
antelle
a750e80ea1
auto-type progress 2021-01-30 16:00:57 +01:00
antelle
66e1b0a089
first auto-type emitter implementation 2021-01-30 15:37:25 +01:00
antelle
00c0b3f88c
native auto-type helper implementation 2021-01-30 14:55:00 +01:00
antelle
674311cb4b
native auto-type methods 2021-01-30 14:16:32 +01:00
antelle
7123345341
cleaned up useless conditions 2021-01-28 08:08:11 +01:00
antelle
6ef5ae2517
separated encrypt and decrypt 2021-01-10 16:56:53 +01:00
antelle
9701496897
better message 2021-01-10 16:40:16 +01:00
antelle
22d6a3011f
added a string for touch id 2021-01-10 16:31:50 +01:00
antelle
d22ddd99f6
secure enclave support for #679 2021-01-10 14:31:33 +01:00
antelle
fddf62409a
fixed updater settings view 2021-01-09 23:04:22 +01:00
antelle
e092caa2ef
better syntax 2021-01-09 18:48:48 +01:00
antelle
feb44be9d0
disable updater on Linux 2021-01-09 18:00:19 +01:00
antelle
a43a2e8ce2
checking minVersion against app version 2021-01-09 17:53:13 +01:00
antelle
8ee63ccc24
always using updater cache 2021-01-09 13:21:37 +01:00
antelle
b8ce1b5cc1
macos installer 2021-01-09 11:44:13 +01:00
antelle
75fa636366
disabled desktop update archives 2021-01-08 22:54:45 +01:00
antelle
bee96ebf15
reading update.json 2021-01-07 23:00:16 +01:00
antelle
2a7cd3574d
update.json 2021-01-07 22:05:04 +01:00
antelle
a9c2da3fdb
Merge branch 'master' into develop
# Conflicts:
#	release-notes.md
2021-01-07 20:01:20 +01:00
antelle
2ec37c3ece
fixed a js error 2021-01-02 10:40:24 +01:00
antelle
143b1a73f7
fix #1671: new lines removal issue in notes 2020-12-31 17:24:59 +01:00
antelle
fb56ba2f0d
Merge branch 'master' into develop
# Conflicts:
#	release-notes.md
2020-12-30 13:01:12 +01:00
antelle
abf5531fc5
fixed another virustotal check failure 2020-12-30 12:52:48 +01:00
antelle
18775e3cea
fixed virustotal check failure 2020-12-30 12:44:48 +01:00
antelle
072271bbe6
languages 2020-12-30 11:34:06 +01:00
antelle
c06db5a2b7
fix #1668: replacing more bad characters in entry fields 2020-12-30 11:30:17 +01:00
antelle
953f6dc61f
option to disable entropy-based checks 2020-12-20 17:53:43 +01:00
antelle
01fac1f0ca
password quality warnings 2020-12-20 17:44:27 +01:00
antelle
1796ac743d
fixed dropdown 2020-12-19 17:33:19 +01:00
antelle
f489eca5c2
fix #1505: pre-selecting first field in auto-type dropdown 2020-12-19 16:47:37 +01:00
antelle
1617cae518
fixed app startup background color 2020-12-19 16:39:18 +01:00
antelle
6c7b99af58
fix #1655: separated custom icons to make the download and selection buttons more visible 2020-12-19 16:30:03 +01:00
antelle
ddd242b9df
fix #1655: selecting downloaded favicon automatically 2020-12-19 16:29:19 +01:00
antelle
c24fe2806c
contrast theme position 2020-12-19 14:05:56 +01:00
antelle
8da0a2e239
more themes 2020-12-19 14:00:51 +01:00
antelle
8aff64ce47
removed an extra border on the open view 2020-12-19 14:00:42 +01:00
antelle
677f1ce75f
fix #1584: automatically switching between dark and light theme 2020-12-19 12:14:32 +01:00
antelle
f99ff95a57
Merge branch 'master' into develop
# Conflicts:
#	release-notes.md
2020-12-18 20:32:44 +01:00
antelle
cabf0d388d
using custom OneDrive without a secret 2020-12-18 20:17:34 +01:00
antelle
f184915849
fix #1657: clear searchbox button 2020-12-17 22:22:00 +01:00
antelle
b4b6ef3206
calling oauth authorize again if the refresh token is expired 2020-12-17 19:25:36 +01:00
antelle
9f2a09cc97
optional oauth secret 2020-12-16 20:32:48 +01:00
antelle
251b763ea9
fix #1656: false positive report on VirusTotal 2020-12-16 18:53:15 +01:00
antelle
0b70017780
fix #1650: keyfiles stored in the app can't be used 2020-12-10 20:33:48 +01:00
antelle
220a27e030
keyx 2020-12-10 19:10:18 +01:00
antelle
6d41c71542
up 2020-12-10 19:07:54 +01:00
antelle
677586e882
fix #1649: missing Argon2 options 2020-12-10 17:41:59 +01:00
antelle
3177a87690
possibility to use V2 keyfiles (.keyx) 2020-12-09 19:21:18 +01:00
antelle
7e36418276
fixed a js error in closing all files 2020-12-05 15:24:45 +01:00
antelle
e5616dffa7
more precise license wording 2020-12-04 21:01:08 +01:00
antelle
a3e27709d0
fixed local file icon 2020-12-04 16:48:48 +01:00
antelle
8a1b28a793
up 2020-12-04 16:05:45 +01:00
antelle
893a0f43c1
release date 2020-12-04 08:55:22 +01:00
antelle
bbd7f9c6d6
keyfile paths are saved by default, see #325 2020-12-03 21:09:51 +01:00
antelle
9e5fb90bd6
Argon2id KDF support 2020-12-03 20:22:33 +01:00
antelle
00be6f0181
fixed default theme 2020-12-01 19:53:18 +01:00
antelle
42267eaef8
languages 2020-11-29 15:05:15 +01:00
antelle
bdd9a51d25
style fixes 2020-11-29 13:12:32 +01:00
antelle
f7e9f725b0
bugfixes 2020-11-29 11:10:34 +01:00
antelle
a31f9d5a50
new themes 2020-11-28 23:38:12 +01:00
antelle
8e0dc326cb
better theme selector 2020-11-27 21:17:27 +01:00
antelle
9994c87446
default locale in settings 2020-11-27 20:21:24 +01:00
antelle
647ce573b0
set the default language to en-US to reflect what it is 2020-11-27 18:47:55 +01:00
antelle
f4f2ddfb3c
fix 2020-11-27 18:38:11 +01:00
antelle
22754f32ec
revert 2020-11-26 23:33:37 +01:00
Giuseppe
0a9846b86f Fix: wrong argument passed 2020-11-26 21:41:24 +01:00
Giuseppe
96ee17b8cc Moved date-format.js to comp/util/ 2020-11-26 21:19:36 +01:00
Giuseppe
32b871e338 Forgot to remove useless import 2020-11-26 11:45:47 +01:00
Giuseppe
46ddb725db Initial commit 2020-11-26 11:32:10 +01:00
antelle
8dd7a97769
removed a comment 2020-11-25 21:51:32 +01:00
antelle
f70dfaaa28
icons adjustment 2020-11-25 21:40:54 +01:00
antelle
01ceb6dc37
replaced an icon 2020-11-25 21:07:07 +01:00
antelle
0b2c722f61
replaced some icons 2020-11-25 20:10:37 +01:00
antelle
63b7b32e9c
fontawesome 5 2020-11-25 18:20:53 +01:00
antelle
d0b33ca0c1
fix #1523: support for WebDAV servers without Last-Modified header 2020-11-20 14:08:13 +01:00
antelle
bb44c7cb3e
fixed some that=this 2020-11-20 13:12:06 +01:00
antelle
31390eac80
fix #1555: auto-saving files when minimize options is enabled 2020-11-19 23:37:09 +01:00
antelle
543a71f6f2
up deps 2020-11-19 18:43:50 +01:00
antelle
207ff77778
fix #1599: switched to Dropbox short-lived access tokens 2020-11-19 16:05:08 +01:00
antelle
b85d25614b
fix #1616: auto-type with no matching entries 2020-11-19 13:00:56 +01:00
antelle
d1bcdca0d3
fix #1619: auto-locking ignored a field being edited 2020-11-19 11:21:45 +01:00
antelle
49d46cfedc
fixed YubiKey errors display 2020-11-11 23:08:08 +01:00
antelle
9c18e2877b
fix #1589: shortcut to copy OTP 2020-11-11 19:01:12 +01:00
antelle
a1da5ceabe
fix #1608: improved the "Show all file" checkbox behavior 2020-11-11 18:44:57 +01:00
antelle
759b92bfd6
fixed a performance issue in searching entries 2020-11-10 23:19:26 +01:00
antelle
b4f3d19259
Merge branch 'master' into develop 2020-11-09 21:35:57 +01:00
antelle
ad978d2ed3
fix #1612: added WebCrypto check back 2020-10-02 18:07:46 +02:00
antelle
067d3778d8
PKCE enabled on Dropbox 2020-09-12 12:04:16 +02:00
antelle
daa250e8fa
fix 1597: dropbox 2020-09-12 12:03:20 +02:00
antelle
ecaf9a37da
prettier 2020-09-09 21:42:37 +02:00
Matthias Johnson
6e30687919 use windowactivate via xdotool 2020-09-08 12:31:33 -06:00
antelle
dbf212f0df
Merge branch 'master' into develop
# Conflicts:
#	release-notes.md
2020-08-08 14:29:11 +02:00
antelle
855370074f
fix #1553: empty fields display for templates 2020-08-08 14:11:12 +02:00
antelle
0e3d01ade6
always using native argon2 in desktop 2020-06-21 13:02:06 +02:00
antelle
af8d94d102
fix #1535: network errors in Dropbox and GDrive on Windows 2020-06-11 19:48:30 +02:00
antelle
22776e9088
fix #1409: auto-type wrong character issues on Linux 2020-06-09 20:39:09 +02:00
antelle
d23d393c39
- fixed duplicated YubiKeys displayed in file settings 2020-06-09 19:50:35 +02:00
antelle
fe245dc95e
fix #1528: OTP generation for stored values 2020-06-07 09:47:36 +02:00
antelle
5c5fc0271e
languages 2020-06-06 16:43:13 +02:00
antelle
082c6bee93
moved native modules to a native module host 2020-06-06 13:30:35 +02:00
antelle
c1d354a6fb
added an error when usb is disabled 2020-06-05 20:37:13 +02:00
antelle
eab683ec71
removed all mentions of cordova
It never got enough love by contributors and it seems to be abandoned. Better to
implement this API in a separate repo.
2020-06-05 16:45:37 +02:00
antelle
cd2b87b317
fixed refreshing the yubikey status 2020-06-05 16:41:54 +02:00
antelle
4abe63c00f
fixed ykman path on macos 2020-06-05 16:41:38 +02:00
antelle
7e4e61e005
fixed ykman path on macos 2020-06-04 21:33:42 +02:00
antelle
33bdf124c2
up languages 2020-06-03 21:27:17 +02:00
antelle
d258bce037
de 2020-06-03 11:31:40 +02:00
antelle
56c8649040
up yk-api 2020-06-02 12:23:22 +02:00
antelle
9988454af1
fixed app exit while the app is not ready 2020-06-01 16:59:32 +02:00
antelle
e0b65bbebf
up modules; prettier 2020-06-01 16:53:51 +02:00
antelle
2deb241ff2
fix #830: minimize instead of close option on macOS 2020-06-01 14:42:06 +02:00
antelle
a2194435e6
fix #1460: auto-type on double-clicking field labels 2020-06-01 10:25:16 +02:00
antelle
448e173f7e
added a warning about Input Monitoring for mac 2020-06-01 07:30:00 +02:00
antelle
4b52280549
fixed sticky tips 2020-05-31 23:31:14 +02:00
antelle
9e09f7b7e7
fixed double yubikey alert when opening files from storages 2020-05-31 22:28:38 +02:00
antelle
176553a674
fixed challenge-response calculation with padding 2020-05-31 16:35:36 +02:00
antelle
fb6bcdf5c9
added a possibility to refresh the list of yubikeys 2020-05-31 14:23:37 +02:00
antelle
776c75d823
grammar 2020-05-31 14:13:32 +02:00
antelle
143f7c6a7a
yubikey enrollment 2020-05-31 14:13:08 +02:00
antelle
b520c58ef4
cancelChalResp 2020-05-31 13:06:36 +02:00
antelle
3c47adbf32
fixed argon2 in browsers 2020-05-31 13:03:59 +02:00
antelle
a08e3c7d27
option to remember challenge-response codes 2020-05-31 10:15:27 +02:00
antelle
d9258745d0
fixed file saving errors 2020-05-30 23:28:33 +02:00
antelle
ab3860cdc9
fixed errors during auto-save 2020-05-30 17:40:18 +02:00
antelle
9185ef9a55
showing main window for yubikey alerts 2020-05-30 17:12:48 +02:00
antelle
e6826b176e
yubikey ui alerts 2020-05-30 16:02:02 +02:00
antelle
f5bb29e61a
fixed open args 2020-05-30 14:28:06 +02:00
antelle
d0d013e046
clearing cache on file close 2020-05-30 12:45:56 +02:00
antelle
51bd80faf4
fixed saved yubikeys 2020-05-30 10:29:02 +02:00
antelle
b4fe0af53a
extracted challenge-response calculator 2020-05-30 08:19:47 +02:00
antelle
2ba9a03e2c
using yubikeys for opening files 2020-05-30 08:10:19 +02:00
antelle
7394754b6f
fixed an error when files were closed during sync 2020-05-30 07:47:52 +02:00
antelle
0f582e3248
refreshing the list of yubikeys on the start screen 2020-05-29 23:24:05 +02:00
antelle
b90e84be42
loading yubikeys using a native module 2020-05-29 23:15:10 +02:00
antelle
b3f021a577
fixed eslint 2020-05-28 18:34:32 +02:00
antelle
96263c11ec
escaping more characters in xml, see #1520 2020-05-28 10:54:52 +02:00
antelle
b2a6e1180c
reverted renderer process native modules, it crashes 2020-05-28 10:48:09 +02:00
antelle
817b44b152
fixed an error during loading the list of yubikeys 2020-05-26 23:26:26 +02:00
antelle
701bb4caa4
loading compatible modules in renderer process 2020-05-26 23:24:00 +02:00
antelle
8c386dbe57
challenge-response calculation function 2020-05-24 21:06:53 +02:00
antelle
d8e49d993a
added a text about used yubikey 2020-05-24 20:31:03 +02:00
antelle
93310eb029
listing YubiKeys on the open view 2020-05-24 20:02:49 +02:00
antelle
f215c26a63
removed plugin cache invalidation with timestamps 2020-05-24 19:07:01 +02:00
antelle
b5fddeb627
added a missing check 2020-05-24 18:42:14 +02:00
antelle
81d4c5c403
extracted YubiKey module 2020-05-24 18:39:56 +02:00
antelle
efa9b5f9a7
fixed the yubikey challenge-response icon on the open screen 2020-05-23 19:26:54 +02:00
antelle
1f862a37e9
fixed yubikey icon on the open screen 2020-05-23 19:07:45 +02:00
antelle
aa899b8096
fix #1409: fixed auto-typing Tab character on Debian 2020-05-23 17:07:59 +02:00
antelle
8de55c450a
fixed sticky tooltips in settings 2020-05-22 22:44:50 +02:00
antelle
1fafa68793
restructured settings code a bit 2020-05-22 22:28:12 +02:00
antelle
e69219697a
serializing settings in renderer 2020-05-22 22:17:36 +02:00
Dimitri Witkowski
08a0f6e587
Merge pull request #1514 from b3nj5m1n/add_check_support_windowid
Added check for system supporting window id
2020-05-22 21:48:06 +02:00
b3nj5m1n
7a26d80255
Removed log from debugging 2020-05-22 21:10:52 +02:00
b3nj4m1n
4171848655 Added check for system supporting window id 2020-05-22 21:05:30 +02:00
antelle
b9f37c22d9
config encryption with a key from keychain 2020-05-22 20:46:03 +02:00
antelle
813b26270f
extracted a constant 2020-05-22 12:30:01 +02:00
antelle
b715507dd0
Merge branch 'b3nj5m1n-autotype-tilingwm' into develop 2020-05-22 12:25:11 +02:00
b3nj4m1n
0cb502ca67 Fixed possible error for undefined window id 2020-05-22 12:10:27 +02:00
antelle
e5073eb65f
default theme on macOS 2020-05-22 11:44:49 +02:00
antelle
e9ef1bd698
fixed remote events 2020-05-22 10:44:59 +02:00
antelle
045fe99158
made dropbox secret hidden 2020-05-22 10:15:21 +02:00
antelle
dad95033c0
added a possibility to clear a storage provider field in app settings 2020-05-22 10:14:43 +02:00
b3nj4m1n
02e4d52db6 windowId gets passed in a different place 2020-05-21 21:36:26 +02:00
b3nj4m1n
1f83f34e55 Addressed requested changes 2020-05-21 19:41:19 +02:00
b3nj4m1n
1ffb45433c Fixed auto-type on tiling wm 2020-05-21 17:10:32 +02:00
antelle
b6780dff03
ignored tags for yubikey entries 2020-05-16 10:03:02 +02:00
antelle
5b91dcb272
fix #1440: fixed auto-type for maximized windows 2020-05-15 22:41:39 +02:00
antelle
099f1ca9d0
calling openDevTools from window.webContents 2020-05-15 21:54:34 +02:00
antelle
ad571c1e27
fix eslint 2020-05-15 20:36:59 +02:00
antelle
451b465e4f
disabled markdown in export 2020-05-15 20:17:40 +02:00
antelle
1b279119cb
auto-opening yubikeys with other files 2020-05-14 18:31:26 +02:00
antelle
2075e82381
increased the yubikey reconnect timeout 2020-05-13 22:29:12 +02:00
antelle
9f60ca8ece
fix #1506: replaced incorrectly added client secret config properties 2020-05-13 22:25:33 +02:00
antelle
07e918965b
fix #620: clearing middle-click clipboard in Linux 2020-05-13 21:20:26 +02:00
antelle
7ae64b0552
fixed native argon2 2020-05-13 20:25:45 +02:00
antelle
530316c25f
native modules for all available architectures 2020-05-13 19:15:56 +02:00
antelle
cc750df077
moved native modules to the main process 2020-05-13 17:44:33 +02:00
antelle
3c85694fc2
removed temp paths from profile 2020-05-13 17:03:23 +02:00
antelle
955a1346ff
removed old cookie handling 2020-05-13 16:37:35 +02:00
antelle
cac31d3350
added a yubikey selection icon to the open screen 2020-05-11 19:29:39 +02:00
antelle
bc140b3fb5
auto-opening yubikeys 2020-05-11 18:49:21 +02:00
antelle
5d15411d3d
fixed sequential otp generation 2020-05-11 17:44:18 +02:00
antelle
c6ce694dfe
displaying matching otp codes in entries 2020-05-11 17:24:06 +02:00
antelle
16d303d966
fixed password field after idle period 2020-05-10 19:44:29 +02:00
antelle
5125a44170
added enter to the default totp command 2020-05-10 11:42:13 +02:00
antelle
db31e65cdf
fixed entry creation on a yubikey 2020-05-09 23:55:57 +02:00
antelle
3cd9bf6505
html => empty 2020-05-09 20:15:46 +02:00
antelle
3b05f6267e
escaping fields autocomplete 2020-05-09 17:00:39 +02:00
antelle
3e5b0bff4f
renamed content to contentHtml 2020-05-09 16:39:04 +02:00
antelle
c9cb15d7b7
removed shortcuts formatting 2020-05-09 16:35:11 +02:00
antelle
154c780281
disabled markdown in export 2020-05-09 15:25:11 +02:00
antelle
101e8eaa24
fixed sort options 2020-05-09 10:59:23 +02:00
antelle
6a31bba69c
using optional chaining 2020-05-09 10:45:12 +02:00
antelle
96ee68dee7
fixed yubikey totp auto-type 2020-05-09 10:37:34 +02:00
antelle
5a94c81b11
fixed yubikey username auto-type 2020-05-09 08:57:57 +02:00
antelle
cf8aa6f9a4
copying otp from yubikeys 2020-05-08 23:33:57 +02:00
antelle
20e201795e
options for yubikey username field 2020-05-08 23:16:13 +02:00
antelle
e95902d2bb
wording: one-time codes 2020-05-08 23:15:38 +02:00
antelle
c08a0eb8d1
fixed the details view 2020-05-07 23:10:35 +02:00
antelle
a280258d4f
cleaned up openProcess 2020-05-07 23:10:23 +02:00
antelle
7985a7a522
added a better message when a yubikey is stuck 2020-05-07 22:07:58 +02:00
antelle
6ba2e16a91
fixed yubikey reconnection 2020-05-07 21:22:34 +02:00
antelle
f34ebe2fd3
code cleanup 2020-05-07 19:00:18 +02:00
antelle
ab3d4a056f
fixed the yubikey workaround 2020-05-07 18:58:17 +02:00
antelle
c88a7c000b
extracted a method 2020-05-06 23:12:49 +02:00
antelle
53b700aa70
fixed yubikey serial detection 2020-05-06 23:06:22 +02:00
antelle
66c219f6d1
locale 2020-05-06 21:08:37 +02:00
antelle
06dd153955
fixed stuck yubikeys 2020-05-06 21:06:19 +02:00
antelle
88a0e63894
disabled auto-open by default 2020-05-06 19:49:21 +02:00
antelle
cac7e53ea8
fixed work with several yubikeys 2020-05-06 19:30:30 +02:00
antelle
3e390388eb
removed a workaround for Edge 2020-05-06 18:44:00 +02:00
antelle
2a1b01c0aa
displaying last open file after detaching a yubikey 2020-05-06 18:43:04 +02:00
antelle
5a535bb07a
Added a yubikey workaround 2020-05-06 18:37:37 +02:00
antelle
235ceae228
restarting the yubikey application if it's stuck 2020-05-05 22:36:23 +02:00
antelle
46710aead4
watching yubikeys 2020-05-05 21:26:41 +02:00
antelle
770c25a273
fixed open files 2020-05-05 20:57:26 +02:00
antelle
c935de3ec1
message 2020-05-05 20:51:01 +02:00
antelle
8350123839
devices 2020-05-05 20:50:11 +02:00
antelle
02adb81ae0
settings 2020-05-05 20:47:15 +02:00
antelle
cf26427e68
fix otp cancel 2020-05-05 20:14:32 +02:00
antelle
6e357e93ec
props 2020-05-05 20:03:38 +02:00
antelle
1c8f3932fb
search fix 2020-05-05 18:11:58 +02:00
antelle
75671a0a8a
canUseNativeModules 2020-05-05 18:01:16 +02:00
antelle
58296dd896
disabled yubikey on win32 2020-05-05 17:57:01 +02:00
antelle
2fff34dc61
grammar 2020-05-05 17:49:19 +02:00
antelle
851ade7e24
fixed drag 2020-05-05 17:46:07 +02:00
antelle
13585f5317
splitted detail fields 2020-05-05 17:28:20 +02:00
antelle
5d0ab36f2c
fixed details 2020-05-05 17:05:20 +02:00
antelle
be46cf9a25
lint fix 2020-05-05 16:37:25 +02:00
antelle
ffdc438091
removed app-model prepare 2020-05-05 16:34:39 +02:00
antelle
52741cf46a
search tests 2020-05-05 16:23:17 +02:00
antelle
9263caed59
search 2020-05-05 15:08:19 +02:00
antelle
aa5a9fc6d2
Merge branch 'master' into usb
# Conflicts:
#	app/scripts/app.js
#	package.json
#	release-notes.md
2020-05-04 19:46:07 +02:00
antelle
ec292705b3
distinct redirect URIs for storage providers 2020-05-04 19:06:05 +02:00
antelle
32c171d05b
Merge branch 'develop' into usb 2020-05-02 14:05:47 +02:00
antelle
f031be4ce2
Merge branch 'master' into develop
# Conflicts:
#	app/scripts/storage/storage-base.js
#	release-notes.md
2020-05-02 14:04:53 +02:00
antelle
b44d060fac
languages 2020-05-02 13:29:05 +02:00
antelle
d140427c94
fix #1478: fixed proxy issues with storage providers 2020-04-30 17:59:22 +02:00