Commit Graph
17214 Commits
Author SHA1 Message Date
Kevin OttensandKevin Ottens (Rebase PR Action) 0b731eb516 Revert "moved default db sync file to Qt standard path AppDataLocation"
This reverts commit fc6b895f52.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 17:46:43 +00:00
Kevin OttensandKevin Ottens (Rebase PR Action) 1b553b93b9 Partial Revert "Adapted for cmd version and added migration step for config file"
This partially reverts commit 67ed54671b.

The migration code was left untouched.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 17:46:43 +00:00
Kevin OttensandKevin Ottens (Rebase PR Action) cebd39aa85 Revert "Adjust to makeDbName returning an absolute path"
This reverts commit 2492e241ac.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 17:46:43 +00:00
CamilaandGitHub 2e97a7fb74 Merge pull request #2531 from nextcloud/bring_back_systray_menu_pause_sync_action
Bring back the "Pause sync" action in the systray context menu
2020-11-10 18:43:52 +01:00
Kevin OttensandCamila (Rebase PR Action) 6c463442ef Bring back the pause/resume action in the systray menu
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 17:29:51 +00:00
Kevin OttensandCamila (Rebase PR Action) 1288ee0437 Move pause/unpause helpers to Systray
We had signals just to call those backs in ownCloudGui, they were
otherwise unused. So let's move them inside of Systray since it's
specific to it anyway.

Also fix the dangerous call to sender(). We can call this function
without going through a signal/slot connection and also it's never
connected to an AccountState.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 17:29:51 +00:00
CamilaandGitHub 3ffc699058 Merge pull request #2620 from nextcloud/fix_crash_when_displaying_share_dialog
Make sure the settings dialog exist before hiding it
2020-11-10 18:09:54 +01:00
Kevin OttensandCamila (Rebase PR Action) 95487d8bfc Make sure the settings dialog exist before hiding it
Because of PR #2580 the settings dialog doesn't always exist. We need to
check for it first before placing calls to it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-10 16:57:56 +00:00
CamilaandGitHub 863db075eb Merge pull request #2621 from nextcloud/wiswedel/documentation/chunkedUpload
[documentation] upload chunks config
2020-11-10 17:56:28 +01:00
Sascha Wiswedel e69b26e363 [documentation] upload chunks config
documenting https://github.com/nextcloud/desktop/commit/e86499d9907f3bab5eac6e371eef772f8befd2e5
2020-11-10 14:56:32 +01:00
Nextcloud bot 4382193519 [tx-robot] updated from transifex 2020-11-10 03:45:50 +00:00
Nextcloud bot 7a093592a0 [tx-robot] updated from transifex 2020-11-09 03:42:28 +00:00
Nextcloud bot 942d8ba86a [tx-robot] updated from transifex 2020-11-08 03:42:17 +00:00
Nextcloud bot 9f9bcecd31 [tx-robot] updated from transifex 2020-11-07 03:42:02 +00:00
Kevin OttensandGitHub 46aba0832d Merge pull request #2615 from nextcloud/fetch_apps_on_connectivity_changes_only
Fetch apps when we get connected only
2020-11-05 13:55:36 +01:00
Kevin Ottens 86d240f7b4 Fetch apps when we get connected only
This was right now on the check connectivity beat which is too much when
you got many users. Be more conservative there and only update the list
of apps when the account gets connected.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-05 13:37:25 +01:00
Nextcloud bot 6445a61d80 [tx-robot] updated from transifex 2020-11-05 03:40:34 +00:00
Nextcloud bot 3749fe15b6 [tx-robot] updated from transifex 2020-11-04 03:41:27 +00:00
Nextcloud bot 50e038cfaa [tx-robot] updated from transifex 2020-11-03 03:41:44 +00:00
CamilaandGitHub 44a55674ac Merge pull request #2603 from nextcloud/remove_findqt5keychain_cmake_module
Get rid of FindQt5Keychain.cmake
2020-11-02 14:36:46 +01:00
Kevin Ottens 0e617d020f Adjust AppImage build of QtKeychain to be found by cmake
Now that things are done in a more standard way, let's adjust the
AppImage build so that QtKeychain is picked up properly now that our
FindQt5Keychain.cmake file is gone.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-02 13:28:02 +01:00
Kevin Ottens 3427dadaeb Get rid of FindQt5Keychain.cmake
QtKeychain provides Qt5KeychainConfig.cmake and friends nowadays, so no
need to have a less reliable and outdated find module on our end.

