Jenkins for ownCloud
1dae928a7c
[tx-robot] updated from transifex
2014-09-16 01:25:22 -04:00
Olivier Goffart
9b1779bb06
Fix compilation
...
qFatal does not work with <<
2014-09-15 18:03:44 +02:00
Olivier Goffart
97cc05eeea
journaldb: Assert in case of SQL error
...
relates issue #2106
2014-09-15 14:27:39 +02:00
Christian Kamm
20dd3b0a69
FolderMan: Fix startFromScratch logic. #1989
...
(cherry picked from commit 4566ca3127
2014-09-15 13:53:38 +02:00
Christian Kamm
f348eabf19
Account: Fix cert save/restore from settings. #2160
...
(cherry picked from commit cc1121ef00
2014-09-15 13:53:38 +02:00
Olivier Goffart
5870a57002
wizard: fix start a clean sync
...
The problem was that the backup function failed as we tried to
move /home/xxx/ownCloud/ to /home/xxx/ownCloud/.oC_bak
The intention was to move it to /home/xxx/ownCloud.oC_bak
Issue #1989
2014-09-15 13:49:13 +02:00
Olivier Goffart
278bc5a8cd
owncloudcmd: ask for the login and password and put it in the url (if it's not there already)
...
Because we cannot rely on HTTPCredentials to open windows in a command line tool
Fixes #1860
2014-09-15 13:24:31 +02:00
Jenkins for ownCloud
3c89415df1
[tx-robot] updated from transifex
2014-09-14 01:25:21 -04:00
Jenkins for ownCloud
5981f700f5
[tx-robot] updated from transifex
2014-09-13 05:16:21 -04:00
Olivier Goffart
af5e8ee18c
AbstractNetworkJob
...
Abort the transfer in case of timeout.
This avoid that a connection that never replies blocks mirall
Issue #2148
2014-09-12 18:06:29 +02:00
Olivier Goffart
52e8343f76
ConnecitonValidator: Handle the timeout
...
otherwise the account may be stuck in a disconnect case if there is a timeout
Issue #2148
2014-09-12 18:06:17 +02:00
Olivier Goffart
a4dbf5942c
owncloudcmd: restart the sync if required
...
Fixes #2038
2014-09-12 17:23:01 +02:00
Daniel Molkentin
ada1d42ebf
Sparkle requirement bumped to 1.8
2014-09-12 16:08:52 +02:00
Daniel Molkentin
f27182ae05
fFx Utility::freeDiskSpace for win32
2014-09-12 16:08:52 +02:00
Markus Goetz
2fddf05515
OS X: Overlay Icons: Load from bundle-specific path
...
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
2014-09-12 15:09:47 +02:00
Markus Goetz
91d1864840
OS X: Overlay Icons: Less verbose debug output
2014-09-12 15:09:46 +02:00
Daniel Molkentin
6e42ee1bd4
Merge pull request #2194 from tim-vandecasteele/fix-apple-build
...
Fix apple build.
2014-09-12 14:39:26 +02:00
Tim Vandecasteele
f3cc614427
Fix apple build.
...
The apple build was broken because the elseif in the CMakeLists is never triggered.
Some code was not properly adapted for the new qtmacgoodies.
Some paths were not adapted to new split.
2014-09-12 14:24:26 +02:00
Olivier Goffart
79052ba7c6
Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system
...
Issue #1985
2014-09-12 14:13:04 +02:00
Markus Goetz
0edd4d3c02
OS X: Overlay icons: Don't show if folder is not marked as being an oC folder
2014-09-12 11:46:53 +02:00
Jenkins for ownCloud
71516c480d
[tx-robot] updated from transifex
2014-09-12 03:28:04 -04:00
Markus Goetz
4960890d70
Propagator: Commit the DB for Poll Jobs
2014-09-11 12:05:35 +02:00
Olivier Goffart
76f0f3cbf2
csync_vio_local on windows: fix overflow when computing the size of file > 4GiB
...
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
2014-09-11 11:10:58 +02:00
Jenkins for ownCloud
1304c2c4ab
[tx-robot] updated from transifex
2014-09-11 01:25:22 -04:00
Olivier Goffart
a84b7dc27e
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
2014-09-10 17:27:33 +02:00
Daniel Molkentin
927af0adec
Fix build on win32: add missing export
2014-09-10 16:31:47 +02:00
Daniel Molkentin
2dfbc2058f
Win32: ignore files ending in '.' or at least one space
...
Fixes #416
Fixes #2176
2014-09-10 15:21:19 +02:00
Olivier Goffart
79ee6c2f3b
csync_vio_local on windows: fix overflow when computing the size of file > 4GiB
...
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
2014-09-10 13:21:31 +02:00
Daniel Molkentin
f59a6862ca
raiseDialog: Actually send the XEvent
...
Amendment to 25c274a0bd
2014-09-10 13:21:27 +02:00
Olivier Goffart
fa962b7f53
csync_update: fix compilation warning
2014-09-10 11:08:00 +02:00
Olivier Goffart
71408bab60
I forgot to rename one of the while list to the blacklist
2014-09-10 11:01:38 +02:00
Jenkins for ownCloud
9e015eb654
[tx-robot] updated from transifex
2014-09-09 01:25:24 -04:00
Markus Goetz
4ce03e8b61
OS X: Fix Overlay icon retrieval
...
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
2014-09-07 11:38:23 +02:00
Jenkins for ownCloud
68b7f412b6
[tx-robot] updated from transifex
2014-09-07 01:25:23 -04:00
Jenkins for ownCloud
20011f3a84
[tx-robot] updated from transifex
2014-09-06 01:25:23 -04:00
Daniel Molkentin
2d020b5989
Merge pull request #2138 from owncloud/cleanup_shell_integration_nautilus
...
Cleanup and make python3 compatible shell integration nautilus
2014-09-05 15:48:16 +02:00
Markus Goetz
1909b465dc
CSync: Show file size and inode during update traversal
...
With the previous code, we saw those values only when the file/dir was also in the local DB
2014-09-05 15:23:33 +02:00
Christian Kamm
88b7f2e0ee
SyncJournal: Don't use C++11 features.
2014-09-05 12:48:45 +02:00
Markus Goetz
f5f04bcc4b
SyncEngine: Always return _renameTarget in destination() if possible
...
We want to do this since the instruction is actually ERORR, not RENAME.
2014-09-05 10:07:24 +02:00
Jenkins for ownCloud
531d586460
[tx-robot] updated from transifex
2014-09-05 01:25:28 -04:00
Christian Kamm
2630a73a1c
Propagator: Use csync to get the modification time.
...
See owncloud/core#9781
2014-09-04 14:16:23 +02:00
ckamm
4decd15ca9
Merge pull request #2161 from ckamm/stale-downloadinfo
...
Clean up stale journal entries and temporaries. #2057
2014-09-04 14:14:39 +02:00
ckamm
3a59dd24f3
Merge pull request #2162 from ckamm/error-missing-exclude
...
Don't do a broken sync when the system exclude file is missing
2014-09-04 14:14:07 +02:00
Olivier Goffart
c232411e96
uploading: make sure to cast to uint64 to avoid integer overflow
2014-09-04 13:46:01 +02:00
Christian Kamm
1cf1f6edcb
Fix style issues.
2014-09-04 13:27:11 +02:00
Christian Kamm
5d36a27893
Clean up stale journal entries and temporaries. #2057
...
* Downloadinfo entries for files that no longer need to be downloaded
are useless and can be removed. In particular, the temporary files
holding partially retrieved files are now deleted when no longer
necessary.
* The same is true for blacklist entries for paths that are no longer
being discovered.
* Same for uploadinfos for files that no longer need to be uploaded.
2014-09-04 13:14:15 +02:00
Christian Kamm
da94533647
Folders: Signout should not switch folders to paused state. #2112
...
On signout, syncs that are running in folders are aborted. That used to
also switch the state of these folders to 'paused'. To fix that, aborts
that are caused by user actions no longer change the folder paused
state.
Aborts due to errors should still pause folders! Otherwise we'd try
resyncing them even though there was an error.
2014-09-04 11:21:28 +02:00
Jenkins for ownCloud
db08d5021e
[tx-robot] updated from transifex
2014-09-04 01:25:25 -04:00
Markus Goetz
69066013c1
ownCloudTheme: Fix casing in appName()
...
Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.
2014-09-03 17:30:34 +02:00
Christian Kamm
aef569ee9d
SyncEngine: Use exclude file fallback next to binary on linux.
...
This is mainly useful for developers where the system-wide exclude file
may not exist.
2014-09-03 14:53:01 +02:00
