Commit Graph
11855 Commits
Author SHA1 Message Date
Markus Goetz 9866010b4c SettingsDialogMac: Fix account display name #6078 2017-10-18 10:41:01 +02:00
Markus Goetz a3c1052cae owncloudcmd: Fix timestamps, Fix --logdebug
We did not set a log handler so there were no timestamps.
The --debug didn't have an effect, let's use --logdebug like in GUI version.
(Command line always outputs some log)

Found in owncloud/documentation#3436
2017-10-18 09:16:05 +02:00
Jenkins for ownCloud 726cbc160c [tx-robot] updated from transifex 2017-10-18 02:19:58 +02:00
Christian Kamm bf39343920 Sync: Add capability for invalid filename regexes #6092 2017-10-17 17:15:49 +02:00
Markus Goetz af24b4132d Packaging: Require ZLIB
For owncloud/enterprise#2295
2017-10-17 16:53:11 +02:00
Markus Goetz d339b68715 Checksums: Use addData function
Our implementation had bad error handling.
This one now uses a new Qt5 addData function.

owncloud/enterprise#2252
2017-10-17 13:26:54 +02:00
Dominik Schmidt 7f51803d04 Only use $(MAKE) in doc target if make is used as generator
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
2017-10-17 12:50:34 +02:00
Jenkins for ownCloud eadc791795 [tx-robot] updated from transifex 2017-10-17 12:43:06 +02:00
Jenkins for ownCloud 408cf11b2b [tx-robot] updated from transifex 2017-10-17 12:40:55 +02:00
Markus Goetz e3ba8d3209 Merge branch 'master' into 2.4 2017-10-17 12:37:20 +02:00
Christian Kamm 17b1c83ae5 Activity: Allow sorting of issues and protocol #6086
The issues tab uses custom ordering where overall and summary sync
issues are displayed first. This ordering is preserved by creating
special sorting logic for the "time" column.

It needed special handling anyway, since sorting by time-string would
have yielded incorrect results.
2017-10-17 09:47:57 +02:00
Christian Kamm b2a8ffc577 Abort: Fix crash with early aborts
_chunkCount could be 0, leading to a floating point exception

I also added initializers for several uninitialized integers in the
upload jobs.
2017-10-17 09:44:52 +02:00
Christian Kamm e2711224ed Propagator: Avoid duplicate async abort 2017-10-17 09:44:52 +02:00
Christian Kamm 2ac7e0200a Test case for #5949 2017-10-17 09:44:52 +02:00
Christian Kamm e6b971b316 TestUtils: Invalidate etags on PUT or chunk-MOVE 2017-10-17 09:44:52 +02:00
Christian Kamm 111bb485ec UploadNG: Avoid div-by-zero for super fast uploads 2017-10-17 09:44:52 +02:00
Piotr Mrowczynski e10775d34f Fix paused sync file move issue #5949
Dont abort final chunk immedietally

Use sync and async aborts
2017-10-17 09:44:52 +02:00
Jenkins for ownCloud 30957479a3 [tx-robot] updated from transifex 2017-10-17 02:18:34 +02:00
Jenkins for ownCloud b4ab53dd32 [tx-robot] updated from transifex 2017-10-16 02:18:33 +02:00
Jenkins for ownCloud a314eeb892 [tx-robot] updated from transifex 2017-10-15 02:18:35 +02:00
Jenkins for ownCloud 644ddf318c [tx-robot] updated from transifex 2017-10-14 02:18:36 +02:00
Christian Kamm f598ac89ac HttpCreds: Fix retry after wrong password #5989
This is an ugly solution.
2017-10-13 14:24:37 +02:00
Christian Kamm 3f7b3ca962 Checksums: Improve logging and add global disable #5017 2017-10-13 13:08:20 +02:00
Jenkins for ownCloud 104c6edcde [tx-robot] updated from transifex 2017-10-13 02:18:37 +02:00
Jenkins for ownCloud 94b673dc8e [tx-robot] updated from transifex 2017-10-12 02:18:38 +02:00
Christian Kamm 096cd348f0 Doc: Update FAQ entry on deeply nested directories #1067 2017-10-11 16:01:46 +02:00
Christian Kamm 01c2ffe2ae PropagateDownload: Read Content-md5 header #6088 2017-10-11 09:06:23 +02:00
Jenkins for ownCloud 0a4370236d [tx-robot] updated from transifex 2017-10-11 02:18:35 +02:00
Jenkins for ownCloud fe8d2b397e [tx-robot] updated from transifex 2017-10-10 02:18:44 +02:00
Christian Kamm 92e90f9c55 Context menu: More detailed status messages
Previously it could only display synchronization progress or "up to
date". Now it also communicates the same overall state that the icon
shows.

