Daniel Molkentin
644b2673e0
More whitespace changes
2013-06-24 23:00:33 +02:00
Jenkins for ownCloud
8eed62e639
[tx-robot] updated from transifex
2013-06-24 22:58:54 +02:00
Daniel Molkentin
04c8449e5f
String whitespace fixes
2013-06-24 22:58:00 +02:00
Jenkins for ownCloud
9dd776ff6c
[tx-robot] updated from transifex
2013-06-24 22:55:32 +02:00
Jenkins for ownCloud
016868e95a
[tx-robot] updated from transifex
2013-06-24 21:43:58 +02:00
Jenkins for ownCloud
5d9c664fba
[tx-robot] updated from transifex
2013-06-24 21:25:21 +02:00
Daniel Molkentin
a662c85728
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:17:00 +02:00
Daniel Molkentin
5c4b7d427d
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:15:22 +02:00
Markus Goetz
12cc8bfd95
Raise setup wizard
2013-06-24 15:15:46 +02:00
Markus Goetz
11c6f20c90
Setup Dialog: Fix widget size issue (2)
2013-06-24 14:57:48 +02:00
Markus Goetz
c602ec310d
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-24 13:24:46 +02:00
Andreas Schneider
22477b23a6
statedb: Never overwrite data set by the user!
...
Only a user of csync is allowed to call csync_set_userdata(). Never call
this inside of csync cause you will overwrite the data pointer and
information is lost!
2013-06-23 14:50:49 +02:00
Stefan Agner
33eaf7e7b0
statedb: use ctx when opening database for integrity check
...
Signed-off-by: Stefan Agner <stefan@agner.ch>
2013-06-23 14:03:27 +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
Olivier Goffart
4553fa1d09
Merge remote-tracking branch '1.3' into master
2013-06-21 00:04:01 +02:00
Daniel Molkentin
b206a3b8e2
Beta4
2013-06-20 21:01:38 +02:00
Daniel Molkentin
3bff5a061b
Network: Display actual error message next to code.
2013-06-20 20:02:25 +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
Daniel Molkentin
77653747ac
0.70.93
2013-06-20 19:45:18 +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
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
