chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-16 13:42:46 +01:00
Code
17,345 Commits 4 Branches 173 Tags 91 MiB
stable-3.4
Commit Graph

17345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
István Váradi
62bf777cda
Merge pull request #2652 from ivaradi/debian-version-discrepancy 
Handle the case when the release version differs from that in VERSION.cmake
 2020-11-30 16:46:20 +01:00
István Váradi
3d9d5f2fe7 Handle the case when the release version differs from that in VERSION.cmake 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2020-11-30 15:33:34 +01:00
allexzander
57e1f2ac07
Merge pull request #2675 from nextcloud/fix-appimage-build 
fix AppImage build
 2020-11-30 14:20:30 +02:00
allexzander
0fdb423fe0 fix AppImage build by using v0.10.0 for qtkeychain 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2020-11-30 13:41:12 +02:00
Nextcloud bot
7bfd8ea23c
[tx-robot] updated from transifex 2020-11-30 03:43:17 +00:00
Nextcloud bot
57a4cd926d
[tx-robot] updated from transifex 2020-11-29 03:42:10 +00:00
Nextcloud bot
de4edb6099
[tx-robot] updated from transifex 2020-11-28 03:39:34 +00:00
Nextcloud bot
70dbbbeaa4
[tx-robot] updated from transifex 2020-11-27 03:40:43 +00:00
Camila
9614d051a5
Merge pull request #2667 from nextcloud/version-bump 
Master is now 3.0.82.
 2020-11-26 13:08:20 +01:00
Camila
8d1fe8ed3c
Master is now 3.0.82. 
Signed-off-by: Camila <hello@camila.codes>
 2020-11-26 12:52:55 +01:00
Camila
4d133ba9a5
Merge pull request #2540 from nextcloud/fix-issue-1458 
Add last / to exclude list file path.
 2020-11-26 12:51:53 +01:00
Camila
bdd3465e7b
Check if there are patterns associated with a sync exclude file. 
The previous check didn't take into the account that .sync-exclude.lst
might be empty which would crash at Q_ASSERT(_allExcludes.contains(basePath))
in the prepare function. It also takes into account that
_allExcludes[basePath] was creating new items in the list.

Signed-off-by: Camila <hello@camila.codes>
 2020-11-26 12:12:04 +01:00
Camila
998e93ac13
Add last / to exclude list file path. 
This Q_ASSERT(this->endsWith('/')) in BasePathByteArray was the reason
for bug report #1458.

Signed-off-by: Camila <hello@camila.codes>
 2020-11-26 12:11:57 +01:00
Nextcloud bot
820ab12561
[tx-robot] updated from transifex 2020-11-26 03:45:21 +00:00
Kevin Ottens
c38189e981
Merge pull request #2665 from nextcloud/sparkle_build_fixes 
Sparkle build fixes
 2020-11-25 18:00:34 +01:00
Dominik Schmidt
a50c665051
Simplify Sparkle handling in CMake 2020-11-25 09:43:59 +01:00
Chih-Hsuan Yen
6962cbf582
Fix build without Sparkle.framework 
(PR #6567)
 2020-11-25 09:40:20 +01:00
Christian Kamm
60d3696ccd
Settings: Add warning when switching update channel 2020-11-25 09:39:16 +01:00
Nextcloud bot
c4987aa641
[tx-robot] updated from transifex 2020-11-25 03:42:43 +00:00
Camila
104d3c0661
Merge pull request #2647 from nextcloud/cherry_pick_updater_fixes_and_improvements 
Cherry pick updater fixes and improvements
 2020-11-24 20:58:26 +01:00
Kevin Ottens
4906353f2e Please the clang-tidy overlord 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-11-24 18:22:33 +00:00
Hannah von Reth
038644f378 Don't scare users with critical parser log messages 2020-11-24 18:22:33 +00:00
Hannah von Reth
d30cd0f0fd Include architecture in updater query 
Fixes: #8074
 2020-11-24 18:22:33 +00:00
Hannah von Reth
c76095859a Cleanup stirngs 2020-11-24 18:22:33 +00:00
Olivier Goffart
a7f010c370 Updater: Fix crash when there is an XML error 
The problem was accessing the lines with an off by one error, while printing
the log.

Other problem included the fact that QDebug added spaces, quotes, and other
things which made the error lot look right in the console.

Issue #7545
 2020-11-24 18:22:33 +00:00
Olivier Goffart
1bf895cadc Updater: Fix Version numer not shown in the user visible string 
There was one argument too many in the string.
Bug was introduced in commit 21ac396b

Issue: #7288
 2020-11-24 18:22:33 +00:00
Christian Kamm
c58f00abc7 Updater: Improved logging output #7388 2020-11-24 18:22:33 +00:00
Hannah von Reth
1df3f5b6df NSISUpdater: Improve logging for version comparison 2020-11-24 18:22:33 +00:00
Hannah von Reth
1aca005267 Updater: Log parsing issues in autoupdatLog parsing issues in autoupdatee 2020-11-24 18:22:33 +00:00
Markus Goetz
9a375211d7 Autoupdater: Log the URL #3475 2020-11-24 18:22:33 +00:00
Christian Kamm
d2991210c5 Updater: Preserve target version string 
For #7217
 2020-11-24 18:22:33 +00:00
Christian Kamm
aa7409f401 Updater: Make "Update manually" not also "skip this version" 
See #7217
 2020-11-24 18:22:33 +00:00
Christian Kamm
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 Goffart
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 Goffart
f2c3ef741b Updater: remove unused function 2020-11-24 18:22:33 +00:00
Dominik Schmidt
ae38b88d1c Remove unused installers before copying new ones into the appdata dir 2020-11-24 18:22:33 +00:00
Olivier Goffart
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 Goetz
5e518419de MSI: Always with logfile #6609 2020-11-24 18:22:33 +00:00
Dominik Schmidt
d069fda9ab Extract filename of updateFile without leading slash 2020-11-24 18:22:33 +00:00
Dominik Schmidt
dfac8c0e59 Escape msi and owncloud.exe path (who knows...) 2020-11-24 18:22:33 +00:00
Dominik Schmidt
ed0dc68db2 Run msi properly and restart client after update 2020-11-24 18:22:33 +00:00
Dominik Schmidt
08b5981fb6 Implement basic .msi support in updater 2020-11-24 18:22:33 +00:00
Markus Goetz
412e43b696 Updater: Comments 2020-11-24 18:22:33 +00:00
Christian Kamm
4b39731c27 Updater: Make sparkle updater respect release channel 2020-11-24 18:22:33 +00:00
Markus Goetz
311e3a3bd8 Auto Updater: Show UI element also on macOS 
(cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)
 2020-11-24 18:22:33 +00:00
Christian Kamm
a8ad946758 Settings: Add update channel combobox #6259 2020-11-24 18:22:33 +00:00
Markus Goetz
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
Camila
c24b81c081
Merge pull request #2660 from nextcloud/folder-watcher 
FolderWatcher: fixes and improvements
 2020-11-24 19:19:08 +01:00
Christian Kamm
08014b6dc3 FolderWatcher: Disable test on OSX #7305 2020-11-24 16:56:49 +00:00
Olivier Goffart
5a432a193f FolderWatcher: Usage of QTime for elapsed time is deprecated 2020-11-24 16:56:49 +00:00