See owncloud/enterprise#2134
2017-10-09 14:14:31 +02:00
Jenkins for ownCloud 3eb2642b11 [tx-robot] updated from transifex 2017-10-09 02:18:35 +02:00
Jenkins for ownCloud 99192a6dec [tx-robot] updated from transifex 2017-10-08 02:18:36 +02:00
Jenkins for ownCloud cffc1fd1c4 [tx-robot] updated from transifex 2017-10-07 02:18:37 +02:00
Olivier Goffart b8f7c6daae CMakeLists.txt: Put -pie as a linker flag were it belongs
Fixes warning introduced by PR #6040
2017-10-06 14:35:56 +02:00
Markus Goetz cd07865da6 Settings Dialog: Fix display name compilation for macOS #6078 2017-10-06 13:34:40 +02:00
Thomas Müller 315e38e814 Use display-name from the ocs call in the settings dialog 2017-10-06 10:59:20 +02:00
Jenkins for ownCloud 95b90271b6 [tx-robot] updated from transifex 2017-10-06 02:18:35 +02:00
Christian Kamm 90befac901 Rename detection: File size must be equal
Comparison of file sizes for potential conflicts was added in
0eb9401c62, but did not extend to checking
the file size in case of potential local moves.

This commit adds this check and adds tests for various move+change
scenarios.
2017-10-05 14:17:07 +02:00
Christian Kamm 22f71ce17e t9.pl: Make more reliable
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
2017-10-05 14:13:10 +02:00
Markus Goetz 0931f25747 ChangeLog: Re-format and re-order 2017-10-05 13:07:42 +02:00
Markus Goetz 971f2391cf ChangeLog: More 2.4.0 changes 2017-10-05 12:52:50 +02:00
Christian Kamm 43a26eb50a Excludes: Fix bug with escapes in the regex, add tests 2017-10-05 10:40:53 +02:00
Christian Kamm 99d406072f Excludes: optimize csync_is_windows_reserved_word 2017-10-05 10:19:48 +02:00
Markus Goetz 3a1a56c7ad Excludes: During directory traversal, use QRegularExpression
On Mac, this halves the time spent in csync_excluded_traversal
when using check_csync_excluded_performance. A similar performance
increase is seen on linux.
2017-10-05 10:19:48 +02:00
Jenkins for ownCloud 57cbba81e7 [tx-robot] updated from transifex 2017-10-05 02:18:35 +02:00
Markus Goetz e48d55d126 sqlite: Update bundled version to 3.20.1
For OS X and Windows.
2017-10-04 17:12:12 +02:00
Jürgen Weigert 1c03fa8642 use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin
We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)
2017-10-04 07:49:27 +02:00
Jenkins for ownCloud 670ff36024 [tx-robot] updated from transifex 2017-10-04 02:18:35 +02:00
Jenkins for ownCloud 6b3f6d9860 [tx-robot] updated from transifex 2017-10-03 02:18:33 +02:00
Jenkins for ownCloud ac5876e94e [tx-robot] updated from transifex 2017-10-02 02:18:33 +02:00