dragotin
c38c3ce6e2
Merge pull request #1450 from owncloud/remove-file-string
...
remove 'File' word from notification
2014-02-20 17:31:57 +01:00
Olivier Goffart
f5e16540a1
Merge branch '1.5'
...
Conflicts:
src/mirall/owncloudpropagator.cpp
2014-02-19 15:38:03 +01:00
Olivier Goffart
e74f0f2854
Better support when user remove or rename the Shared directory
2014-02-19 15:23:36 +01:00
Markus Goetz
65ffe53c20
Register metatype at better place
2014-02-19 14:53:31 +01:00
Markus Goetz
06f2989ac8
Fix build on Qt4
...
Unfortunately I had to remove the 'static'
2014-02-19 13:29:00 +01:00
Olivier Goffart
a51f050a08
More fix for moving shared directories
...
Abort a directory job if the first job fails
Also make sure the jobs are in the directory job of their destination paths
2014-02-19 13:08:35 +01:00
Olivier Goffart
1be322579c
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-02-19 11:19:56 +01:00
Markus Goetz
b7c7c9f3eb
Accountsettings: Fix warning
2014-02-19 10:59:57 +01:00
Markus Goetz
63083a558b
OwncloudCmd: Print update phase duration values
2014-02-19 10:51:04 +01:00
Olivier Goffart
d4bd327fef
Merge branch 'parallel_upload'
...
Conflicts:
src/mirall/csyncthread.cpp
2014-02-19 10:24:34 +01:00
Olivier Goffart
2de288c5f3
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
VERSION.cmake
2014-02-19 10:21:23 +01:00
Markus Goetz
fcc0e89044
Update phase: Allow benchmarking / progress update
2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt
8267b9e590
remove 'File' word from notification
2014-02-18 18:42:49 +01:00
Klaas Freitag
e4965ab06b
Mac FS watcher: ignore events from the same process
2014-02-18 16:28:25 +01:00
Olivier Goffart
496d900fee
Refactor the renameReplace in its own function
...
Share a bit more code between legacy and qnam download job
2014-02-18 14:05:52 +01:00
Olivier Goffart
58bda69f8b
PropagateRemoteRename is not a legacy job
...
move it back to propagatorjobs.cpp
2014-02-18 13:52:40 +01:00
Olivier Goffart
89b5ddec56
Fix the logs in the update phase
...
Since csync use a thread local variable for the logs, we need
to reset it when we enter the update thread
2014-02-18 13:48:13 +01:00
Olivier Goffart
f7419094f3
move the file system helpers in their own file
2014-02-18 12:54:40 +01:00
Olivier Goffart
432f377750
Use the legacy jobs when using bandwidth limiting
...
Or if a environement variable is set
2014-02-18 12:24:35 +01:00
Olivier Goffart
c32beb957d
Move the jobs around between files
...
Renamed owncloudpropagator_qnam to propagator_qnam
Move the jobs in propagatorjobs.cpp
Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and
rename the jobs accordingly
2014-02-18 12:21:05 +01:00
hefee
1b03dc759b
fixing typo
...
GNU Public License-> GNU General Public License
2014-02-17 22:42:51 +01:00
Olivier Goffart
a39caa1cda
Make owncloudcmd work with the parallel upload/download
...
Also make it work when there syncing a remote subfolder
2014-02-17 17:31:03 +01:00
Olivier Goffart
a4ee8d6f6f
Remove unused function
2014-02-17 15:25:47 +01:00
Olivier Goffart
b35e38f80f
Parallel download
2014-02-17 13:48:56 +01:00
Klaas Freitag
e134ae22ac
Disable explorer.exe integration on WinXP
2014-02-13 17:21:30 +01:00
Daniel Molkentin
e66757335b
Theme: Update general disclaimer.
2014-02-13 17:04:52 +01:00
Olivier Goffart
7b6269b4bf
Fix chunking
...
- Do not start them in parallel, start them in sequence instead, as they are quite
and there are already other jobs running in parallel normaly
- Do not load the fill into memory
- Support resuming
2014-02-13 14:02:05 +01:00
Markus Goetz
8b9cd432b5
OS X: Read system-wide plist in /Library
...
Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates
2014-02-13 12:52:57 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
Daniel Molkentin
fd40a25030
Use the appName (which is the short name) instead of the full length name
...
The full length name is allowed to change (or should be)
2014-02-12 18:06:01 +01:00
Daniel Molkentin
05ae467cd5
Remove debug
2014-02-12 18:05:28 +01:00
Daniel Molkentin
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
Daniel Molkentin
bcf73cfc40
SSLButton: Omit arrow on Windows which can't display it
2014-02-12 17:55:05 +01:00
Daniel Molkentin
f79ecfe001
more verbose ssl error logging
2014-02-12 17:54:45 +01:00
Olivier Goffart
a4442ebb40
Merge branch 'master' into parallel_upload
...
Conflicts:
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-12 16:50:45 +01:00
Olivier Goffart
93f31fa9d7
Merge branch '1.5'
2014-02-12 16:44:24 +01:00
Olivier Goffart
f35b1f8a2b
Only starts 6 jobs in parallel
2014-02-12 16:33:55 +01:00
Olivier Goffart
6db8daabf7
Make abort work even when there are parallel uploads
2014-02-12 16:33:55 +01:00
Olivier Goffart
a677f97b7f
Fix removing and renaming directories from the Shared directory
2014-02-12 13:44:55 +01:00
Olivier Goffart
01c0a3c099
use Utility::sleep
2014-02-12 11:16:27 +01:00
Markus Goetz
153aa31da2
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
(cherry picked from commit 104cf680a6
2014-02-12 11:14:43 +01:00
Markus Goetz
8c9a65635f
Propagator: Fix compilation
...
It is still protected on Qt4
2014-02-10 15:46:09 +01:00
Markus Goetz
104cf680a6
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
2014-02-10 15:42:46 +01:00
Markus Goetz
79d14f0760
Propagator: Use cross platform sleep function
2014-02-10 14:34:48 +01:00
Klaas Freitag
6387777c18
Added chunking for the new uploading.
2014-02-10 13:00:22 +01:00
Klaas Freitag
41a4f1fc37
Only wait half a second before the next folder sync is started.
2014-02-07 11:53:58 +01:00
Olivier Goffart
bb378902ae
Also force an update of the etag in case of renames
...
Imagine we have a file:
foo/bar/moo
if we do mv 'foo' 'foo2' and that we issue a MOVE on the server
and will update the entry 'foo' in the database with the new etag
If we write the etag of foo but not the etag of the sub item, when
we read from db on the next sync, we will miss them and beleive they
have been removed on the server
2014-02-06 17:56:27 +01:00
Olivier Goffart
8f1494f8f2
Report an error if fetching the etag fails
...
Very important in case of renames, else, if the server did not perform
the rename, we may end up deleting the files
2014-02-06 17:56:27 +01:00
Daniel Molkentin
ccb45bfea6
Move code from HTTPCredentials to more generic locations
...
This is a preparation to make them usable from the Shibboleth
credentials class.
2014-02-06 13:02:01 +01:00
Olivier Goffart
f67d2e6418
Start all the jobs in parallel
2014-02-06 12:11:45 +01:00
