chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-11-05 13:22:20 +01:00
Code Activity

Commit Graph

  • 7a093592a0 [tx-robot] updated from transifex Nextcloud bot 2020-11-09 03:42:28 +00:00
  • 942d8ba86a [tx-robot] updated from transifex Nextcloud bot 2020-11-08 03:42:17 +00:00
  • 9f9bcecd31 [tx-robot] updated from transifex Nextcloud bot 2020-11-07 03:42:02 +00:00
  • 46aba0832d Merge pull request #2615 from nextcloud/fetch_apps_on_connectivity_changes_only Kevin Ottens 2020-11-05 13:55:36 +01:00
  • 86d240f7b4 Fetch apps when we get connected only Kevin Ottens 2020-11-05 13:37:25 +01:00
  • 6445a61d80 [tx-robot] updated from transifex Nextcloud bot 2020-11-05 03:40:34 +00:00
  • 3749fe15b6 [tx-robot] updated from transifex Nextcloud bot 2020-11-04 03:41:27 +00:00
  • 50e038cfaa [tx-robot] updated from transifex Nextcloud bot 2020-11-03 03:41:44 +00:00
  • 44a55674ac Merge pull request #2603 from nextcloud/remove_findqt5keychain_cmake_module Camila 2020-11-02 14:36:46 +01:00
  • 0e617d020f Adjust AppImage build of QtKeychain to be found by cmake Kevin Ottens 2020-11-02 13:28:02 +01:00
  • 3427dadaeb Get rid of FindQt5Keychain.cmake Kevin Ottens 2020-10-29 13:24:20 +01:00
  • dfd6cce978 [tx-robot] updated from transifex Nextcloud bot 2020-11-02 03:41:37 +00:00
  • 5a8c2bab89 [tx-robot] updated from transifex Nextcloud bot 2020-11-01 03:40:38 +00:00
  • a14930c293 [tx-robot] updated from transifex Nextcloud bot 2020-10-31 03:41:57 +00:00
  • a3914482d7 [tx-robot] updated from transifex Nextcloud bot 2020-10-30 03:42:51 +00:00
  • 78da725ac3 Merge pull request #2598 from nextcloud/bump_version_3.0.3 v3.0.3 Kevin Ottens 2020-10-29 11:30:42 +01:00
  • 571e2a1fdb Bump version to 3.0.3 Kevin Ottens 2020-10-29 11:28:47 +01:00
  • 56d067d7a9 Merge pull request #2589 from sryze/windows7-fixes Kevin Ottens 2020-10-28 07:39:14 +01:00
  • 18c1bc0bd6 Misc fixes for Windows 7 Sergey Zolotarev 2020-10-27 01:51:12 +06:00
  • ef86d4b738 [tx-robot] updated from transifex Nextcloud bot 2020-10-28 03:42:53 +00:00
  • 4f9c2a5c65 [tx-robot] updated from transifex Nextcloud bot 2020-10-28 03:41:56 +00:00
  • a74861dbb5 [tx-robot] updated from transifex Nextcloud bot 2020-10-27 03:42:33 +00:00
  • 90195646f0 [tx-robot] updated from transifex Nextcloud bot 2020-10-27 03:41:36 +00:00
  • 9593cea18c Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording Kevin Ottens 2020-10-26 16:09:49 +01:00
  • 3e6b257ccd Remove last left over of the "remote" wording Kevin Ottens 2020-10-26 13:58:34 +01:00
  • d17c9af044 Merge pull request #2586 from nextcloud/Valdnet-patch-2 Valdnet 2020-10-26 15:09:15 +01:00
  • 204cced445 l10n: Change the ellipsis Valdnet 2020-10-26 13:38:31 +01:00
  • f116c39b0a l10n: Add a space in generalsettings.ui Valdnet 2020-10-23 12:54:21 +02:00
  • a20454f9f7 Merge pull request #2592 from nextcloud/backport/2582/stable-3.0 Kevin Ottens 2020-10-26 14:20:15 +01:00
  • f1842447b2 Also output the event flags in the debug logs Kevin Ottens 2020-10-22 13:17:52 +02:00
  • 6b794ddd5a Merge pull request #2582 from nextcloud/macos_add_more_information_on_skipped_file_watcher_event Kevin Ottens 2020-10-26 14:15:15 +01:00
  • 8fad88055e Also output the event flags in the debug logs Kevin Ottens 2020-10-22 13:17:52 +02:00
  • 1627522695 Merge pull request #2587 from nextcloud/rakekniven-patch-1 Valdnet 2020-10-26 13:32:42 +01:00
  • 62fa8028a6 Triple dot to ellipsis rakekniven 2020-10-23 15:02:29 +02:00
  • 92801816e0 [tx-robot] updated from transifex Nextcloud bot 2020-10-26 03:37:49 +00:00
  • d9971f9535 [tx-robot] updated from transifex Nextcloud bot 2020-10-26 03:36:50 +00:00
  • 599cf0143f [tx-robot] updated from transifex Nextcloud bot 2020-10-25 03:39:15 +00:00
  • 31f9af23ac [tx-robot] updated from transifex Nextcloud bot 2020-10-25 03:38:19 +00:00
  • 38205cab68 [tx-robot] updated from transifex Nextcloud bot 2020-10-24 03:39:31 +00:00
  • 3f33475569 [tx-robot] updated from transifex Nextcloud bot 2020-10-24 03:38:33 +00:00
  • fa8f37e987 [tx-robot] updated from transifex Nextcloud bot 2020-10-23 03:38:53 +00:00
  • 02bdf69aa8 [tx-robot] updated from transifex Nextcloud bot 2020-10-23 03:37:58 +00:00
  • 2bcc99792d Merge pull request #2581 from nextcloud/ensure_systray_window_doesnt_prevent_windows_session_close Camila 2020-10-22 19:48:43 +02:00
  • 24964e2b9b Ensure we quickly show/hide the systray window on startup Kevin Ottens 2020-10-22 12:39:40 +02:00
  • 802d27ed0f Merge pull request #2527 from nextcloud/improve_conflict_handling_gui Kevin Ottens 2020-10-22 18:27:45 +02:00
  • b835092ae9 Use the ConflictDialog directly from the activity list Kevin Ottens 2020-10-07 18:05:21 +02:00
  • 4116c90c9c Move the activity action behavior on the C++ side Kevin Ottens 2020-10-07 13:23:34 +02:00
  • 910f0c9339 Repair SettingsDialog::showIssuesList Kevin Ottens 2020-10-07 12:28:31 +02:00
  • c42f4abd25 Add a function to know the user id matching a given account Kevin Ottens 2020-10-07 12:27:32 +02:00
  • e3b97b0a04 In the case of conflicts, have the socket api propose the config dialog Kevin Ottens 2020-10-07 17:51:57 +02:00
  • 49c478cd2a Add a conflict dialog to help the user solve them Kevin Ottens 2020-10-07 17:51:18 +02:00
  • 67e81fcd0f Add KeepBothVersions as a possible solution to ConflictSolver Kevin Ottens 2020-10-08 15:54:32 +02:00
  • 4fdb203cdb Move some of the SocketApi conflict handling in a ConflictSolver class Kevin Ottens 2020-10-07 16:30:43 +02:00
  • 26d62a9712 Repair the canAddToDir logic Kevin Ottens 2020-10-07 17:47:48 +02:00
  • 00e901f5a7 SocketAPI: Introduce conflict resolution actions #6252 Christian Kamm 2020-10-07 14:51:04 +02:00
  • f62be57ef2 FileSystem: make removeRecursively() reusable Christian Kamm 2018-05-22 11:49:02 +02:00
  • e70371f408 FileSystem: Fix bad indentation Christian Kamm 2018-05-22 10:40:45 +02:00
  • b982a17998 Merge pull request #2580 from nextcloud/delay-settingsdialog-init Kevin Ottens 2020-10-22 15:08:01 +02:00
  • 7699004a11 Fix crash in SettingsDialog with delayed initialization Michael Schuster 2020-10-22 04:14:09 +02:00
  • 0fb10163a3 Delay initialization of SettingsDialog Michael Schuster 2020-10-22 03:57:29 +02:00
  • 40aa53bf76 [tx-robot] updated from transifex Nextcloud bot 2020-10-22 03:39:17 +00:00
  • ce40c11149 [tx-robot] updated from transifex Nextcloud bot 2020-10-22 03:38:23 +00:00
  • 72812831ed Merge pull request #2577 from nextcloud/backport/2575/stable-3.0 Kevin Ottens 2020-10-21 14:43:04 +02:00
  • d1e08ef2d5 Use the Theme colors for the header part of the window Kevin Ottens 2020-10-21 13:46:51 +02:00
  • cf18844c5a Expose Theme on the QML side Kevin Ottens 2020-10-21 13:46:38 +02:00
  • 2499ec3312 Expose the branding related members of Theme as properties Kevin Ottens 2020-10-21 13:46:04 +02:00
  • 3539d6c2c8 Don't hardcode the color of text in the header Kevin Ottens 2020-10-21 13:40:42 +02:00
  • 6b511f8749 Get rid of ncBlueHover Kevin Ottens 2020-10-21 11:24:06 +02:00
  • bb43127633 Merge pull request #2575 from nextcloud/expose_branding_values_to_qtquick Kevin Ottens 2020-10-21 14:13:40 +02:00
  • 76f83b4715 Merge pull request #2576 from nextcloud/backport/2572/stable-3.0 Camila 2020-10-21 14:11:36 +02:00
  • eb1ec74095 Don't use depth infinity anymore to get the folders e2ee status Kevin Ottens 2020-10-20 17:05:57 +02:00
  • 9c25dc5363 Make sure jobs don't outlive ClientSideEncryption Kevin Ottens 2020-10-20 16:51:38 +02:00
  • 36274d6f65 Factor out the logic to start a new e2ee status job Kevin Ottens 2020-10-20 16:48:54 +02:00
  • ce7319e32a Mention the folder we listed in the debug logs Kevin Ottens 2020-10-20 16:36:10 +02:00
  • 41db853d36 Change the way we store the job result Kevin Ottens 2020-10-20 16:33:46 +02:00
  • 507e9e3559 Start managing a list of GetFolderEncryptStatusJob Kevin Ottens 2020-10-20 16:27:20 +02:00
  • 0e4ff6929e Add a way to know which folder was listed for encrypted status Kevin Ottens 2020-10-20 16:15:56 +02:00
  • c6c2d4cf4c Use the Theme colors for the header part of the window Kevin Ottens 2020-10-21 13:46:51 +02:00
  • a2e3f9d63a Expose Theme on the QML side Kevin Ottens 2020-10-21 13:46:38 +02:00
  • 7536e4c00b Expose the branding related members of Theme as properties Kevin Ottens 2020-10-21 13:46:04 +02:00
  • de63e5e221 Don't hardcode the color of text in the header Kevin Ottens 2020-10-21 13:40:42 +02:00
  • 0e9efe728a Get rid of ncBlueHover Kevin Ottens 2020-10-21 11:24:06 +02:00
  • 60da0cee25 Merge pull request #2572 from nextcloud/avoid_depth_infinity_propfind_for_e2ee Kevin Ottens 2020-10-21 10:16:14 +02:00
  • 10cb4170c7 Don't use depth infinity anymore to get the folders e2ee status Kevin Ottens 2020-10-20 17:05:57 +02:00
  • b5fdbefb0e Make sure jobs don't outlive ClientSideEncryption Kevin Ottens 2020-10-20 16:51:38 +02:00
  • 399b97442e Factor out the logic to start a new e2ee status job Kevin Ottens 2020-10-20 16:48:54 +02:00
  • cbc40b5a15 Mention the folder we listed in the debug logs Kevin Ottens 2020-10-20 16:36:10 +02:00
  • 8e3ca71763 Change the way we store the job result Kevin Ottens 2020-10-20 16:33:46 +02:00
  • 9aeb7046d2 Start managing a list of GetFolderEncryptStatusJob Kevin Ottens 2020-10-20 16:27:20 +02:00
  • cfb66ddadd Add a way to know which folder was listed for encrypted status Kevin Ottens 2020-10-20 16:15:56 +02:00
  • 65b90f4bb1 [tx-robot] updated from transifex Nextcloud bot 2020-10-21 03:39:44 +00:00
  • 463ebd1df8 [tx-robot] updated from transifex Nextcloud bot 2020-10-21 03:38:47 +00:00
  • 78f6d9f044 Merge pull request #2570 from nextcloud/backport/2568/stable-3.0 Kevin Ottens 2020-10-20 17:20:53 +02:00
  • cc6ec22e5f Fix crash when clicking on folder with status 403 in the main dialog. Camila San 2020-10-20 12:21:12 +02:00
  • 534f0567bf Merge pull request #2568 from nextcloud/fix-macos-crash-403-folder-view Kevin Ottens 2020-10-20 16:38:13 +02:00
  • 03b1c0b84a Fix crash when clicking on folder with status 403 in the main dialog. Camila San 2020-10-20 12:21:12 +02:00
  • 671ca522ea [tx-robot] updated from transifex Nextcloud bot 2020-10-20 03:38:46 +00:00
  • c831bfbc63 [tx-robot] updated from transifex Nextcloud bot 2020-10-20 03:37:49 +00:00
  • d8017eccce Merge pull request #2567 from nextcloud/backport/2551/stable-3.0 Kevin Ottens 2020-10-19 17:28:08 +02:00
  • 4b9d9e3020 Stop the animation if we got an error message Kevin Ottens 2020-10-14 18:41:35 +02:00