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
Roeland Jago Douma
9eabd2a32a
Merge pull request #6 from nextcloud/mergeWithOrigin
...
Update master from current owncloud master
2017-10-09 08:50:13 +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
19c6757a0f
Rename detection: File size must be equal
...
Comparison of file sizes for potential conflicts was added in
0eb9401c62
2017-10-05 22:01:42 +02:00
Christian Kamm
3636a59830
t9.pl: Make more reliable
...
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
2017-10-05 22:01:42 +02:00
Markus Goetz
548302c367
ChangeLog: Re-format and re-order
2017-10-05 22:01:42 +02:00
Markus Goetz
a64a33c589
ChangeLog: More 2.4.0 changes
2017-10-05 22:01:42 +02:00
Christian Kamm
01bbbb7d08
Excludes: Fix bug with escapes in the regex, add tests
2017-10-05 22:01:42 +02:00
Christian Kamm
f609ea3bef
Excludes: optimize csync_is_windows_reserved_word
2017-10-05 22:01:42 +02:00
Markus Goetz
91223b1a3d
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 22:01:42 +02:00
Jenkins for ownCloud
ca0f9825ce
[tx-robot] updated from transifex
2017-10-05 22:01:42 +02:00
Markus Goetz
f202593ce4
sqlite: Update bundled version to 3.20.1
...
For OS X and Windows.
2017-10-05 22:01:42 +02:00
Jürgen Weigert
d8ed9e5bde
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-05 22:01:39 +02:00
Jenkins for ownCloud
c436b36b89
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
980bab422a
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
6fbd3cf61a
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
e6e1f765bd
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
b2fe501706
[tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
rockihack
2bfd85e3c7
Linux Hardening
...
see: https://wiki.debian.org/Hardening#User_Space
2017-10-05 22:01:38 +02:00
Jenkins for ownCloud
e1eb374ac3
[tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
Jürgen Weigert
ea2c3828cb
Update clean_tarball.sh
...
warning against removing sqlite. it is used with Linux with cmake switch on CentOS6
USE_OUR_OWN_SQLITE3=TRUE
2017-10-05 22:01:38 +02:00
