Olivier Goffart
12459bf07e
selective sync: fix whitelist matching
2014-08-12 11:43:42 +02:00
Olivier Goffart
b25ef28e82
Selective sync: remember the old list when accepting the dialog even if the tree was not expanded
2014-08-12 11:12:58 +02:00
Olivier Goffart
7e009667a2
Selective sync: ignore the files that are not in the selective sync white list
2014-08-11 18:42:24 +02:00
Olivier Goffart
1f1eb933d1
Move the update job in a new file named discoveryphase
...
"Discovery" is a better name than "update"
2014-08-11 18:42:24 +02:00
Olivier Goffart
aa85e875bd
Selective sync: Add UI to select paths
2014-08-11 18:42:24 +02:00
Daniel Molkentin
1b4c613fa6
ProtocolWidget: Disable copy button if widget is empty.
2014-08-11 16:38:51 +02:00
Klaas Freitag
6cb8134690
SocketAPI: Use Win32 function SHChangeNotify to notify Explorer.
2014-08-07 14:59:06 +02:00
Olivier Goffart
95a77e5ccc
Merge branch 'il'
2014-08-07 14:29:27 +02:00
Olivier Goffart
21783ecef7
SyncEngine: fix permission detection of moves
...
Two problems:
- "M" was used instead of "V"
- The extraction of the parent folder of the destination was wrong
2014-08-07 14:27:27 +02:00
Klaas Freitag
d8a8b53fc9
SocketAPI: Also update view when paused.
2014-08-07 14:07:08 +02:00
Olivier Goffart
6827f9977c
Merge branch 'il'
...
Conflicts:
doc/ocdoc
2014-08-07 12:15:50 +02:00
Olivier Goffart
6d24bd0361
journaldb: Fix that fileid might be missing in the db
...
When recovering from a inalid move operation, we call
avoidReadFromDbOnNextSync. This will remove the fileid from the db so
we don't detect a move on the next sync. But we want the next sync to fetch
the file id again, and this can only happen if we don't read them
from the db and do the actual PROPFIND, this is done by avoidReadFromDbOnNextSync
However, if there is propagation in that source directory later, it
will overide the invalid etag with the real one and we will not uissue the PROPFIND
to fetch the fileid.
We must therefore also protect the future write to the DB when calling
avoidReadFromDbOnNextSync
2014-08-07 12:14:45 +02:00
Markus Goetz
22c1629dd3
SyncEngine: Keep csync_journal with proper values for fileId and remotePerm
...
Before this patch, we had a lot of empty rows because we created
the SyncFileItems with the wrong(=local) data.
2014-08-07 10:14:14 +02:00
Olivier Goffart
55567f8dd2
remove unused variable
2014-08-06 10:20:58 +02:00
Daniel Molkentin
996b7166d2
Merge pull request #2027 from owncloud/l10n-fix
...
Use am. eng. since brit. eng. is handled on transifex
2014-08-05 14:11:20 +02:00
Daniel Molkentin
839b2fa8fd
SocketAPI: Convert to unix path before comparing with black list
2014-08-05 13:11:52 +02:00
Markus Goetz
c313cc02f2
Config: Fix loading of configuration
...
There is a strange bug with Qt, we need to always set the application name, then
we can generate the proper config path.
2014-08-05 00:41:43 +02:00
Klaas Freitag
f983264b5d
SocketAPI: Do not allow a trailing slash for directories.
...
The entries in our sync journal have no trailing slashes for directories.
2014-08-04 12:47:22 +02:00
Klaas Freitag
40cebeedfc
SocketAPI: Call csync_exclude with the relative path.
...
This avoids messing with the windows pathes and csync_exclude is
designed that way.
2014-08-04 12:47:22 +02:00
Klaas Freitag
1f9280c68e
GUI: Remove useless comment.
2014-08-04 12:47:22 +02:00
Klaas Freitag
4fb671e7f4
SocketAPI: Send Broadcasts only for Linux, not used on Mac and Win.
2014-08-04 11:09:17 +02:00
Volkan Gezer
a42e384935
Use am. eng. since brit. eng. is handled on transifex
...
See https://github.com/owncloud/core/pull/10025#issuecomment-50855986 for info.
2014-08-02 04:05:10 +02:00
Klaas Freitag
327f70240c
GUI: Load the finder overlay icon script on MacOSX.
2014-08-01 14:28:34 +02:00
Klaas Freitag
fe9a2e7ba4
SocketAPI: Normalize file names when read from the filesystem.
...
Otherwise there will be bad encoded file names because of a Qt
upstream error that skips the normalization.
2014-08-01 12:18:52 +02:00
Klaas Freitag
3c09ef6cbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-08-01 10:59:49 +02:00
Klaas Freitag
68bfcf5d24
SocketAPI: Create the socket API instance in folderman.
2014-08-01 10:59:49 +02:00
Klaas Freitag
b2a10de71a
Copyright plus minor beautification.
2014-08-01 10:59:49 +02:00
Markus Goetz
f004d5085d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
2014-07-25 12:37:27 +02:00
Klaas Freitag
98e21ae0ad
SocketAPI: Connect REGISTER_FOLDER to Foldermans events.
2014-07-25 12:20:38 +02:00
Klaas Freitag
8b93678e3d
SocketAPI: Added REGISTER_PATH and UNREGISTER_PATH
...
to inform the plugins about the top sync directories.
Also cleaned the code a bit.
2014-07-25 12:11:21 +02:00
Olivier Goffart
3d0c009719
propagator_qnam: Limit the HTTP buffer size when downloading
...
Otherwise the buffer might fill up too quickly and get too large and consume
too much memory which could lead to crash in extreme cases
Should fix issue #1974
2014-07-24 15:43:28 +02:00
Olivier Goffart
208011f6ab
propagator_qnam: add debug output in cae the file changed localy
...
In order to debug https://github.com/owncloud/core/issues/9781
2014-07-24 11:17:59 +02:00
Klaas Freitag
1fb52f0d8b
HTTPCreds: Do delete the WritePasswordJob to not leak memory.
2014-07-23 17:59:02 +02:00
Klaas Freitag
d4de024f15
Propagator: Fix local file name clash detection.
...
Need to normalize the output of QFileInfo::canonicalFilePath() before
comparing to a server side path.
See https://bugreports.qt-project.org/browse/QTBUG-39622
This fixes #1998 and #1999
2014-07-23 17:56:46 +02:00
Olivier Goffart
1d9d88ca85
Always use the dummy crendential while trying to determine the credentials
...
Otherwise the SHibbolethCredential may be set and it has hook to intercept 401
This should fix issue #1908
2014-07-23 14:38:50 +02:00
Eran
2ca8805cda
Removed uneed code
2014-07-23 15:09:28 +03:00
Eran
8e5c41e6f3
Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text
2014-07-23 13:53:05 +03:00
Eran
0f7efbc22e
fixed bug where the overall text caused in the folder view the to defrom
2014-07-23 13:52:02 +03:00
Klaas Freitag
0f4cf74ae0
SyncEngine: allow to do a post upgrade script in debug mode.
2014-07-22 18:07:02 +02:00
Olivier Goffart
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
Olivier Goffart
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
Olivier Goffart
beb9300b4e
network limit: Never wait more than 10 seconds
...
When using the "Limit automatically" limit, we wait for 25% of the time
it took to upload something.
However, if we go to sleep while uploading, the time it took to upload may take
days. And waiting for 25% of a day is too long.
So never wait for more than 10 seconds
This may be related to issue #1880
2014-07-18 12:27:02 +02:00
Olivier Goffart
c35880d4f1
Fix corruption while trying to resume and the server don't suport it
...
Issue #1982
2014-07-18 12:03:45 +02:00
Klaas Freitag
f8bea55b10
SocketAPI: Handle top sync folder correctly.
2014-07-17 19:34:50 +02:00
Daniel Molkentin
72cd84e878
SocketAPI: Exclude drive part from path blacklist check
...
Otherwise, it always matches the ':' part
2014-07-17 19:26:58 +02:00
Daniel Molkentin
35b6d09615
SocketAPI: Fix separators on Windows
2014-07-17 17:41:20 +02:00
Daniel Molkentin
1ae727e70f
SocketAPI: Emit error of binding the server fails
2014-07-17 15:01:01 +02:00
Daniel Molkentin
0e5d0c1170
SocketAPI: Some cleaning up
2014-07-17 15:00:21 +02:00
Klaas Freitag
743c1c2eda
SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect.
...
For each configured sync folder send an UPDATE_VIEW directly after
the socket connect to make the shell integration updating the view.
2014-07-17 11:26:03 +02:00
Klaas Freitag
0e9a08cbbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-07-17 11:25:08 +02:00
