Eran
3406fcdce4
Merge branch 'master' of https://github.com/owncloud/mirall into dark-eye-master
...
Conflicts:
src/mirall/progressdispatcher.h
2014-06-06 18:56:58 +03:00
Olivier Goffart
abf0f90a13
SocketAPI: broadcast change when an item is done
2014-06-06 15:52:55 +02:00
Klaas Freitag
4d5c74c019
SocketAPI: Add another API call for stat of file and folder separately.
2014-06-06 15:38:20 +02:00
Markus Goetz
fd4642d827
Folder: Don't add ignored files on startup
...
Before each sync is enough.
(We could do it at startup only, but so far it is good to have
it at each sync so we can easier see stuff in the log)
2014-06-05 17:50:18 +02:00
Daniel Molkentin
3934fa019e
SocketAPI: proper name for pipe on windows
2014-06-05 12:02:57 +02:00
Daniel Molkentin
7fcf6f9f79
Merge branch '1.6'
2014-06-05 12:01:50 +02:00
Olivier Goffart
7a7b0e8939
propagator: Ignore new directory inside removed directory.
...
This fixes te bug if one create a tree of folders and subfolders
and delete them while they are uploading. Some folder would
reappears
2014-06-04 16:37:46 +02:00
Olivier Goffart
a4f6370774
propagator: do not update perent directory etag before sub directories are removed
...
Direcotries are removed at the end, and we don't want to update
parent directory etag before the delete is performed, or the next
sync may read from db and think the files are not removed.
Issue #1845
2014-06-04 12:31:30 +02:00
Markus Goetz
233450d850
CSync: Remove config dir setting
2014-06-04 10:56:56 +02:00
Olivier Goffart
582a8fe7fd
Merge branch '1.6'
2014-06-03 17:27:12 +02:00
Olivier Goffart
abafbef985
Optimize move
...
Do not send the mtime for each file without a directory, because the server now keeps it
2014-06-03 17:27:06 +02:00
Olivier Goffart
6e10b8c5c4
Propagator: Recover from 'precondition failed' error
...
When we detect a precondition failed, it is possible that it is
because the etag in the database is wrong. We must therefore not
read from the database on the next sync. In order to avoid that, we
reset the etag of parent directories to invalid values
Fixes #1767
2014-06-03 17:22:40 +02:00
Olivier Goffart
24616bead4
Fix syncing a folder with '#' in the name
...
Or an url with '#'
Fixes #1838
The problem is a bug fixed in Qt5 now breaks.
In Qt4, QUrl::setPath() did not properly handle path with '#' in them
and QUrl::toString would restitute the '#'.
But csync will blindly do "uri + path" before passing the path to
VIO. because csync_update has no idea that the VIO plugin need special
encoding, the encoding cannot be done there. But csync_owncloud then
encodes the full path. So if the uri contains '#', it must not be already
encoded or there will be two encoding.
2014-06-03 15:45:10 +02:00
Markus Goetz
4d4eab8b1c
CSync & Propagator: Support a direct download URL
...
This is for server file backends that support sending a
direct URL.
2014-06-03 14:55:34 +02:00
Markus Goetz
b8e20b412c
CSync: We can access the context directly
2014-06-03 11:51:12 +02:00
Markus Goetz
5ee00a8df7
CSync: Simplify csync_owncloud stat/resource handling
2014-06-03 11:51:12 +02:00
Klaas Freitag
1af3d3f18b
More descriptive error message when querying the database without hit.
2014-06-03 09:50:09 +02:00
Klaas Freitag
f54248c0a7
Minor cleanups and changes
2014-06-03 09:50:09 +02:00
Klaas Freitag
2911c0e1c4
Add a recursiveFolderStatus method
2014-06-03 09:50:09 +02:00
Daniel Molkentin
746c15b4aa
Remove debug layout
2014-06-02 19:38:04 +02:00
Daniel Molkentin
7e65c9741e
[Shib] Ensure only one fetch job can open the browser
2014-06-02 17:41:49 +02:00
Markus Goetz
022a3fcd92
OS X: Fix localFileNameClash
...
We need to compare the other way round and compare only the file name
because our sync directory might be symlinked and then resolve to
another canonical path (but we were only interested in the filename part
anyway)
2014-05-30 15:47:53 +02:00
Olivier Goffart
0151682a53
Make sure that OwncloudPropgator::finished is only emit once
...
When we abort, each job currently running may result in a call to finished().
It used to cause a crash because we would unlock the _syncMutex twice
Fixes #1793
2014-05-29 12:15:13 +02:00
Olivier Goffart
864f2cdc7d
remove the _syncMutex and replace it by a simple bool
2014-05-29 11:35:13 +02:00
Eran
cd82a8585a
change the text to be a little more descriptive and use shorthand in the context menu
2014-05-29 00:09:02 +03:00
Daniel Molkentin
0c1ab533e6
Do not trim serial numbers
...
This broke in a refactoring. The 'true' was interpreted as length of 1.
Fixes part of #1436
2014-05-28 21:16:00 +02:00
Olivier Goffart
1dd7f736d0
Fix another crash at exit
...
Fixes #1794
2014-05-28 19:59:35 +02:00
Olivier Goffart
571c199db8
remove broken connection
...
Fixes #1822
2014-05-28 18:11:39 +02:00
Daniel Molkentin
3d2a2df86f
Allow to set a smaller timeout value in the config file
...
Added to debug #1724
2014-05-28 16:28:22 +02:00
Daniel Molkentin
86a48b52e9
Shib: Show a notification whenever the shib session times out
...
This is designed as a passive popup notification so that it will
not surprise or annoy the users.
Fixes Enterprise issue #179
2014-05-28 15:25:43 +02:00
Olivier Goffart
ebe1f986f1
Only remove session cookies
...
This should disconnect without loosing long lived cookie
2014-05-28 15:24:14 +02:00
Eran
6927fc80c3
change the mapping to use short hand and also made the mapping logic a little losser
2014-05-28 13:09:30 +03:00
Olivier Goffart
dd1152dd4f
Clear all cookies when loging out
2014-05-28 11:41:06 +02:00
Olivier Goffart
ce9bfd319a
Fix the sib window re-appearing.
...
When the windows is accepted, do not emit fetched which means the process is finished
one must first check the username is valid
2014-05-28 10:18:57 +02:00
Daniel Molkentin
f591ac6549
CookieJar: Reduce debug noise
2014-05-28 10:05:32 +02:00
Daniel Molkentin
4fd368c992
ShibCredentials: Ensure that _stillValid is not reset while the browser window is open
...
This will cause the browser window to open again after it has been told to close
if a network job has run in the background while the browser window was visible.
Fixes #1814
2014-05-28 10:05:32 +02:00
Eran
89a95d6445
fixed comment spelling
2014-05-28 08:28:03 +03:00
Klaas Freitag
e275ad3866
Emit the sync finished signal a bit delayed.
...
This allows folder watcher events comnig in before the sync is marked
finished. This avoids "endless syncing" as described in bug #1808
2014-05-27 11:35:07 +02:00
Olivier Goffart
5813f63df8
Do not runs the check connection timer when there is no configured account
...
in order to avoid popup of the wizzard every 32 seconds
Fixes #1812
2014-05-27 11:05:09 +02:00
Klaas Freitag
449c00f019
No need to check for case preserving filesystem here.
...
That is done in the utility function instead.
2014-05-26 18:28:52 +02:00
Klaas Freitag
6017eb7ca6
Case clash check for local remove plus native separators.
2014-05-26 18:28:25 +02:00
Klaas Freitag
f1b2417967
Add check for case clash for legacy propagator download.
2014-05-26 18:28:25 +02:00
Klaas Freitag
181383e5f1
Check for case preserving file system in localCaseClash
2014-05-26 18:28:25 +02:00
Markus Goetz
c1b9d5c653
Propagator: Implement localFileNameClash for OS X
2014-05-26 17:36:52 +02:00
Klaas Freitag
964c3ac7bf
Check for local file name clash before local renaming.
...
Return a proper error message in case.
2014-05-26 17:00:40 +02:00
Daniel Molkentin
6d8afabf41
Find export macro
2014-05-26 16:33:04 +02:00
Daniel Molkentin
0a7dbeb778
Export CookieJar
2014-05-26 16:29:26 +02:00
Daniel Molkentin
0582abe8dd
Shib: Wizard: Return to IdP selection when returning to creds page
2014-05-26 15:57:01 +02:00
Eran
f9192e27fa
added "/s" to the bandwidth
2014-05-26 16:25:33 +03:00
Olivier Goffart
81f410970f
ammend previous change
2014-05-26 15:01:26 +02:00
