mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-21 01:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,804 Commits 29 Branches 213 Tags
b132bb6412d3de30619f30203bcd7f11747b8e86
Commit Graph

283 Commits

Author SHA1 Message Date
Jan-Peter Klein
b132bb6412 implemented recoverykey reset password success notification screen 2022-07-07 12:16:04 +02:00
Jan-Peter Klein
29d0e258f1 deleted unused and unnecessary code in QuitController 2022-07-05 16:30:32 +02:00
Jan-Peter Klein
9e18215d10 removed unused method, del .idea/uiDesigner.xml and code cleanup 2022-07-05 16:17:42 +02:00
Jan-Peter Klein
683276a6c6 switch scene in quitDialog to quitForcedDialog instead of init new window 2022-07-05 14:22:05 +02:00
Jan-Peter Klein
b791df01f7 removed quitforced package, moved QuitForcedController into quit package and deleted not required files 2022-06-30 15:41:33 +02:00
Jan-Peter Klein
376733106b Merge branch 'develop' into feature/lock-and-quit-without-asking 
# Conflicts (solved):
#	src/main/resources/i18n/strings.properties
 2022-06-30 15:22:57 +02:00
Jan-Peter Klein
8e6d2cf45a Merge branch 'develop' into feature/lock-and-quit-without-asking 2022-06-30 15:13:06 +02:00
Jan-Peter Klein
e640e36744 show forced dialog if normal lock and quit fails in quit dialog 2022-06-29 15:27:19 +02:00
Jan-Peter Klein
d10d8fb208 implemented force quit dialog 2022-06-29 15:12:43 +02:00
Armin Schrenk
d203db8075 Apply suggestions from code review 
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
 2022-06-29 11:14:14 +02:00
Armin Schrenk
7c4f5b28a7 use correct translation key 2022-06-29 11:10:55 +02:00
Armin Schrenk
7edd1dfa40 Reintegrate forget password dialog into application 2022-06-29 11:10:15 +02:00
Armin Schrenk
dffd4d9dd9 change translation keys to use unified dialog scheme 2022-06-29 10:07:03 +02:00
Armin Schrenk
737d98775b Revert "rename recovery_create.fxml file" 
This reverts commit 78e458f01a.
 2022-06-28 16:41:53 +02:00
Armin Schrenk
bee9c9f452 closes #1713 
quit application by locking open vaults, if user wished so.
 2022-06-28 15:39:04 +02:00
Armin Schrenk
ab2d740722 adjust choose masterkeyfile dialog 2022-06-27 19:04:14 +02:00
Armin Schrenk
bf3a62a6b4 Rename translation key for unlock window title 2022-06-27 18:56:53 +02:00
Armin Schrenk
d163d02077 Change window title for removeVault dialog 2022-06-27 18:49:26 +02:00
Armin Schrenk
677607d210 adjust remove vault dialog 2022-06-27 18:24:54 +02:00
Armin Schrenk
cce74ef5e4 add TODO 2022-06-27 17:52:49 +02:00
Armin Schrenk
74058238ec adjust design of wrong file alert 2022-06-27 17:52:34 +02:00
Armin Schrenk
78e458f01a rename recovery_create.fxml file 2022-06-27 17:26:21 +02:00
Jan-Peter Klein
7cc1a1728c removed unused parameter 2022-06-27 14:40:20 +02:00
Armin Schrenk
c7ad587aa2 Changed design for quit screen as template for other dialogs 2022-06-24 15:34:01 +02:00
Armin Schrenk
8c65bd19c2 Make FUSE the default volume impl 2022-06-13 10:00:14 +02:00
Jan-Peter Klein
6f33cf8df7 removed checkbox in quit prompt 2022-05-31 14:09:12 +02:00
Jan-Peter Klein
8f85777887 implemented functionality of feature request issue #1713 "On closing of the application: Always lock and quit – without asking" 2022-05-31 11:18:20 +02:00
JaniruTEC
e6ff7a6d88 Merge pull request #2259 from cryptomator/fix/2258-catching-executors 
Added catching executors
 2022-05-27 18:24:55 +02:00
JaniruTEC
f740a93b6c Applied suggestions from code review 
Changed signature of afterExecuteTask
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875548549

--

Changed name of "afterExecute0" to "afterExecuteInternal"
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875551994
 2022-05-27 01:48:11 +02:00
JaniruTEC
e9a71827ed Apply suggestions from code review 
Establishing symmetry with `afterExecuteTask`

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-05-27 01:36:10 +02:00
Armin Schrenk
3d95276a7f Feature/2200 illegal use of builders (#2262) 
* Replaced Builder in VaultComponent with Factory
* migrate VaultOptionsComponent

Co-authored-by: JaniruTEC <JaniruTEC@gmail.com>
 2022-05-19 22:07:56 +02:00
JaniruTEC
0040c8a5f8 Added catching executors 2022-05-17 16:30:23 +02:00
Armin Schrenk
4989eacaf9 Fixes #2256 2022-05-16 12:58:36 +02:00
Sebastian Stenzel
87202453b1 added Swahili to language picker 
[ci skip]
 2022-05-13 15:43:43 +02:00
Armin Schrenk
4ecb98a5e6 Merge pull request #2245 from cryptomator/feature/location-preset-enum 
Enumeenize well-known local cloud storage paths
 2022-05-12 16:14:43 +02:00
Armin Schrenk
5ab74affb5 Refactor LocationPreset enum: 
* use static inner class
* add getDisplayName method
* make instance variables final

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-05-12 13:47:57 +02:00
Sebastian Stenzel
8230b74c78 moved file picker filter glob to Constants.java 2022-05-12 13:17:33 +02:00
Armin Schrenk
5832e8cd49 Apply suggestions from code review 
Co-authored by: Tobias Hagemann <tobihagemann@users.noreply.github.com>
 2022-05-12 12:15:16 +02:00
Tobias Hagemann
0220af24d0 actually use vault config filename from constants when creating vault 2022-05-12 10:51:00 +02:00
Armin Schrenk
98002f63dc Use enum for well-known local cloud storage paths and move class to commons package 2022-05-12 08:45:03 +02:00
Sebastian Stenzel
120be431ee prepare Cryptomator to eventually change the update check URL 2022-05-10 11:36:40 +02:00
Armin Schrenk
f50eb1f047 Revert "Reset webdavport field if changes are not applied and focus lost" 
This reverts commit c6e9e33feb.
 2022-05-09 13:06:15 +02:00
JaniruTEC
30e1c989d0 Fixed typo 2022-05-01 00:46:36 +02:00
Armin Schrenk
c6e9e33feb Reset webdavport field if changes are not applied and focus lost 2022-04-28 12:00:06 +02:00
Armin Schrenk
62c7f95f7c removed logging of unused property 2022-04-28 11:54:51 +02:00
Armin Schrenk
a304427973 Remove last reference of "donationkey" 2022-04-28 11:53:54 +02:00
Sebastian Stenzel
5e06fa7385 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
 2022-04-27 15:23:38 +02:00
Armin Schrenk
fedb62d99a Merge pull request #2175 from cryptomator/feature/binary-stylesheets 
Prefer binary stylesheets
 2022-04-27 13:06:18 +02:00
Armin Schrenk
8f97235b9a Merge pull request #2189 from cryptomator/feature/on-the-fly-license 
Generate app license on release/ installer build and remove commited third party file
 2022-04-27 13:05:53 +02:00
Armin Schrenk
fbc598fed7 Reordered steps in vault creation and renamed methods 2022-04-22 10:40:18 +02:00