Daniel Molkentin
b9b18d6120
Remove unused configfile instance
2013-06-28 22:28:18 +02:00
Daniel Molkentin
f2d289326b
More whitespace changes
2013-06-27 16:57:44 +02:00
Olivier Goffart
60a4180dd6
Delay the csync_init after we called status.php
...
That way, if there was a redirection, it is handled propertly
2013-06-21 00:34:46 +02:00
Olivier Goffart
8e42721959
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
This is a revert of the revert 0bc9b6f44e
2013-06-21 00:34:28 +02:00
Daniel Molkentin
0bc9b6f44e
Revert "Do not store the redirected URL in the config file."
...
This reverts commit 905f70a186
2013-06-20 19:50:34 +02:00
Olivier Goffart
905f70a186
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
2013-06-20 17:50:02 +02:00
Olivier Goffart
a8707b681d
Report proper error when csync_init fails
...
Fix mirall issue #705
2013-06-19 18:17:32 +02:00
Daniel Molkentin
01ad3c4d81
Remove more dead code for readability
2013-06-19 11:31:09 +02:00
Olivier Goffart
e33601becd
Fix leak
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
Daniel Molkentin
efbad3a3c8
Propagate proxy changes to csync at run time
2013-05-31 16:16:41 +02:00
Klaas Freitag
f334b6349b
Add a call to quit to make the thread ending the loop
2013-05-16 17:35:40 +02:00
Klaas Freitag
2ff9fcfa1d
Fix crash if _thread is not initialized before.
2013-05-16 13:26:05 +02:00
Daniel Molkentin
eea8542fc0
Quit app/abort sync gracefully.
2013-05-09 21:55:28 +02:00
Daniel Molkentin
c15ce2b20b
Remove last traces of localRun
2013-05-04 15:16:53 +02:00
Daniel Molkentin
2789522948
Folder/ownCloudFolder: Clean up secondPath stuff
2013-04-25 16:06:31 +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
Daniel Molkentin
275c2b1a6b
Fix misleading balloon titles
...
Fixes #546
2013-04-16 11:24:07 +02:00
Klaas Freitag
4ba85311da
Handle all cases in switches.
2013-02-21 13:36:51 +01:00
Daniel Molkentin
e5af8e87b3
Fix crash when pausing mirall.
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
7290afc6fe
Minimize Sync notification notification
...
Notifies only in the end of a complete sync run now
Migitates/fixes #314
2013-02-14 17:36:11 +01:00
Daniel Molkentin
d681066dc2
Results bubble: _localPrefix might not end in a separator
2013-01-26 20:47:20 +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
Daniel Molkentin
8b8d78f456
Improved version of popup-notify
2012-12-12 19:30:37 +01:00
Daniel Molkentin
3cb2e74d12
Notify user about new files.
...
Let's see if its too annoying,
we can still add a timer later
2012-12-12 15:00:38 +01:00
Klaas Freitag
a124dcd4e8
More cleanups that were possible by the new notify api.
2012-12-06 18:38:06 +01:00
Daniel Molkentin
287c073f00
Remove code for local sync runs
...
Rely entirely on folderwatcher. Local
sync runs can be implemented in terms
of a dummy folderwatcher if we want
to support systems without fs monitoring
again..
2012-12-06 17:53:04 +01:00
Daniel Molkentin
f20db6bbc1
Implement folder watching for OS X using FSEvents
2012-12-06 17:53:04 +01:00
Klaas Freitag
a8dbed989b
Use CredentialStore to manage user credentials.
...
This fixes the bug that if the password is not stored in the cfg
file the user could not cancel the auth dialog. Moreover it handles
various credential backends better and gives a better user experience.
2012-11-13 11:19:34 +01:00
Klaas Freitag
0224c3fbd6
Compare absolute path in fileStatus.
2012-10-29 14:35:02 +01:00
Klaas Freitag
78c1bc6b22
Cleanup of sync result treewalk, build up journal in owncloudfolder.
2012-10-29 12:24:20 +01:00
Klaas Freitag
993d33f779
Fix fileStatus API.
...
Conflicts:
src/mirall/owncloudfolder.cpp
2012-10-29 12:23:01 +01:00
Klaas Freitag
0aa403eca3
Clean merge problems.
2012-10-29 12:20:57 +01:00
Daniel Molkentin
861a66f8cb
Make PAC work on Windows
2012-10-09 03:08:39 +02:00
Daniel Molkentin
3db60b4fe7
Massive simplification of proxy support.
...
Purposefully separated from last commit, but
associated with it: No more need for special
cases after libocsync got fixed do adhere properly.
2012-10-09 02:35:08 +02:00
Daniel Molkentin
c93721258e
Working PAC support
...
This goes along with e0f02c in csync/dav.
2012-10-09 02:35:08 +02:00
Daniel Molkentin
34b8c39878
Quick hack: do not crash on windows when pausing sync
2012-10-05 22:53:42 +02:00
Daniel Molkentin
0ee938ac9b
Prepend slash to remote folder
2012-10-05 22:42:35 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
8f40b2a276
Use delete[] to free mem from qstrdup, thanks valgrind.
2012-09-19 13:51:27 +03:00
Klaas Freitag
fd7cb38c16
Use qthread more correct, see
...
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
2012-08-26 11:47:45 +02:00
Klaas Freitag
d733aac0e8
Fix QLatin1String issues.
2012-08-17 18:13:17 +03:00
Klaas Freitag
9e30fe4ea5
Do not stop syncing if local directories are write protected.
2012-08-09 12:12:54 +03:00
Klaas Freitag
08d925a8fa
read proxy setting from cfg file rather than from Qt proxy object.
2012-08-08 16:48:21 +03:00
Klaas Freitag
d3bb223898
Proceed proxy settings to csync thread.
2012-08-02 11:17:15 +03:00
Klaas Freitag
4ef948bf3c
Use a better inotify implementation and use config.h. Fixes oCB #713 .
2012-07-20 17:13:23 +02:00
