chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-18 08:08:04 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian KammandCamila (Rebase PR Action) aa7409f401 Updater: Make "Update manually" not also "skip this version" 
See #7217
 2020-11-24 18:22:33 +00:00
Christian KammandCamila (Rebase PR Action) 0b3512f49c WinUpdater: More useful options on update failure #7217 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-24 18:22:33 +00:00
Olivier GoffartandCamila (Rebase PR Action) 9596eb7f20 Updater: show the human readable version in the settings 
The xml looks like this:

   <version>2.5.0.328</version>
   <versionstring>ownCloud Client 2.5.0 alpha1 (build 238)</versionstring>

And we should show the version string

Issue #6602
 2020-11-24 18:22:33 +00:00
Olivier GoffartandCamila (Rebase PR Action) f2c3ef741b Updater: remove unused function 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) ae38b88d1c Remove unused installers before copying new ones into the appdata dir 2020-11-24 18:22:33 +00:00
Olivier GoffartandCamila (Rebase PR Action) e93972824d MSI: Fix crash in the auto updater 
'auto' here is a QStringBuilder referencing a temporary

Ammend commit 150d4f5935
(MSI: Always with logfile #6609)

Found in the crash reporter:
https://sentry.io/owncloud/desktop-win-and-mac/issues/623245771/
 2020-11-24 18:22:33 +00:00
Markus GoetzandCamila (Rebase PR Action) 5e518419de MSI: Always with logfile #6609 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) d069fda9ab Extract filename of updateFile without leading slash 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) dfac8c0e59 Escape msi and owncloud.exe path (who knows...) 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) ed0dc68db2 Run msi properly and restart client after update 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) 08b5981fb6 Implement basic .msi support in updater 2020-11-24 18:22:33 +00:00
Markus GoetzandCamila (Rebase PR Action) 412e43b696 Updater: Comments 2020-11-24 18:22:33 +00:00
Christian KammandCamila (Rebase PR Action) 4b39731c27 Updater: Make sparkle updater respect release channel 2020-11-24 18:22:33 +00:00
Markus GoetzandCamila (Rebase PR Action) 311e3a3bd8 Auto Updater: Show UI element also on macOS 
(cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)
 2020-11-24 18:22:33 +00:00
Christian KammandCamila (Rebase PR Action) a8ad946758 Settings: Add update channel combobox #6259 2020-11-24 18:22:33 +00:00
Markus GoetzandCamila (Rebase PR Action) 65035d1990 Sparkle: Delegate calls work now with 1.18.1 (maybe even before) 
We can extend on this to give UI feedback.
 2020-11-24 18:22:33 +00:00
CamilaandGitHub c24b81c081 Merge pull request #2660 from nextcloud/folder-watcher 
FolderWatcher: fixes and improvements
 2020-11-24 19:19:08 +01:00
Christian KammandCamila (Rebase PR Action) 08014b6dc3 FolderWatcher: Disable test on OSX #7305 2020-11-24 16:56:49 +00:00
Olivier GoffartandCamila (Rebase PR Action) 5a432a193f FolderWatcher: Usage of QTime for elapsed time is deprecated 2020-11-24 16:56:49 +00:00
Christian KammandCamila (Rebase PR Action) 28e4fc54a1 FolderWatcher: Wait for ready before testing #7305 2020-11-24 16:56:49 +00:00
Christian KammandCamila (Rebase PR Action) e97fc430bf FolderWatcher: Become unreliable if test notification fails #7241 
Necessary for some filesystems on windows that don't have full file
watching capabilities.
 2020-11-24 16:56:49 +00:00
Christian KammandCamila (Rebase PR Action) 74382ddcc0 FolderWatcher linux: Make automatically recursive #7068 
Previously it depended on addFolder() / removeFolder() calls to adjust
watchers when new folders were added or removed. There also needed to be
complex move handling.

Now, any folder creation/move-in notifications automatically trigger
watcher additions and folder deletion/move-out triggers removal.
 2020-11-24 16:56:49 +00:00
Christian KammandCamila (Rebase PR Action) 21b931dc6b FolderWatcher: Always notify about conflict files #7073 
This makes sure that the conflict list can be updated if a user resolves
a conflict by deleting the local conflict file. Previously one had to
wait for the next sync run.
 2020-11-24 16:56:49 +00:00
Christian KammandCamila (Rebase PR Action) 351bada552 Folderwatcher: On linux, fix paths after dir renames #6808 
If a folder was renamed A -> B, the folder watcher for the inode
would be unaware and still report changes for A/foo. Now directory
renames in the watched folders are tracked and paths are updated
accordingly.
 2020-11-24 16:56:49 +00:00
allexzanderandGitHub fe29290564 Merge pull request #2663 from nextcloud/fix-windows-compilation 
Fix Windows compilation broken after QML debugging fix.
 2020-11-24 18:34:04 +02:00
allexzander 29ca1404cc Fix Windows compilation broken after QML debugging fix. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2020-11-24 16:50:16 +02:00
allexzanderandGitHub d4c14f8f4f Merge pull request #2662 from nextcloud/fix-qml-debugging 
Fix QML debugging by removing incorrect dependency
 2020-11-24 16:24:17 +02:00
allexzander 92733e9069 Fix QML debugging by removing incorrect dependency 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2020-11-24 15:19:17 +02:00
Nextcloud bot 2aa3d17e5c [tx-robot] updated from transifex 2020-11-24 03:41:57 +00:00
Kevin OttensandGitHub 7cf3f14f78 Merge pull request #2658 from nextcloud/enable_qml_debugger_on_debug_builds 
Enable the QML debugger on debug builds
 2020-11-23 18:59:52 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 922b322337 Enable the QML debugger on debug builds 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-23 17:39:50 +00:00
allexzanderandGitHub f530758f78 Merge pull request #2655 from nextcloud/use-dinamyc-path-for-account-state-icons 
Use dynamic path for account online/offline state icon. Refresh GUI on connection state change.
 2020-11-23 18:01:13 +02:00
allexzander 665a8c4217 Use dynamic path for account online/offline state icon. Refresh GUI on connection state change. 
Signed-off-by: Alex Zolotov <alex.zolotov.nextcloud.com>
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2020-11-23 17:49:25 +02:00
Nextcloud bot 10cb0a71eb [tx-robot] updated from transifex 2020-11-23 03:38:35 +00:00
Nextcloud bot e6ea3878a9 [tx-robot] updated from transifex 2020-11-21 03:44:21 +00:00
Nextcloud bot 8faa103ebf [tx-robot] updated from transifex 2020-11-20 03:43:18 +00:00
Nextcloud bot d0004230b9 [tx-robot] updated from transifex 2020-11-19 03:43:51 +00:00
Kevin OttensandGitHub 44f2bc24ff Merge pull request #2648 from nextcloud/debian_packages_should_not_block_ci 
Issue a warning for Debian pipeline failures but don't fail the CI
 2020-11-18 16:32:29 +01:00
Kevin Ottens 6f25840ec9 Issue a warning for Debian pipeline failures but don't fail the CI 
Since this fails every time we bump the version number and takes time to
catch up while failing every following PRs, let's prevent this pipeline
from failing the CI.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-18 16:05:19 +01:00
Nextcloud bot 1950efcfff [tx-robot] updated from transifex 2020-11-18 03:41:49 +00:00
Nextcloud bot d026aa9301 [tx-robot] updated from transifex 2020-11-16 03:43:48 +00:00
Nextcloud bot 0d7865e6f8 [tx-robot] updated from transifex 2020-11-15 03:41:36 +00:00
Nextcloud bot fa1f20ca8e [tx-robot] updated from transifex 2020-11-14 03:44:00 +00:00
Nextcloud bot 771bac2279 [tx-robot] updated from transifex 2020-11-13 03:43:12 +00:00
Kevin OttensandGitHub ebcdb41fb9 Merge pull request #2630 from nextcloud/bump_to_version_3.0.81 
Master is now 3.0.81
v3.1.0-rc1 		2020-11-12 16:31:01 +01:00
Kevin Ottens d2e0959b47 Master is now 3.0.81 
This feels a bit like moving back in that case, but that's due to the
change of convention in the release process. We used to bump early but
now we're moving to a point when we bump at the last minute.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-12 15:53:16 +01:00
Nextcloud bot 2316cb6ce4 [tx-robot] updated from transifex 2020-11-12 03:44:40 +00:00
Nextcloud bot f66b091e12 [tx-robot] updated from transifex 2020-11-11 03:47:29 +00:00
CamilaandGitHub 00a47fefaf Merge pull request #2616 from nextcloud/move_journaldb_files_back_to_sync_folders 
Move journaldb files back to sync folders
 2020-11-10 19:19:14 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 4f7876f520 Migrate journal dbs files back to the sync folder 
In case of past collisions during the 3.0 times... well one will resync
from scratch unfortunately. But if that happened there are likely other
problems which occurred.

Also this might fix some of the bugs with people loosing settings from
the database. Indeed the -wal and -shm concatenations were wrong. Using
append was in fact changing the folderDefinition member which (I guess)
would potentially lead to funny ".db-wal-shm-wal-shm" names.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-10 17:46:43 +00:00