Daniel Molkentin
ae83c12f05
Fix compiler warning
2013-11-13 14:19:01 +01:00
Daniel Molkentin
878ae56a71
Compile with Qt5
2013-11-13 14:00:12 +01:00
Daniel Molkentin
2ff4ebc72f
Make user() available throught AbsctractCredentials
2013-11-13 13:59:35 +01:00
Daniel Molkentin
ca79d3b437
Merge remote-tracking branch 'origin/master' into account_refactoring
2013-11-13 13:55:58 +01:00
Klaas Freitag
14081a197b
Call ne_sock_init and ne_sock_exit to initialize neons SSL stack.
...
See https://github.com/owncloud/mirall/issues/1115 for more details on
why that is done here now.
2013-11-11 17:47:24 +01:00
Daniel Molkentin
9fe2549938
Add user info if the auth backends provides it
2013-11-11 16:57:15 +01:00
Klaas Freitag
e0a50d4bb9
PostSyncCleanup added: Remove superfluous entries from database after
...
sync.
2013-11-11 16:45:40 +01:00
Daniel Molkentin
ad1c1f4130
Remove legacy code
2013-11-11 15:36:49 +01:00
Daniel Molkentin
121b18bf70
QtKeychain is not a hard dependency
2013-11-11 15:36:29 +01:00
Daniel Molkentin
22ed29a30b
Remove obsolete credentialstore class
2013-11-11 15:24:07 +01:00
Daniel Molkentin
64b59f8679
Don't use integration directory
2013-11-11 15:22:51 +01:00
Daniel Molkentin
406ed5a0c0
Make new folder wizard work again
2013-11-11 15:20:07 +01:00
Daniel Molkentin
d5081f4328
Fix logic
2013-11-11 14:02:54 +01:00
Daniel Molkentin
95d7afb0d0
cleanups
2013-11-11 10:57:33 +01:00
Klaas Freitag
2b2987d962
Make sure to rebuild the recent changes menu.
2013-11-11 10:06:14 +01:00
Klaas Freitag
2eb77445be
Add rename actions to progress dispatching.
...
With that fix rename operations are shown as such in the progress
window and in bubble help etc.
2013-11-08 16:21:59 +01:00
Daniel Molkentin
12b1b38351
Fix connect
2013-11-08 14:02:13 +01:00
Daniel Molkentin
b0abb6362a
Don't set the content header length
...
This breaks POSTS and is not needed in QNAM, since QNAM
does this itself internally.
2013-11-08 14:01:56 +01:00
Klaas Freitag
a458ffd472
Add missing return in error case.
2013-11-08 12:56:54 +01:00
Daniel Molkentin
60b6f520e7
Make Shibboleth browser aware of Accounts
...
Needed for SSL error handling. It's also more consistent.
2013-11-07 18:47:38 +01:00
Daniel Molkentin
8d0d5b4077
Make redirects work
2013-11-07 18:46:57 +01:00
Daniel Molkentin
5c9a6afb82
Fix crash when opening settings without a valid account
2013-11-07 18:46:28 +01:00
Klaas Freitag
162acc1cc2
Fix conflict file handling, create a proper conflict file name.
...
Before this fix, the conflict file name was set in the file name
variable which lead to the problem that the subsequent rename of
the temp file to the final final filename was moving the temp file on
the conflict file. No final file was there.
2013-11-07 16:53:22 +01:00
Daniel Molkentin
64ef43d918
Fix the key used for storing the password
2013-11-07 15:59:58 +01:00
Daniel Molkentin
33c3d2a7d0
Wizard: Initialize account credentials.
...
Required to be able to readily retrieve the user name later on
2013-11-07 15:24:49 +01:00
Daniel Molkentin
1238ab4f69
fix broken connect() statement
2013-11-07 12:50:55 +01:00
Daniel Molkentin
a42ff5a07c
Show floating point prec. in account settings, too
2013-11-07 12:50:39 +01:00
Daniel Molkentin
aa4b6bd4ea
Readd "online" notion as a state in account.
...
This gets updated by the ConnectionValidator. Not sure if that's
the best choice, but it mimmicks the old behavior the closest.
2013-11-07 12:22:17 +01:00
Daniel Molkentin
478ba9c5ef
Fix approved SSL certificates being forgotten
2013-11-07 12:04:45 +01:00
Klaas Freitag
c58e9d17a8
Again minor doc changes.
2013-11-07 10:29:27 +01:00
Klaas Freitag
41ccbc0334
Minor docu change.
2013-11-07 10:28:14 +01:00
Daniel Molkentin
bd46ad56fc
Add new quotainfo class
2013-11-07 10:14:38 +01:00
Daniel Molkentin
bde5e86c50
Reformatting fixes
2013-11-07 10:14:25 +01:00
Daniel Molkentin
ec0f01fd7c
Ensure an SSL Error Handler is always available
2013-11-07 10:14:12 +01:00
Klaas Freitag
fe4c1cc35a
Remove straycat code from mirall.
2013-11-06 14:20:44 +01:00
Klaas Freitag
b6152c19d6
Adjust generic build documentation to the current state.
2013-11-06 11:13:55 +01:00
Daniel Molkentin
800abbf8b7
Make http credentials work
2013-11-05 18:16:00 +01:00
Daniel Molkentin
3af622d535
Make quota display work
2013-11-05 18:15:47 +01:00
Klaas Freitag
ee4cbf52dc
Remove straycats collected in the reconcile phase from journal.
2013-11-05 17:53:01 +01:00
Klaas Freitag
5cd2be058d
Fix local rename.
2013-11-05 17:50:09 +01:00
Klaas Freitag
3a21edca2b
Keep originalFile member as QString rather than C string.
...
This avoids encoding problems with interesting file names.
2013-11-05 17:48:51 +01:00
Klaas Freitag
c6a926842a
Fix recursivley flag misinterpretation.
2013-11-05 17:47:51 +01:00
Daniel Molkentin
440b5164ad
Build fix
2013-11-04 16:41:59 +01:00
Daniel Molkentin
cc5f17a7d2
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
src/mirall/folder.cpp
2013-11-04 16:38:55 +01:00
Daniel Molkentin
85d5b82811
- Make saving/restoring accounts work.
...
- Prepare for fetching quota
2013-11-04 16:36:23 +01:00
Olivier Goffart
f0a1ac4346
Fix syncing folder with nothing in it
...
Do the start after connecting, as the finish may be imediate if there
is nothing to do.
2013-10-31 12:11:56 +01:00
Olivier Goffart
bdc39f9cc2
Allow folder that are prefix of another
2013-10-31 11:41:56 +01:00
Olivier Goffart
d3ae2f42a7
Reset the proxy module property at every sync
...
This is required for the fix for #713
Since the module properties are shared in global variables shared by
every folders, removing another folder may clean the proxy settings.
So we need to restore them at every sync
2013-10-31 11:39:43 +01:00
Olivier Goffart
df39ab0b2f
Don't leak the system tray
2013-10-31 10:52:19 +01:00
Olivier Goffart
28833ee5ac
Fix crash when removing folder while syncing.
...
We need to set _thread to 0 after destoying it
2013-10-31 10:51:45 +01:00
