Commit Graph

  • 2c2b208de7 no need to reset anything, since there is no previous config Sebastian Stenzel 2022-08-11 18:18:48 +02:00
  • ec7ad0f479 use new ServiceLoader based log configurator Sebastian Stenzel 2022-08-11 18:14:54 +02:00
  • 5267a04491 make org.cryptomator.desktop an open module Sebastian Stenzel 2022-08-11 17:36:10 +02:00
  • 04714cd0de make singleton Environment accessible outside of Dagger graph Sebastian Stenzel 2022-08-11 17:35:35 +02:00
  • 46dbe15e4a update dependencies Sebastian Stenzel 2022-08-11 17:34:34 +02:00
  • 7abf167ba2 Merge pull request #2381 from cryptomator/feature/hub-handle-402 Armin Schrenk 2022-08-09 10:55:41 +02:00
  • 44d19bdefe Apply suggestions from code review Armin Schrenk 2022-08-09 10:37:22 +02:00
  • f84eef5639 actually use the scene in ui flow Armin Schrenk 2022-08-08 16:37:30 +02:00
  • 281f6f727f show info for 402 response on unlock Armin Schrenk 2022-08-08 16:33:07 +02:00
  • bf83df3cd3 Merge branch 'main' into develop Sebastian Stenzel 2022-08-05 14:31:59 +02:00
  • be4f6f2b9b Merge branch 'hotfix/1.6.13' 1.6.13 Sebastian Stenzel 2022-08-05 14:31:25 +02:00
  • bf84598131 set version to 1.6.13 Sebastian Stenzel 2022-08-05 14:31:10 +02:00
  • 943be4557f fixes #2374 Sebastian Stenzel 2022-08-05 14:28:47 +02:00
  • 649e029d4f added cryptomator.integrationsMac.keychainServiceName system property Sebastian Stenzel 2022-08-05 11:09:49 +02:00
  • 1cd3d1d67f Merge pull request #2365 from purejava/fix-2301 Sebastian Stenzel 2022-08-02 08:44:04 +02:00
  • 8290df9ea6 Pass on CLI parameters for Cryptomator started as an AppImage or installed from PPA Fixes #2301 Ralph Plawetzki 2022-08-01 18:17:41 +02:00
  • 47f2d423b9 Remove code smells Armin Schrenk 2022-07-28 11:16:59 +02:00
  • 80b5b6af00 simplify app version code Armin Schrenk 2022-07-28 10:58:50 +02:00
  • 414c4e20b8 remove code smell Armin Schrenk 2022-07-28 10:47:46 +02:00
  • 11a55f382a fix winget release Armin Schrenk 2022-07-27 17:16:33 +02:00
  • 0c5021913c Merge branch 'main' into develop Armin Schrenk 2022-07-27 12:11:13 +02:00
  • 8bc0b3a700 Merge branch 'hotfix/1.6.12' 1.6.12 Armin Schrenk 2022-07-27 12:10:01 +02:00
  • 57110ff417 add release to metainfo Armin Schrenk 2022-07-27 11:57:45 +02:00
  • d5bdea4a75 fix debian build script Armin Schrenk 2022-07-27 11:56:28 +02:00
  • 72c8ca3368 preparing 1.6.12 Armin Schrenk 2022-07-27 11:55:24 +02:00
  • 2ca824696c Merge branch 'main' into develop Armin Schrenk 2022-07-26 13:24:11 +02:00
  • 43d8f7c47f Merge branch 'release/1.6.11' 1.6.11 Armin Schrenk 2022-07-26 13:23:54 +02:00
  • 9209e7698c add release info to linux metainfo file Armin Schrenk 2022-07-26 13:23:31 +02:00
  • 6e75f1fea8 Merge branch 'main' into develop Armin Schrenk 2022-07-26 13:09:22 +02:00
  • 2bdb0c3e6a Merge branch 'release/1.6.11' Armin Schrenk 2022-07-26 13:08:59 +02:00
  • 677634930d Fix windows run config [ci skip] Armin Schrenk 2022-07-26 13:03:22 +02:00
  • 546da7d11f preparing 1.6.11 Armin Schrenk 2022-07-26 12:39:45 +02:00
  • 8662abae5a Merge branch 'feature/hub' into develop Armin Schrenk 2022-07-26 12:29:33 +02:00
  • f98782ba4e New Crowdin updates (#2313) Cryptobot 2022-07-26 12:14:32 +02:00
  • 422077ac08 adjust pom Armin Schrenk 2022-07-20 17:01:29 +02:00
  • 10b9e75972 degenerify button description and rename things in resetPasswordController Armin Schrenk 2022-07-19 16:36:32 +02:00
  • 00e420a248 Improve add vault wizard: * adjust ok/not-ok-design to other textfields * add info, what characters to use Armin Schrenk 2022-07-19 15:51:58 +02:00
  • f7ddb6e714 Update and deduplicate winfsp download link Armin Schrenk 2022-07-18 13:11:12 +02:00
  • f1c8e3d3f2 Change CatchingExecutor: * ignore cancellation exception * remove assertion (Closes #2270) Armin Schrenk 2022-07-18 12:21:42 +02:00
  • cfc8c7bed7 remove unused instance var Armin Schrenk 2022-07-18 12:15:48 +02:00
  • 71b876b32d Fixes #1900 Armin Schrenk 2022-07-18 10:42:00 +02:00
  • cdc60abf66 Fixes #2292 Armin Schrenk 2022-07-18 10:23:12 +02:00
  • b73ab4645b only publish to winget, if workflow triggered by release or explicitly stated Armin Schrenk 2022-07-15 11:14:21 +02:00
  • c70961405c updated code sign cert Sebastian Stenzel 2022-07-15 09:52:25 +02:00
  • d814c1cfca Update integrations-win lib (#2331) Armin Schrenk 2022-07-11 15:59:54 +02:00
  • 50413ca9d8 Merge pull request #2329 from barimess/update-link Armin Schrenk 2022-07-11 13:37:58 +02:00
  • 2a91403f2f bumped webdav-nio-adapter to version 1.2.8, containing vulnerability fixes in jetty Sebastian Stenzel 2022-07-11 10:09:22 +02:00
  • 5ec499ff01 updated links to the latest version. barimess 2022-07-08 18:30:49 +01:00
  • 86cf0d4d4e Merge pull request #2328 from cryptomator/feature/hub-device-name-taken Armin Schrenk 2022-07-08 13:44:04 +02:00
  • f2af6f355c remove debug step Sebastian Stenzel 2022-07-08 13:09:26 +02:00
  • 58d01b5bf5 fixed errors Sebastian Stenzel 2022-07-08 13:07:30 +02:00
  • 5e19cd409f use different action for getting the gist Sebastian Stenzel 2022-07-08 12:56:02 +02:00
  • 4dd58a664e Update error-db.yml Sebastian Stenzel 2022-07-08 12:48:50 +02:00
  • a7fc8d6fc4 hide alreadyExistingLabel when deviceName changed by user Armin Schrenk 2022-07-08 12:03:38 +02:00
  • 5c31a34d5f Show message in register dialog if device name is already in use Armin Schrenk 2022-07-08 11:33:59 +02:00
  • 67264c0d8c Merge pull request #2319 from cryptomator/feature/hub-better-dialogs Armin Schrenk 2022-07-07 20:54:11 +02:00
  • 153ccef8a2 Merge pull request #2325 from cryptomator/feature/recoverykey-success-notification mindmonk 2022-07-07 18:12:12 +02:00
  • 0e853b25f7 simplify the prefill of device registration name textbox Armin Schrenk 2022-07-07 17:54:53 +02:00
  • 12302162b1 Update error-db.yml Sebastian Stenzel 2022-07-07 17:35:48 +02:00
  • 7d14b55bcb Merge branch 'develop' into feature/recoverykey-success-notification Jan-Peter Klein 2022-07-07 17:23:32 +02:00
  • 69fe5b8c27 changed buttonOrder and buttonData in recovery_reset_password.fxml and removed blank line in string.properties Jan-Peter Klein 2022-07-07 17:23:10 +02:00
  • df099df334 Create error-db.yml Sebastian Stenzel 2022-07-07 17:13:27 +02:00
  • 6bbdb4baa0 Merge branch 'develop' into feature/recoverykey-success-notification Jan-Peter Klein 2022-07-07 16:18:26 +02:00
  • ea6318dfc4 comments of the PR were taken into account as well as a few small changes in the recoverykey recover dialog Jan-Peter Klein 2022-07-07 16:17:41 +02:00
  • 93500a4efd use try-with-resource Armin Schrenk 2022-07-07 12:27:20 +02:00
  • b132bb6412 implemented recoverykey reset password success notification screen Jan-Peter Klein 2022-07-07 12:16:04 +02:00
  • cf38a10284 Change text from registration to "naming" and prefill device name Armin Schrenk 2022-07-07 12:01:34 +02:00
  • 15781b685d use new github "inputs" context, where booleans are supposed to actually be booleans Sebastian Stenzel 2022-07-06 17:09:02 +02:00
  • 73442cddc8 Change register device dialog text to make intent clear Armin Schrenk 2022-07-06 10:41:13 +02:00
  • bce9833929 Merge pull request #2273 from cryptomator/feature/lock-and-quit-without-asking mindmonk 2022-07-05 16:46:45 +02:00
  • 29d0e258f1 deleted unused and unnecessary code in QuitController Jan-Peter Klein 2022-07-05 16:30:32 +02:00
  • 1305e45564 Merge branch 'develop' into feature/lock-and-quit-without-asking Jan-Peter Klein 2022-07-05 16:18:06 +02:00
  • 9e18215d10 removed unused method, del .idea/uiDesigner.xml and code cleanup Jan-Peter Klein 2022-07-05 16:17:42 +02:00
  • 683276a6c6 switch scene in quitDialog to quitForcedDialog instead of init new window Jan-Peter Klein 2022-07-05 14:22:05 +02:00
  • f16a30ef29 Merge branch 'develop' into feature/hub Sebastian Stenzel 2022-07-05 13:28:41 +02:00
  • 82db3b59fb bump jwt dependency Sebastian Stenzel 2022-07-05 13:22:43 +02:00
  • c191df9ee3 add device registration failed controller Armin Schrenk 2022-07-05 11:20:52 +02:00
  • a2d6db0415 Add device registrations success screen Armin Schrenk 2022-07-05 11:09:29 +02:00
  • 077825f98a Add desgin to recieve key dialog Armin Schrenk 2022-07-05 09:29:49 +02:00
  • 381c1cd8d3 Bump tinyoauth2 dependecy and adjust to new api Armin Schrenk 2022-07-04 17:15:00 +02:00
  • ae2c67a88b fit unauthorized device dialog to new design Armin Schrenk 2022-07-04 11:50:07 +02:00
  • 3ce0270cde Adjust hub register device to new design Armin Schrenk 2022-07-04 11:37:49 +02:00
  • e011a98fa0 add window title to hub keyloading Armin Schrenk 2022-07-04 10:36:15 +02:00
  • 9386804216 redesign auth processing dialog: * adjust to new design * add translation keys Armin Schrenk 2022-06-30 13:13:17 +02:00
  • b791df01f7 removed quitforced package, moved QuitForcedController into quit package and deleted not required files Jan-Peter Klein 2022-06-30 15:41:33 +02:00
  • 376733106b Merge branch 'develop' into feature/lock-and-quit-without-asking Jan-Peter Klein 2022-06-30 15:22:57 +02:00
  • 8e6d2cf45a Merge branch 'develop' into feature/lock-and-quit-without-asking Jan-Peter Klein 2022-06-30 15:13:06 +02:00
  • 63cd3a02de Merge branch 'develop' into feature/hub Armin Schrenk 2022-06-30 12:13:29 +02:00
  • 1795a7aaa4 Merge pull request #2311 from cryptomator/feature/1430-embark-on-unity Armin Schrenk 2022-06-30 11:07:25 +02:00
  • c8e4ed1ce4 Merge branch 'feature/translations' into feature/1430-embark-on-unity Armin Schrenk 2022-06-30 10:13:52 +02:00
  • 99b25d0792 migrate translations Armin Schrenk 2022-06-30 10:00:22 +02:00
  • 0dca0d6f1c Fixed #2270 fix/2270-assertion-error-in-catching-executors JaniruTEC 2022-06-30 02:28:42 +02:00
  • e640e36744 show forced dialog if normal lock and quit fails in quit dialog Jan-Peter Klein 2022-06-29 15:27:19 +02:00
  • d10d8fb208 implemented force quit dialog Jan-Peter Klein 2022-06-29 15:12:43 +02:00
  • 43e6ca41aa more consistency Tobias Hagemann 2022-06-29 11:34:07 +02:00
  • e2b4566174 Update src/main/resources/i18n/strings.properties Armin Schrenk 2022-06-29 11:15:26 +02:00
  • d203db8075 Apply suggestions from code review Armin Schrenk 2022-06-29 11:14:14 +02:00
  • 7c4f5b28a7 use correct translation key Armin Schrenk 2022-06-29 11:10:55 +02:00
  • 7edd1dfa40 Reintegrate forget password dialog into application Armin Schrenk 2022-06-29 11:10:15 +02:00
  • 09550b77dc Merge branch 'feature/1430-embark-on-unity' of https://github.com/cryptomator/cryptomator into feature/1430-embark-on-unity Armin Schrenk 2022-06-29 10:54:59 +02:00