Christian Kamm
7d68c628db
Time estimation: Use a consistent check for size dependence. #2328
2015-04-22 10:45:41 +02:00
Christian Kamm
509b83e73e
Time estimation: Avoid a progress reset before finish. #2328
...
The current algorithm doesn't care much, but resetting progress
to 0 just before completing a job is confusing anyway.
2015-04-22 10:45:41 +02:00
Christian Kamm
0f33e266ce
AccountSettings: Update progress only twice per second. #3014
2015-04-22 10:45:41 +02:00
Carla Schroder
d1e46056ae
Merge pull request #3004 from RealRancor/fix_typo
...
Docs: Added point and missing newline, fixed typo
2015-04-20 10:27:59 -07:00
Olivier Goffart
cf5100a20b
Merge remote-tracking branch 'origin/1.8'
2015-04-20 14:58:45 +02:00
Jocelyn Turcotte
ffbf2fb6ce
Fix the neon build
2015-04-20 11:31:02 +02:00
Markus Goetz
2e4e031795
Declare master as 1.9.0git
2015-04-20 11:22:19 +02:00
Olivier Goffart
b039c2ce86
More change to compile with 5.5
...
The problem is again that QStringList no longer include QDataStream
2015-04-20 09:47:25 +02:00
Jenkins for ownCloud
5a6d286c41
[tx-robot] updated from transifex
2015-04-20 02:18:49 -04:00
Olivier Goffart
ba65187ad3
Fix compilation with Qt 5.5
...
Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase,
we now need to explicitly include QDataStream
Fixes #2809
2015-04-19 11:02:43 +02:00
Jenkins for ownCloud
a91f54f0a8
[tx-robot] updated from transifex
2015-04-19 02:18:31 -04:00
Jocelyn Turcotte
12d7484b85
Pass SyncFileItems by pointer instead of by value
...
Use a QSharedPointer to keep the same ownership and
continue passing the SyncFileItems as a const& when
ownership isn't taken. This allows sharing the same
allocations between the jobs and the result vectors.
This saves about 20MB of memory (off 120MB) once all
jobs are created.
2015-04-18 14:26:40 +02:00
Jenkins for ownCloud
d77c1f3e4a
[tx-robot] updated from transifex
2015-04-18 02:18:24 -04:00
Daniel Molkentin
7390ddbd98
Mac OS: The Resource/ folder in Qt frameworks might not exist
...
Make sure to create it
2015-04-17 13:31:05 +02:00
Daniel Molkentin
32a4b40f0a
Remove wrongly-commited file
2015-04-17 12:50:08 +02:00
Jenkins for ownCloud
bc1bc2a4f8
[tx-robot] updated from transifex
2015-04-17 06:49:42 -04:00
Jocelyn Turcotte
155c965866
Prevent another crash in ~SocketApi #3118
...
Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.
Fix the issue by simply making sure that _localServer is destroyed
first.
2015-04-17 12:42:40 +02:00
Olivier Goffart
6c73f25747
HTTP creds: Fix translation of the password input dialog
...
tr() needs Q_OBJECT
2015-04-17 12:19:37 +02:00
Daniel Molkentin
2518fd7059
Merge pull request #3126 from owncloud/equal_user_agents
...
Use identical User Agents for csync and the Qt parts
2015-04-17 10:16:09 +02:00
Jenkins for ownCloud
56edae6958
[tx-robot] updated from transifex
2015-04-17 02:18:43 -04:00
Daniel Molkentin
d8275cd4e1
Use identical User Agents for csync and the Qt parts
...
Also, use the mirall version for ocsync.
Currently, the csync engine part and the Qt part have different UAs,
and this makes debugging (i.e. reading access logs) difficult. On
top, we haven't increased the ocsync version number in ages. So
as a consequence, I think it would be the best to have ocsync
and the rest share the same version number, and make them identify
with the same user agent.
To ease debugging for our side, we'll still append "(csyncoC)"
for calls made by csync.
2015-04-16 20:58:51 +02:00
Daniel Molkentin
c3dca7a288
OS X: Actually Make the signing script fail on failure
...
Addresses #3114
2015-04-16 16:35:09 +02:00
Daniel Molkentin
96ff0076c7
Fix mac deployment again
2015-04-16 16:35:09 +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
