Jocelyn Turcotte
a6500d8068
Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425
...
Since QNonContiguousByteDeviceThreadForwardImpl::reset will
call UploadDevice::reset with a BlockingQueuedConnection, this
allows us to reset the HTTP channel along with its buffers
before they get the chance to be reused with a subsequent request.
2015-05-06 16:56:50 +02:00
Luca Lorenzetto
027365aaa6
Additional code cleanup
2015-05-06 15:09:41 +02:00
Jocelyn Turcotte
58867baf33
Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive
...
Windows Explorer: fix issues when syncing whole drive.
2015-05-06 14:54:19 +02:00
Daniel Molkentin
bceb40ed80
Disable setSslConfiguration calls for older Qt version
...
This is only required for client certs, which currently have
no GUI anyway and are experimental.
2015-05-06 11:20:16 +02:00
Daniel Molkentin
f315423811
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-05-06 10:04:22 +02:00
Christian Kamm
9e3c3353bd
IgnoreListEditor: Remove invalid connect. #3201
...
This has been around ever since the ignore editor was
added and the slot never existed.
2015-05-06 09:34:45 +02:00
Christian Burger
79f7ea0965
refactoring as requested in pull request
2015-05-05 16:34:01 +01:00
Markus Goetz
07ffff3d77
SyncEngine: Fix accidental re-discovery because of broken version table
...
Bug had been triggered by d63abef718
2015-05-05 17:07:13 +02:00
Luca Lorenzetto
f3bdfef9cf
Integrating feedbacks provided by jturcotte
2015-05-05 16:42:34 +02:00
Daniel Molkentin
bfba6f752c
Remove dead code
2015-05-05 10:23:59 +02:00
Klaas Freitag
d63abef718
SyncEngine: Handle upgrade case from 1.8.0
...
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
2015-05-04 13:40:25 +02:00
Christian Burger
018cc54a94
Windows Explorer: fix issues when syncing whole drive.
...
When the local sync target is just a drive letter (e.g. "X:\"), neither
the display of the sync status via file icon overlay, nor the creation of a
share link works. In the latter case no pop-up comes up and no server
request is done.
QDir::cleanPath() usually removes trailing slashes, but not if the path to
be cleaned is just "X:\". In that case the trailing slash is kept. This
commit accounts for that exception.
2015-05-04 10:29:25 +01:00
Markus Goetz
4700c604b1
Proxy: Register meta type #3170
2015-04-29 14:54:08 +02:00
Olivier Goffart
e02f1a222e
FolderMan: refactor some function to take a Folder* instead of an alias
...
I want to remove this dependency of alias in the code because we might get
rid of it entierly later
2015-04-28 17:49:05 +02:00
Olivier Goffart
e4694a6db8
Setup wizard: Do not remove all the folders of all theother acocunts when adding an account
...
Also we need the alias to be unique
2015-04-28 17:46:45 +02:00
Olivier Goffart
e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
Olivier Goffart
92e259c276
Add folder: Do not add at other accounts folder to know if you can add a folder
2015-04-28 11:29:35 +02:00
Olivier Goffart
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
Olivier Goffart
4006bcdaed
Wizard: Setup the folder in the right account
2015-04-27 17:43:07 +02:00
Olivier Goffart
3e4886725a
Folder: remove the member references to the FolderDefinition members
2015-04-27 17:33:59 +02:00
Olivier Goffart
f688bda759
Wizard: Save the settings after adding an account
...
So the account persist even if the client is not properly closed
2015-04-27 17:19:46 +02:00
Olivier Goffart
ac855858de
owncloud gui: move a comment where it belongs
...
The code was moved long time ago in commit ea1c95100
2015-04-27 17:14:25 +02:00
Olivier Goffart
ae17f58b80
HTTP Creds: Do not send the password at every request
2015-04-27 16:28:37 +02:00
Olivier Goffart
23dc464ea2
Folderman: Fix crash when adding an account
...
Clang is picky if we forget to return a value
2015-04-27 14:34:39 +02:00
Olivier Goffart
04382c467b
Progress: Fix broken signal connection
2015-04-27 12:34:15 +02:00
Olivier Goffart
be1b39067d
Merge branch 'master' into new-ui
2015-04-27 12:32:12 +02:00
Olivier Goffart
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
Christian Kamm
78e82eb920
AccountWizard: Fix auth error handling. #3155
...
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().
I tested the redirection case and the invalid credentials case.
2015-04-24 16:03:28 +02:00
Christian Kamm
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
Christian Kamm
a13a974e2d
Account: Generate shorter account ids.
2015-04-24 09:54:42 +02:00
Markus Goetz
3a52db46ad
Discovery: Fix another empty-local-directory bug
2015-04-23 16:15:13 +02:00
Christian Kamm
f184d66ea2
Save and restore multiple accounts.
2015-04-23 16:08:20 +02:00
Christian Kamm
11927d625d
Fix crash on exit by not making Account parent of AccountState.
2015-04-23 16:08:20 +02:00
Christian Kamm
abfdc574d4
Add a basic random Account::id()
2015-04-23 15:47:49 +02:00
Christian Kamm
d64373c610
Never use 'new Account' directly, prefer Account::create()
2015-04-23 15:47:49 +02:00
Christian Kamm
28306e5dfb
Move AccountState::displayName to Account.
2015-04-23 15:47:49 +02:00
Christian Kamm
89bb58ac30
Ensure 'user' is available early enough for ui in httpcreds
2015-04-23 15:47:49 +02:00
Christian Kamm
3cc2e1a968
Fix bad connect/disconnects.
2015-04-23 14:24:54 +02:00
Christian Kamm
8390b0b930
Determine right account in ownCloudGui::slotShowShareDialog
2015-04-23 14:14:28 +02:00
Christian Kamm
dbddabfcd7
Remove SelectiveSyncText
...
It is unused and there were compiler warnings about it not
appearing it various switch() statements.
2015-04-23 14:13:33 +02:00
Christian Kamm
0d30e01e98
Add explanations to fixmes
2015-04-23 14:13:13 +02:00
Markus Goetz
137bce6dd0
Folder: Clear _syncResult better
...
I had a situation here where we were showing stale desktop notifications when a remote folder
errored out and then sync finished with _syncResult data from previous sync.
2015-04-23 13:30:30 +02:00
Christian Kamm
7c1281dd06
Windows: Fix rename of finished file. #3073
...
The file was still open and therefore couldn't be renamed...
2015-04-22 14:46:04 +02:00
Christian Kamm
68bf22f469
Revert "AccountSettings: Update progress only twice per second. #3014 "
...
This reverts commit 0f33e266ce#3014 .
2015-04-22 11:46:00 +02:00
Christian Kamm
96ecdb866d
Time estimate: Refactor remaining time guess. #2328
2015-04-22 11:20:31 +02:00
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
Markus Goetz
6c5ca055c4
ShareDialog: Unused/invalid forward declaration
2015-04-21 10:33:38 +02:00
Olivier Goffart
cf5100a20b
Merge remote-tracking branch 'origin/1.8'
2015-04-20 14:58:45 +02:00
