Commit Graph
11836 Commits
Author SHA1 Message Date
Markus Goetz 95297e23bf VERSION.cmake: 2.5.0 alpha v2.5.0-alpha 2018-05-25 15:56:36 +02:00
Dominik Schmidt 13d0595296 Update libcrashreporter-qt to build it with msvc
(cherry picked from commit b9323bd191)
2018-05-25 15:36:54 +02:00
Markus Goetz 88abf43bda ChangeLog: More entries 2018-05-25 15:32:16 +02:00
Christian Kamm de77514671 AccountWizard: Reserve space for error label #6546 2018-05-25 08:44:03 +02:00
Jenkins for ownCloud 5c69130300 [tx-robot] updated from transifex 2018-05-25 02:18:51 +02:00
Markus Goetz 74e412c789 owncloudsynclog: 1 MB -> 10 MB #6420 2018-05-24 16:02:52 +02:00
Christian Kamm 5811c74f9c Settings migration: Preserve future settings where possible
See discussion in #6506
2018-05-24 12:18:44 +02:00
Christian Kamm 57a2881906 Config: Add version flags to accounts and folders
Also, if there is too-new configuration, backup the file, show a
warning message asking the user whether it's ok to discard the
configuration from the future.

See #6504
2018-05-24 12:18:44 +02:00
Olivier Goffart c625d8e3b7 Credentials: Retry fetching from the keychain in case the keychain is still starting
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
2018-05-24 12:10:55 +02:00
Christian Kamm 53f52b4cf5 Settings: Add warning when switching update channel 2018-05-24 12:09:40 +02:00
Christian Kamm 293c2b4f79 Updater: Make sparkle updater respect release channel 2018-05-24 12:09:40 +02:00
Markus Goetz 29349d4b3a Auto Updater: Show UI element also on macOS
(cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)
2018-05-24 12:09:40 +02:00
Christian Kamm 7790953a2c Settings: Add update channel combobox #6259 2018-05-24 12:09:40 +02:00
Jenkins for ownCloud e3083d6791 [tx-robot] updated from transifex 2018-05-24 02:18:53 +02:00
Christian Kamm 8f9f2b5462 Rename Placeholders to Virtual Files in code #6531 2018-05-23 09:57:00 +02:00
Jenkins for ownCloud 70b1deb226 [tx-robot] updated from transifex 2018-05-23 02:18:39 +02:00
Jenkins for ownCloud 2b112b8dcf [tx-robot] updated from transifex 2018-05-22 02:18:40 +02:00
Jenkins for ownCloud 9350b4458c [tx-robot] updated from transifex 2018-05-21 02:18:39 +02:00
Jenkins for ownCloud 2870715fff [tx-robot] updated from transifex 2018-05-20 02:18:40 +02:00
Jenkins for ownCloud b0aa3a1da0 [tx-robot] updated from transifex 2018-05-19 02:18:42 +02:00
Christian Kamm 0cd2540a69 Add to and rearrange the Changelog for 2.5 2018-05-18 07:43:43 +02:00
Jenkins for ownCloud e680b3f3c8 [tx-robot] updated from transifex 2018-05-18 02:19:19 +02:00
Christian Kamm 2493cbe491 SyncJournal: Explain added file-exists check 2018-05-17 15:02:52 +02:00
Christian Kamm 394ef439e0 Merge branch 'master' into 2.5 2018-05-17 13:23:20 +02:00
Markus Goetz 309c53ca8f macOS: Don't use WAL for sqlite3 in /Volumes
For #6049
2018-05-17 13:19:30 +02:00
Christian Kamm 2638332dc6 Upload: Adjust timeout for final job based on size #6527
Some servers have virus scanners and the like that can delay the
response of the final chunked upload assembly significantly, often
breaking the current 5min (!) timeout. See owncloud/enterprise#2480
for details.
2018-05-17 13:14:37 +02:00
Christian Kamm 5308fc4148 Propagation: Connection closed is a normal error #6516
Because it sometimes appears in conjunction with server bugs and we
don't want to halt all syncing for other files in these cases.
2018-05-17 13:14:20 +02:00
Christian Kamm ad5fbfe05b Wizard: Add a "(recommended)" to the main option #6470 2018-05-17 13:14:03 +02:00
Christian Kamm b1224cff0c SyncJournal: Check file existence even for open dbs #6049
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
2018-05-17 13:08:42 +02:00
Jenkins for ownCloud ce06c96135 [tx-robot] updated from transifex 2018-05-17 02:19:19 +02:00
Christian Kamm 1c4592339a Rename "placeholder" feature 2018-05-16 12:52:32 +02:00
Markus Goetz 0365653055 Sparkle: Delegate calls work now with 1.18.1 (maybe even before)
We can extend on this to give UI feedback.
2018-05-16 11:29:27 +02:00
Jenkins for ownCloud d8078d43fb [tx-robot] updated from transifex 2018-05-16 02:19:12 +02:00
Olivier Goffart fabc706e43 SyncRunFileLog: Add the requestid
https://github.com/owncloud/client/pull/6427#issuecomment-383879509
2018-05-15 18:11:01 +02:00
Olivier Goffart e7e8a62bb7 Blacklist: remember the X-Request-ID
Issue #6420
Store the X-Request-ID in the SyncFileItem and also in the blacklist.
Note that for consistency reason, the X-Request-ID is also in the
SyncFileItem if the request succeeds.

Currently there is no UI to access it, but it can be queried with sql
commands
2018-05-15 18:11:01 +02:00
Christian Kamm f396f2f41d IgnoreEditor: Preserve comments, add #!readonly
Useful in case we ever want to make use of directives inside the ignore
list.
2018-05-15 14:26:35 +02:00
Christian Kamm 8d14f4357a Placeholder: Stop adding ignore pattern
Because we can't make older clients preserve the version directive that
was attached to it.

See #6504 and #6498
2018-05-15 14:26:35 +02:00
Christian Kamm 34d40e6c67 Placeholder: Don't contain "stub" 2018-05-15 14:26:35 +02:00
Christian Kamm c80ee0ea48 Placeholders: Save to key that's invisible to <2.5 clients #6504 2018-05-15 14:26:35 +02:00
Olivier Goffart fb71a90756 FolderWizard: fix crash when experimental feature are disabled
The _placeholderCheckBox only exists if the experimental features are enabled

Found via the crash reporter
https://sentry.io/owncloud/desktop-win-and-mac/issues/556407777/
2018-05-15 12:33:09 +02:00
Olivier Goffart 41dc87c748 Update binary submodule 2018-05-15 12:18:54 +02:00
Christian Kamm 8b952d3741 TestChunkingNG: Remove unneeded test code 2018-05-15 09:42:54 +02:00
Christian Kamm 33b0726390 PropagateUpload: Fix miscount in abort() #6516
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.

Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
2018-05-15 09:42:54 +02:00
Christian Kamm 40e23d3da7 PropagateUpload: Remove unused PropagateUploadFileCommon::abort 2018-05-15 09:42:54 +02:00
Jenkins for ownCloud 97ff3dccb8 [tx-robot] updated from transifex 2018-05-15 02:18:53 +02:00
Dominik Schmidt fd18ece619 Use newer craft cache 2018-05-14 13:40:12 +02:00
Dominik Schmidt fe5e5fcb32 Fix for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt 0f57326057 Fix create_windows_icon_and_rc invocation for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt 886f31456a Add FindIcoTool.cmake 2018-05-14 13:40:12 +02:00
Dominik Schmidt 2d7841204c Support icotool in ECMAddAppIcon macro 2018-05-14 13:40:12 +02:00