Daniel Molkentin
19aa8c63c0
build again
2013-06-28 22:27:16 +02:00
Daniel Molkentin
efd11b61c6
Merge branch '1.3'
2013-06-28 11:47:09 +02:00
Daniel Molkentin
1facb1f95d
1.3.80 (pre 1.4.0)
2013-06-27 16:58:55 +02:00
Jenkins for ownCloud
3db0788a91
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Jenkins for ownCloud
e068098046
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Daniel Molkentin
f2d289326b
More whitespace changes
2013-06-27 16:57:44 +02:00
Jenkins for ownCloud
ae57f27eb9
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Daniel Molkentin
a1767b2f7f
String whitespace fixes
2013-06-27 16:57:15 +02:00
Markus Goetz
5e9fcf7537
Raise setup wizard
2013-06-27 16:57:15 +02:00
Markus Goetz
8192cc7eea
Setup Dialog: Fix widget size issue (2)
2013-06-27 16:57:15 +02:00
Markus Goetz
2b8e1f2504
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-27 16:57:15 +02:00
Daniel Molkentin
9d01f80744
Fix Dialog behavior
...
- Fix proxy dialog being callable multiple times
- Use smart pointers in more places
- _owncloudSetupWizard was guarded by a smart pointer,
this needs to be accounted for in other code pathes.
Fixes Setup dialog not showing up when left-clicking
on unconfigured instances on Windows.
2013-06-27 16:54:33 +02:00
Jenkins for ownCloud
1a04c9da67
[tx-robot] updated from transifex
2013-06-27 01:42:28 +02:00
Daniel Molkentin
d35e1baee1
Remove obsolete code
2013-06-26 17:27:44 +02:00
Jenkins for ownCloud
2f16e50c87
[tx-robot] updated from transifex
2013-06-26 15:55:25 +02:00
Jenkins for ownCloud
3a662f7afb
[tx-robot] updated from transifex
2013-06-26 01:27:29 +02:00
Daniel Molkentin
903a78623c
Minor theme changes
2013-06-25 14:51:39 +02:00
Daniel Molkentin
7cd2f39f82
ChangeLog
2013-06-25 10:37:40 +02:00
Jenkins for ownCloud
949dd5db35
[tx-robot] updated from transifex
2013-06-25 01:45:02 +02:00
Jenkins for ownCloud
49a5c5bb8b
[tx-robot] updated from transifex
2013-06-24 23:05:09 +02:00
Jenkins for ownCloud
48aa355eea
[tx-robot] updated from transifex
2013-06-24 23:01:20 +02:00
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
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
With small changes
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
.
Patch still has issues, defer until after Beta 4
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
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