Commit Graph
17214 Commits
Author SHA1 Message Date
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 0dbecb129e Log the fact that csync was aborted 2013-06-19 18:41:30 +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 e43ff398cd Merge branch '1.3'
Conflicts:
	doc/troubleshooting.rst
2013-06-19 16:09:54 +02:00
Daniel Molkentin a441b1d562 Bump year 2013-06-19 16:07:07 +02:00
Daniel Molkentin 6e2042cd55 Doc: Expand usage page 2013-06-19 16:04:48 +02:00
Daniel Molkentin bb8b58dc66 Doc: more fixes on troubleshooting section 2013-06-19 15:48:04 +02:00
Daniel Molkentin 9cd099056b Doc: More structure in troubleshooting.rst 2013-06-19 15:40:20 +02:00
Daniel Molkentin 0adbc032ae Doc: Expand trouble shooting section 2013-06-19 15:40:15 +02:00
Daniel Molkentin 22a679fb8c Doc: Add back --logfile, as it still exists 2013-06-19 15:40:09 +02:00
Daniel Molkentin 35a67fab0a Doc: remove now meaningless scentences 2013-06-19 15:40:06 +02:00
Daniel Molkentin fdc8117211 doc: Fix wording 2013-06-19 15:40:02 +02:00
Daniel Molkentin 24208e6137 Remove mirall man page 2013-06-19 15:39:56 +02:00
Daniel Molkentin c0cd255ea3 Doc: More structure in troubleshooting.rst 2013-06-19 15:39:03 +02:00
Daniel Molkentin a0375fd000 Doc: Expand trouble shooting section 2013-06-19 15:06:47 +02:00
Daniel Molkentin 6d847cd5f9 Doc: Add back --logfile, as it still exists 2013-06-19 15:06:16 +02:00
Daniel Molkentin 6470a3f539 Doc: remove now meaningless scentences 2013-06-19 15:05:33 +02:00
Daniel Molkentin c6111d09ce doc: Fix wording 2013-06-19 14:29:56 +02:00
Daniel Molkentin d6012854a9 Remove mirall man page 2013-06-19 14:29:28 +02:00
Daniel Molkentin 46c7026726 Answer correctly if proxy auth is needed
Fixes #704
2013-06-19 12:48:36 +02:00
Daniel Molkentin 01ad3c4d81 Remove more dead code for readability 2013-06-19 11:31:09 +02:00
Olivier Goffart 3d2c3b321c Disable the blacklist by default
The blacklist might hide errors and reduce the ability to do proper
diagnostics.

Note that in _csync_push_file, we kept csync_statedb_get_progressinfo
because it is also used for the resume feature

Also added output when a file has been blacklisted.
2013-06-18 19:19:28 +02:00
Daniel Molkentin 4ac98bde73 Remove dead code from StatusDialog 2013-06-18 17:38:20 +02:00
Daniel Molkentin f42a6d6ef6 Advertise the use of Gists for long logs 2013-06-18 15:21:56 +02:00
Daniel Molkentin 9055c6ade7 Add storage backend field to issue template 2013-06-18 14:57:12 +02:00
Olivier Goffart 1356a5bbaa Fix reading the password from the config
The code was expecting pwdba to be in base64, which it was not if it
came from the "password" field
2013-06-18 14:19:37 +02:00
Olivier Goffart 3c320c2736 Credidentail dialog: it was suposed to be asynchronous 2013-06-18 14:19:37 +02:00
Olivier Goffart 969757199e Fix changing the password when the password manager is not available
Leaving the state in NoKeychainBackend would break any further attempt
to get the password because CredentialStore::canTryAgain would return
false.
2013-06-18 14:19:37 +02:00
Daniel Molkentin 60f1c65a48 Don't lose proxy settings when changing passwords 2013-06-17 14:25:11 +02:00
Daniel Molkentin b87b0e16e6 Avoid infinite loop if authcheck fails 2013-06-17 13:35:54 +02:00
Andreas Schneider 3043b97815 cmake: Use pkg-config for libsmbclient. 2013-06-16 21:37:03 +02:00
Daniel Molkentin 8ed0b1be55 Teach ownCloud theme about QVariant 2013-06-13 16:31:38 +02:00
Olivier Goffart ed76e5f1f2 Fix conflict file appearing when a file cannot be stated
We still need to fetch the md5 from the database to be able to store it
back.
2013-06-13 15:06:35 +02:00
Daniel Molkentin 91b5f1076f Theming cleanups
- remove splash screen pixmap
- remove backend icon (folderIcon())
- Move owncloud ad into owncloud theme
2013-06-13 12:56:20 +02:00
Daniel Molkentin 8ec2457965 Only change subtitle if the config file actually exists 2013-06-13 12:55:07 +02:00
Daniel Molkentin 82d79b1188 Remove folder from the scheduling queue
Not really needed, but cleaner
v1.3.0-beta3
2013-06-12 12:42:02 +02:00
Olivier Goffart e33601becd Fix leak 2013-06-12 12:23:12 +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
Daniel Molkentin 92b9bf59a7 0.70.92 2013-06-12 11:10:34 +02:00
Daniel Molkentin 99579e8a2a 1.3.0beta3 2013-06-12 11:10:08 +02:00
Daniel Molkentin 89438f7ace Make SyncDisabler local to slotAddFolder
This also allows us to update the folder state as
soon as the wizard is being closed.
2013-06-12 09:27:20 +02:00
Daniel Molkentin d323ec5dd9 FileItemDialog: more clarity in the label
- finished %n sec ago -> last finished %n sec ago
- switch to minutes after 60 seconds
2013-06-11 22:34:37 +02:00
Daniel Molkentin bb5cf37330 Fix issues found after review
- use safer formatting
- remove unnecessary condition
2013-06-11 22:33:11 +02:00
Daniel Molkentin 4b0bdd648c Do not repeat old strings
Fixes #678, fixes #494
2013-06-11 22:14:32 +02:00
Olivier Goffart 5588fbe695 Fix clicking on the systray when the setup is not finished
We should raise the wizard
2013-06-11 21:32:44 +02:00
Olivier Goffart 12ea381205 Do not re-use the configuration wizard.
Create it on demand.
This allow yo alays keep a cleen state.
Mirall issue #668
2013-06-11 21:15:37 +02:00
Daniel Molkentin 99fbf25fb2 Keep the member variable, avoids double instanciation 2013-06-11 18:41:35 +02:00
Daniel Molkentin b37645e14d Revert "Put FolderWizard on the stack"
This reverts commit 1ec5a1aaa2.
2013-06-11 18:33:39 +02:00
Daniel Molkentin 1ec5a1aaa2 Put FolderWizard on the stack 2013-06-11 18:19:09 +02:00