Olivier Goffart
2da3bfb96f
Merge branch 'master' into new-ui
2015-04-16 12:50:21 +02:00
Olivier Goffart
5dffd11755
Merge branch '1.8'
2015-04-16 12:49:31 +02:00
Olivier Goffart
8bb4af067a
Propagate download: Fix restoring files for which the conflict file exists
...
For issue #3106
1) Always use the actual timestamp from the file in the file system
to create the conflict file. This is important because if one edit a
file several time, they should have different name. Also it makes more
sens to have the mtime of the modified file.
2) Give the correct size to the job so we know when the temporary file
is complete in case of resuming.
2015-04-16 11:36:01 +02:00
Jenkins for ownCloud
df0df76b51
[tx-robot] updated from transifex
2015-04-16 02:18:36 -04:00
Olivier Goffart
458f336405
PropagateDownload: Read the mtime from the file system after writing it
...
Because file system like FAT only have two second accuracy and would result
in a upload if the mtime in the database is not the same as the one that was
downloaded
Issue #3103
2015-04-15 15:50:20 +02:00
Daniel Molkentin
3f3f27d4d3
1.8.1 beta 1
2015-04-15 15:33:17 +02:00
Markus Goetz
7c9cffa5ae
ConfigFile: Remove unused functions
2015-04-15 14:58:27 +02:00
Markus Goetz
996223197c
Translations: Attempt two for Serbian #3083
2015-04-15 12:31:25 +02:00
Jenkins for ownCloud
b8e7555977
[tx-robot] updated from transifex
2015-04-15 02:18:35 -04:00
Daniel Molkentin
ed80a712ab
Sort folder sizes SelectiveSyncTreeView numerically
...
Fixes #3112
2015-04-14 20:00:42 +02:00
Markus Goetz
2866e56c51
LsColXMLParser: More testing 2
2015-04-14 14:56:25 +02:00
Markus Goetz
2074bdbb19
LsColXMLParser: More testing
2015-04-14 14:41:48 +02:00
Klaas Freitag
d212ac7d16
test xmlparser: Verify call to parse()
2015-04-14 13:45:09 +02:00
Klaas Freitag
d2bae21b14
Added unit test for XML Parser class.
2015-04-14 13:43:05 +02:00
Klaas Freitag
4283ab3b44
LsColJob: Create a XML parser object for better unit testability.
2015-04-14 13:43:05 +02:00
Klaas Freitag
c579069071
LsColXMLParser: let parse return bool.
2015-04-14 13:41:51 +02:00
Jenkins for ownCloud
88488c695c
[tx-robot] updated from transifex
2015-04-14 02:18:33 -04:00
Markus Goetz
21594e9aa9
Translations: Try to add Serbian #3083
2015-04-13 18:27:28 +02:00
Markus Goetz
9ffacd4ecd
Discovery: Explicitly check for XML parser errors
...
..instead of relying that our state machine does not do anything in that case.
2015-04-13 16:04:24 +02:00
Markus Goetz
9d5f5ea3bc
Discovery: Initialize error with EIO in constructor
...
This is safer, initializing it in remote_vio_opendir_hook was enough though.
2015-04-13 15:54:08 +02:00
Markus Goetz
2dbd27af76
Discovery: Initialize error with EIO
2015-04-13 15:36:07 +02:00
Markus Goetz
0634a4d0c6
Discovery: Add a sanity check when results are parsed
2015-04-13 15:10:04 +02:00
Markus Goetz
fa80a006b8
CSync: Log if file_id is too long
2015-04-13 14:58:25 +02:00
Olivier Goffart
9d88ef5432
Restore submodule
2015-04-13 13:03:46 +02:00
Klaas Freitag
7b99877c68
owncloudcmd: Filter out empty lines in selectivesync
2015-04-12 12:59:25 +02:00
Klaas Freitag
ec81cdefb0
Networkjobs: Only log a subset of the account url.
...
This avoids disclosing of user and password in the logfile which can
happen in some cases.
2015-04-12 12:37:14 +02:00
Jenkins for ownCloud
454d5b575c
[tx-robot] updated from transifex
2015-04-12 02:18:27 -04:00
Jenkins for ownCloud
785b59e6d1
[tx-robot] updated from transifex
2015-04-11 02:18:26 -04:00
Christian Kamm
9d8fc4aa4d
ProtocolWidget: Fix adding of seconds. #2535
2015-04-10 12:11:35 +02:00
Christian Kamm
57ac1d9ea2
AuthRedirect: Use the configured DAV path. #3082
2015-04-10 09:24:25 +02:00
Christian Kamm
d9ea6936ab
Handle redirect of auth request. #3082
2015-04-10 09:18:15 +02:00
Olivier Goffart
afdd01488f
AccountManager: Move out of libsync
...
The AccountManager does not belong in the libsync because it is not
part of the synchronisation algorithm, but is just an helper class
for the UI to maintain the account and read/save the config
2015-04-09 16:19:17 +02:00
Olivier Goffart
c917251e9e
Reconcile: Fix clang warning
...
csync_reconcile.c:159:26: warning: address of array 'tmp->path' will always evaluate to 'true' [-Wpointer-bool-conversion]
if( tmp->path ) {
~~ ~~~~~^~~~
csync_file_stat_s::path is an array so it is never null
What was meant here is to check if the string was not empty
2015-04-09 15:06:48 +02:00
Olivier Goffart
f3cb5f8a9d
Merge remote-tracking branch 'origin/1.8'
2015-04-09 14:24:26 +02:00
Olivier Goffart
85ff245aef
Account settings: add the progress back on the new ui
2015-04-09 12:06:47 +02:00
Jenkins for ownCloud
c805c5d6e9
[tx-robot] updated from transifex
2015-04-09 02:18:32 -04:00
Christian Kamm
adcf40afc3
Discovery: Speed up initial run. #2796
2015-04-08 15:43:49 +02:00
Christian Kamm
d986011067
Sync: Fix sync of deletions during 503. #2894
2015-04-08 10:50:08 +02:00
Roeland Jago Douma
5a83636f81
Only show share dialog if we are connected.
2015-04-08 09:53:57 +02:00
Jocelyn Turcotte
d475628c70
SyncEngine: Fix a crash in csync_vio_file_stat_copy #3051
...
In some cryptic cases where the getetag property wasn't returned by
the server, we might be trying to c_strdup a null pointer in
csync_vio_file_stat_copy.
At least avoid crashing in this case by looking for
CSYNC_VIO_FILE_STAT_FIELDS_ETAG, like csync_vio_file_stat_destroy
does.
2015-04-08 09:35:43 +02:00
Jocelyn Turcotte
4a890eae38
SyncEngine: Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051
...
The default constructor of the iterator points to NULL, which makes
it != end() but invalid to dereference.
Use an integer index instead to keep 0 as a valid default value that
can always correctly be checked against size().
Also make sure that no data is shared between threads by making the
csync_vio_file_stat_t copyable and passing it as const.
2015-04-08 09:35:43 +02:00
Christian Kamm
760e11bc5d
Sharedialog: Fix compiler warnings.
2015-04-08 08:59:36 +02:00
Jenkins for ownCloud
96ebf2b519
[tx-robot] updated from transifex
2015-04-08 02:18:30 -04:00
Klaas Freitag
4a6f4919d7
More GUI refinements.
2015-04-07 13:38:01 +02:00
Klaas Freitag
b98040c7d5
ShareDialog: handle resize properly with elided text
2015-04-07 13:38:01 +02:00
Klaas Freitag
1240a8163d
ShareDialog: Some GUI rework requested by Jan.
2015-04-07 13:38:01 +02:00
Olivier Goffart
e15b9b5358
Merge remote-tracking branch into 1.8
2015-04-07 10:42:27 +02:00
Olivier Goffart
1617c9d482
PropfindJob: fix xml parsing
...
It would only find the first property
2015-04-07 10:35:27 +02:00
Jenkins for ownCloud
16600fe86a
[tx-robot] updated from transifex
2015-04-07 02:18:46 -04:00
Olivier Goffart
50ba73860c
Merge remote-tracking branch into 1.8
2015-04-07 08:02:55 +02:00
