Commit Graph

3677 Commits

Author SHA1 Message Date
Sebastian Stenzel
0c47af2f15
Merge pull request #1935 from cryptomator/feature/lock-retry-loop
Handle exception when force-locking
2021-11-17 16:00:41 +01:00
Sebastian Stenzel
5a735191a4
adjust heading
(as it applies to both graceful and forced lock attempts)
2021-11-17 14:05:42 +01:00
Sebastian Stenzel
21d342d117
Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel
1b43bf395f
apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Sebastian Stenzel
71a575e079 add build scripts for windows
[ci skip]
2021-11-10 16:08:11 +01:00
Sebastian Stenzel
c5b6d8f81f
target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
Tobias Hagemann
0c6ecef92b
Update README.md
[ci skip]
2021-11-10 08:51:50 +01:00
Tobias Hagemann
b565a5a3f4
added dmg step to mac build script
[ci skip]
2021-11-09 15:49:25 +01:00
Armin Schrenk
ce9e1184ec
bump cryptofs dependency 2021-11-09 12:39:45 +01:00
Armin Schrenk
c1c5367e2a
closes #1891 2021-11-03 11:54:24 +01:00
Sebastian Stenzel
55a0fe97d8
Merge branch 'main' into develop
[ci skip]
2021-11-03 09:01:45 +01:00
Sebastian Stenzel
f7f1afbf7d Merge branch 'release/1.6.3' 2021-11-03 09:01:11 +01:00
Sebastian Stenzel
14395516c5
preparing 1.6.3 2021-11-03 08:59:12 +01:00
Cryptobot
9ef9499506
New Crowdin updates (#1886)
* New translations strings.properties
[ci skip]
2021-11-03 08:58:04 +01:00
Sebastian Stenzel
1ca803691b Revert "increase robustness of vault creation:"
This reverts commit f7fdb87d6d.
2021-11-03 08:57:35 +01:00
Cryptobot
27aea6cce9
New Crowdin updates (#1844)
New translations strings.properties

Arabic; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Czech; Dutch; Filipino; French; German; Greek; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Spanish; Swedish; Turkish; Ukrainian; 

[ci skip]
2021-11-02 15:37:46 +01:00
Armin Schrenk
e2ff3f10c1
reset dev branch to SNAPSHOT version 2021-11-02 15:36:09 +01:00
Armin Schrenk
811b538668
Merge tag '1.6.2' into develop
1.6.2
2021-11-02 12:21:57 +01:00
Armin Schrenk
8151cc9714
Merge branch 'release/1.6.2' 2021-11-02 12:21:56 +01:00
Armin Schrenk
fdbaa5b892
prepare 1.6.2 2021-11-02 12:11:48 +01:00
Armin Schrenk
f7fdb87d6d
increase robustness of vault creation:
* clean up after failed vault creation
* ignore if storage readme cannot be created
2021-11-02 11:50:14 +01:00
what-next-github
9408117028
Including pluginDir to linux/appimage/build.sh (#1850) 2021-11-02 10:40:41 +01:00
Armin Schrenk
c6c2133b34
closes #1863 2021-10-29 17:08:03 +02:00
Sebastian Stenzel
7a3205b19c
updated choose file dialog screenshots for Windows #1863 2021-10-29 17:02:24 +02:00
Sebastian Stenzel
8fadd34498
prepared (currently unused) dark mode screenshots for #1863 2021-10-29 16:49:51 +02:00
Sebastian Stenzel
1ffcc8eacb
desaturate irrelevant parts of image 2021-10-29 16:03:10 +02:00
Sebastian Stenzel
dfd4b86b06
Updated "choose file dialog" image
references #1863
2021-10-29 14:22:02 +02:00
Sebastian Stenzel
02a59dd538
support loading @2x images 2021-10-29 14:21:04 +02:00
Sebastian Stenzel
a79e385594
fixes #1866 2021-10-28 08:23:45 +02:00
Tobias Hagemann
a4070f551b
fixes #1404 2021-10-27 11:56:49 +02:00
Sebastian Stenzel
5c98fe4145
fixed accessibility issue 2021-10-25 19:50:39 +02:00
Sebastian Stenzel
9b79e9e69e
fixed second part of error code (#1741) 2021-10-25 19:34:45 +02:00
Bart
520b3a8f08
Remove IPC socket before creation (#1852)
(to make sure that socket path can be created)
2021-10-25 09:47:02 +02:00
Armin Schrenk
28d2262962
on windows allow installations only on windows 10 1803 or newer due to unix socket support 2021-10-22 19:21:10 +02:00
Julian Raufelder
c87b559313
Merge branch 'main' into develop 2021-10-20 13:47:39 +02:00
Julian Raufelder
cea8b7556e
Merge branch 'release/1.6.1' 2021-10-20 13:40:49 +02:00
Julian Raufelder
5dde332b8b
Preparing 1.6.1 2021-10-20 13:39:20 +02:00
Sebastian Stenzel
0980e4776b
fixes #1843 2021-10-20 12:46:37 +02:00
Tobias Hagemann
fd7a6f42f1
added x64 suffix to msi installer name 2021-10-19 22:05:59 +02:00
Armin Schrenk
8bfbfc7700
Update installer workflow to add options introduced in JDK 17 2021-10-19 19:12:53 +02:00
Armin Schrenk
ec72762548
fix windows installer 2021-10-19 18:45:25 +02:00
Sebastian Stenzel
6abe39679e
Merge branch 'master' into develop
[ci skip]
2021-10-19 15:58:51 +02:00
Sebastian Stenzel
1daab1a4f1
Merge branch 'release/1.6.0'
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
2021-10-19 15:57:51 +02:00
Armin Schrenk
39d1a3d5a6
Merge branch 'develop' into release/1.6.0 2021-10-19 15:47:17 +02:00
Tobias Hagemann
a6b50bde75
Merge pull request #1796 from PBillodeau/fix/linux-build
Relative paths in linux build are incorrect
2021-10-19 13:51:00 +02:00
Armin Schrenk
3f569fe33e
Merge branch 'develop' into release/1.6.0 2021-10-19 13:31:27 +02:00
Armin Schrenk
4801ae3fe3
final dependency bump 2021-10-19 13:31:11 +02:00
Sebastian Stenzel
5f672880b9
Merge branch 'develop' into release/1.6.0 2021-10-19 09:34:24 +02:00
Sebastian Stenzel
6ccbc2b806
update cryptofs 2021-10-18 13:44:15 +02:00
Sebastian Stenzel
3492ddbee1
fixes #1833 2021-10-18 13:43:45 +02:00