Also this shows that we were including keychain.h in the wrong way and
were not using the link target, so both got fixed as well.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-02 13:19:48 +01:00
Nextcloud bot dfd6cce978 [tx-robot] updated from transifex 2020-11-02 03:41:37 +00:00
Nextcloud bot 5a8c2bab89 [tx-robot] updated from transifex 2020-11-01 03:40:38 +00:00
Nextcloud bot a14930c293 [tx-robot] updated from transifex 2020-10-31 03:41:57 +00:00
Nextcloud bot a3914482d7 [tx-robot] updated from transifex 2020-10-30 03:42:51 +00:00
Kevin OttensandGitHub 56d067d7a9 Merge pull request #2589 from sryze/windows7-fixes
Misc fixes for Windows 7
2020-10-28 07:39:14 +01:00
Sergey ZolotarevandKevin Ottens (Rebase PR Action) 18c1bc0bd6 Misc fixes for Windows 7
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2020-10-28 06:24:53 +00:00
Nextcloud bot ef86d4b738 [tx-robot] updated from transifex 2020-10-28 03:42:53 +00:00
Nextcloud bot a74861dbb5 [tx-robot] updated from transifex 2020-10-27 03:42:33 +00:00
Kevin OttensandGitHub 9593cea18c Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording
Remove last left over of the "remote" wording
2020-10-26 16:09:49 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 3e6b257ccd Remove last left over of the "remote" wording
I switched from "remote" to "server" but apparently left one behind by
mistake...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-26 14:45:46 +00:00
ValdnetandGitHub d17c9af044 Merge pull request #2586 from nextcloud/Valdnet-patch-2
l10n: Change the triple dot to ellipsis
2020-10-26 15:09:15 +01:00
ValdnetandKevin Ottens (Rebase PR Action) 204cced445 l10n: Change the ellipsis 2020-10-26 13:22:55 +00:00
ValdnetandKevin Ottens (Rebase PR Action) f116c39b0a l10n: Add a space in generalsettings.ui 2020-10-26 13:22:55 +00:00
Kevin OttensandGitHub 6b794ddd5a Merge pull request #2582 from nextcloud/macos_add_more_information_on_skipped_file_watcher_event
Also output the event flags in the debug logs
2020-10-26 14:15:15 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 8fad88055e Also output the event flags in the debug logs
When we skip a watcher event on mac, we log the file path but not the
event flags which came with it. Let's add it, it should help figure out
what's going on with #2578.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-26 12:37:00 +00:00
ValdnetandGitHub 1627522695 Merge pull request #2587 from nextcloud/rakekniven-patch-1
Triple dot to ellipsis
2020-10-26 13:32:42 +01:00
rakeknivenandKevin Ottens (Rebase PR Action) 62fa8028a6 Triple dot to ellipsis
Reported at Transifex.

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2020-10-26 12:22:23 +00:00
Nextcloud bot 92801816e0 [tx-robot] updated from transifex 2020-10-26 03:37:49 +00:00
Nextcloud bot 599cf0143f [tx-robot] updated from transifex 2020-10-25 03:39:15 +00:00
Nextcloud bot 38205cab68 [tx-robot] updated from transifex 2020-10-24 03:39:31 +00:00
Nextcloud bot fa8f37e987 [tx-robot] updated from transifex 2020-10-23 03:38:53 +00:00
CamilaandGitHub 2bcc99792d Merge pull request #2581 from nextcloud/ensure_systray_window_doesnt_prevent_windows_session_close
Ensure we quickly show/hide the systray window on startup
2020-10-22 19:48:43 +02:00
Kevin OttensandCamila (Rebase PR Action) 24964e2b9b Ensure we quickly show/hide the systray window on startup
This is quick enough that no flickering should appear in practice.

We end up doing this because for some reason on Windows (I dug up deep
into the Windows QPA without nailing it down) not showing that systray
window at least once prevents the app object to return from exec() when
the session ends.

It's as if that window would be in some limbo state (neither opened nor
closed) which would prevent quitting. Clearly what we're doing here is a
workaround...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-22 17:31:05 +00:00
Kevin OttensandGitHub 802d27ed0f Merge pull request #2527 from nextcloud/improve_conflict_handling_gui
Improve conflict handling gui
2020-10-22 18:27:45 +02:00
Kevin Ottens b835092ae9 Use the ConflictDialog directly from the activity list
No need to go to the file manager first to then have the user go through
the context menu, just popup the dialog directly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-22 16:40:47 +02:00
Kevin Ottens 4116c90c9c Move the activity action behavior on the C++ side
We better do this before this business logic grows in the QML side and
gets out of control. We'll need finer grained information due to the
conflict handling anyway.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-22 16:40:46 +02:00
Kevin Ottens 910f0c9339 Repair SettingsDialog::showIssuesList
This was completely disabled code and the connect was gone... So let's
introduce the connect back and have it trigger the main window while
selecting the right user. This way the new activity list is displayed
and since the conflicts are shown at the top this is hopefully obvious
again.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-22 16:40:46 +02:00
Kevin Ottens c42f4abd25 Add a function to know the user id matching a given account
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-10-22 16:40:46 +02:00