Commit graph

106 commits

Author SHA1 Message Date
Klaas Freitag
364d4340fd Show a more informative problem message in progress. 2013-08-07 12:15:28 +02:00
Klaas Freitag
9c289334e9 Handle notifications for deletes. 2013-08-06 18:04:08 +02:00
Daniel Molkentin
0932ee6051 Merge branch 'shibboleth'
Conflicts:
	src/CMakeLists.txt
	src/mirall/application.h
2013-08-05 19:54:06 +02:00
Klaas Freitag
67f57a443c Disable unknown csync flags for now. 2013-08-05 12:30:24 +02:00
Klaas Freitag
16d81db117 Show deletes in progress. 2013-08-05 09:39:06 +02:00
Krzesimir Nowak
78b6f4df01 Move the creds/ and wizard/ directories one level higher. 2013-08-01 16:53:43 +02:00
Krzesimir Nowak
eacb849353 Fix credentials handling in csync.
CSync module's properties can be set only after it was initialized, so
we split the sync context vfunc into two: the one ran before
initialization and the one ran before sync beginning.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
92af3ea725 Add and use credentials abstraction. Implement HTTP and dummy credentials.
To achieve that MirallConfigFile now exports several general
settings-related methods for subclasses (here: for HttpConfigFile), so
it does not have to contain any code targeted for specific
credentials.
2013-08-01 16:53:43 +02:00
Klaas Freitag
a64724be0e More sophisticated progress, add Recent Changes Menu to tray.
ProgressDispatcher now stores a queue of events as well as sync
problems, better known as soft errors. The tray menu displays a
sub menu with 5 recent changes and adds a more... button that
shows a warning icon if soft errors had happend.
More to implement.
2013-07-30 22:24:48 +02:00
Klaas Freitag
84e8ab5b71 Make progress aware of errors, first step. 2013-07-30 22:24:48 +02:00
Klaas Freitag
3a9ab3a86f Consolidated progress displaying to a single slot from csync. 2013-07-26 13:44:38 +02:00
Klaas Freitag
8f912ca0c5 Adopt to new progress API in csync, WIP 2013-07-25 16:28:45 +02:00
Olivier Goffart
a827056d28 Fix upload limit 2013-07-25 11:21:02 +02:00
Daniel Molkentin
bca295183b Make use of bandwidth limiting, split general/network settings.
Fixes #14
2013-07-24 19:53:20 +02:00
Daniel Molkentin
a3b3c28694 CSyncThread: Fix unreachable code 2013-07-23 14:34:06 +02:00
Klaas Freitag
976c41a3b8 Beautified ProgressDispatcher 2013-07-23 13:32:33 +02:00
Klaas Freitag
1cc60e755b Rather show overall progress in settings dialog. 2013-07-19 17:05:46 +02:00
Klaas Freitag
992dffa032 Add an overall progress counter to progressDispatcher 2013-07-19 13:05:30 +02:00
Markus Goetz
ab7bfabf12 Put cookies into csync
We already have the auth cookies from the quota request,
so put them into csync to avoid a 401 roundtrip
2013-07-17 16:27:18 +02:00
Klaas Freitag
6b5b9db20a Handle progress through ProgressDispatcher class, WIP. 2013-07-11 12:32:58 +02:00
Olivier Goffart
a8707b681d Report proper error when csync_init fails
Fix mirall issue #705
2013-06-19 18:17:32 +02:00
Olivier Goffart
5d8f9f5346 Silent clang warning 2013-06-19 18:16:43 +02:00
Daniel Molkentin
01ad3c4d81 Remove more dead code for readability 2013-06-19 11:31:09 +02:00
Olivier Goffart
334443adbb Fix crash when removing a folder
The problem is that the module_property of csync are not really tight to
a context, but are global to all the contextes.
Which means csync_owncloud may still have a pointer to the destroyed
context of the destroyed folder.
By always resetting the context pointer, we make sure there is no stale
pointers there
2013-06-12 12:23:12 +02:00
Olivier Goffart
541239c17b Make the message box more explicit when all files have been removed
Also clean the db if the user wish to keep the files
2013-06-10 15:58:02 +02:00
Olivier Goffart
d2579a7754 Warn if we detect that all fles are about to be removed. 2013-06-08 15:41:53 +02:00
Klaas Freitag
8928c87fc3 Removed silly configDir hack from thread. 2013-04-22 15:06:28 +02:00
Klaas Freitag
9f0348979b Simplify csyncthread with keeping csync ctx intact 2013-04-20 13:15:27 +03:00
Klaas Freitag
a4be3f304d Set log verbosity before calling csync_init. 2013-04-17 15:29:44 +02:00
Daniel Molkentin
acdb624713 safer approach for detecting duplicate sync runs 2013-04-15 15:55:54 +02:00
Daniel Molkentin
3cae8e7124 Remove debugging code 2013-04-15 14:32:23 +02:00
Klaas Freitag
aa6160ab62 Fixed some valgrind warnings. 2013-04-08 14:50:47 +02:00
Daniel Molkentin
f74aa1e9a6 terminate if more than one thread is being started. 2013-04-04 17:25:53 +02:00
Klaas Freitag
ae558a5889 Add a appNameGUI method to the theming. 2013-02-21 12:21:42 +01:00
Klaas Freitag
55a4fd752d Fix commit fd83bf - add treewalk success check. 2013-02-20 17:26:07 +01:00
Klaas Freitag
fd83bf2089 Remove unused variable doTreeWalk. 2013-02-20 10:06:45 +01:00
Daniel Molkentin
5954fb280c Centralize error handling for csync steps
...as a preparation for offline handling.
As a side-effect, removed the last instance
of goto in mirall.
2013-02-15 19:29:27 +01:00
Daniel Molkentin
1c70fb3ba4 Set csync config dir in mirall properly
Otherwise canceling the sync cannot remove the lock file
2013-02-14 17:36:11 +01:00
Daniel Molkentin
8dd97a358a Introduce SyncPrepare state
SyncPrepare is when the folder class prepares the actual syncing,
i.e. does treewalks and runs the reconceiler in case of mirall. The actual
SyncRunning state will only be entered if there is actually anything to
sync.

Fixes #289
2013-02-14 17:36:11 +01:00
Daniel Molkentin
7794480da0 csync: Put up the QNAM key chain for comparison
Comparing with the CA certs will not help with
intermediates, and other cases.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
0171b8b998 Make hash formatting static
no need for class instanciation.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
f678629734 Fix proxy auth
- The port was not set correctly
- The password was read base64 encoded, but not read stored as such
2013-01-16 17:50:26 +01:00
Daniel Molkentin
45c82a2746 Go offline when server is in maintenance. 2013-01-16 14:41:12 +01:00
Klaas Freitag
bc3938daa7 A new sync file protocol dialog. 2013-01-15 20:42:09 +01:00
Klaas Freitag
07034daffe Take valid caList from QSslSocket::defaultCA. 2013-01-14 12:13:51 +01:00
Klaas Freitag
dca8ecb929 Remove bogus spaces. 2013-01-14 12:13:50 +01:00
Klaas Freitag
f4019f5a5a Show backend error messages to user. 2012-12-20 20:51:43 +01:00
Klaas Freitag
c3f6153f94 Fixed QString -> const char* conversions to handle UTF8 correctly. 2012-12-20 16:49:29 +01:00
Klaas Freitag
87aa3d7c60 More detailed error handling. 2012-12-20 16:49:29 +01:00
Klaas Freitag
144a2832b9 Loop over all certificates to match the approved one. 2012-12-20 16:49:29 +01:00