Klaas Freitag
6d6deaf6c4
Setup folders added after setup wizard ended.
2013-02-19 12:04:36 +01:00
Klaas Freitag
3d4b426137
Removed some useless logging.
2013-02-19 09:40:14 +01:00
Klaas Freitag
9c63b89bac
Removed useless warning.
2013-02-19 09:34:33 +01:00
Andreas Schneider
2d6514b509
owncloud: Fix some problems in the owncloud module.
...
Thanks to Patrick Buergi.
2013-02-19 08:36:46 +01:00
Andreas Schneider
11b539088e
client: Fix connection to a remote with password in it.
...
The password needs to be cleaned after we processed the uri.
Thanks to Patrick Buergi.
2013-02-19 08:35:20 +01:00
Andreas Schneider
fc2b860022
client: Fix setting the debug level.
...
Thanks to Patrick Buergi.
2013-02-19 08:34:44 +01:00
Jenkins for ownCloud
2a6e084219
[tx-robot] updated from transifex
2013-02-19 00:08:08 +01:00
Klaas Freitag
ec120cd64c
Make folderman load folders at start and update later.
2013-02-18 18:31:29 +02:00
Klaas Freitag
a9173b1aa1
Add setters for update check and max log lines
2013-02-18 17:17:03 +02:00
Klaas Freitag
89f7f75af2
If a new server is configured, take the proxy config to the new config
...
file.
2013-02-18 17:16:10 +02:00
Daniel Molkentin
8809ac0c4a
remove unused connect
2013-02-18 14:56:50 +01:00
Daniel Molkentin
7a03164a9a
Handle server offline state on application start gracefully
2013-02-18 14:56:50 +01:00
Jenkins for ownCloud
406254cd04
[tx-robot] updated from transifex
2013-02-18 00:07:57 +01:00
Jenkins for ownCloud
f01eeed9d0
[tx-robot] updated from transifex
2013-02-17 00:27:55 +01:00
Jenkins for ownCloud
5b6439e29d
[tx-robot] updated from transifex
2013-02-16 00:07:02 +01:00
Daniel Molkentin
38954c2193
Remove obsolete signal.
2013-02-15 19:29:38 +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
8e63652fb3
Send OEM string to update detector.
2013-02-15 18:39:25 +01:00
Jenkins for ownCloud
365dfd5380
[tx-robot] updated from transifex
2013-02-15 00:08:10 +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
e5af8e87b3
Fix crash when pausing mirall.
2013-02-14 17:36:11 +01:00
Daniel Molkentin
bfbec24f43
Add more debug in case inotify fails
...
We should probably make this at least a visible error, because it's a
limitation set by the kernel/the distro and we would require root
permissions to adjust the value.
Right now all that happens is that syncing is not immediate, but only
run every 30 secs (due to server polling).
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
2ba20369ea
Remove unused gitfolder class for now
2013-02-14 17:36:11 +01:00
Daniel Molkentin
804aef6548
Remove stray code
2013-02-14 17:36:11 +01:00
Daniel Molkentin
85f49b6af4
Fix guard position
2013-02-14 17:36:11 +01:00
Daniel Molkentin
68afc6011d
proxy dialog: no extra heading
2013-02-14 17:36:11 +01:00
Daniel Molkentin
524ffcd0e1
owncloud setup: Fix label style
2013-02-14 17:36:11 +01:00
Jenkins for ownCloud
a7303205b4
[tx-robot] updated from transifex
2013-02-14 00:08:08 +01:00
Olivier Goffart
ca34c4fd5f
Fix removing of folder when the folder is locked on windows.
...
When the folder is locked on windows, rmdir fails and the folmder is not
removed. But on the next sync, one should try to remove that folder again, and
not upload it to the server as we did before.
There was two problems:
1- The removed folder is still in the DB, so when csync_update read from
DB, for the remote, it still finds it. Fix that by storing an empty MD5
for directories that should have been deleted.
2- The folder is likely to be modified since its contents are gone.
Which means next sync will try to sync it back to the server.
Fix that by refreshing the mtime in the tree
2013-02-13 19:20:26 +01:00
Olivier Goffart
1be65be68e
Fix crash in owncloud_mkdir
...
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-13 18:25:28 +01:00
Olivier Goffart
b6a37064e9
Allow to configure the timeout in the config
2013-02-13 18:25:28 +01:00
Olivier Goffart
2e945c07af
owncloud: fix session cookie again.
...
Some load balancers may add more cookies, and we would pick the wrong
one. So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-13 18:25:28 +01:00
Klaas Freitag
7d1d880a9b
Return a proper error code in case the file is locked on win32.
2013-02-13 12:38:50 +02:00
Jenkins for ownCloud
8a06b2d136
[tx-robot] updated from transifex
2013-02-13 00:06:54 +01:00
Daniel Molkentin
7ba8a55fa5
Merge pull request #313 from hefee/doc2default
...
creating doc to default target
2013-02-12 11:48:00 -08:00
Daniel Molkentin
ee7dc8e1c5
Merge pull request #312 from hefee/master
...
usefull manpages for owncloud and mirall
2013-02-12 11:47:41 -08:00
Olivier Goffart
b028c64325
In case of error dirring a rename, mark the source as updated
...
That way, the file will be saved in the DB again, and the next try, it
will retry to rename
2013-02-12 15:11:15 +01:00
Olivier Goffart
79bbbe75d7
Report error to the callback in mkdir and rename
2013-02-12 13:36:17 +01:00
Jenkins for ownCloud
3556f90d68
[tx-robot] updated from transifex
2013-02-12 00:20:28 +01:00
Klaas Freitag
6d984b505d
Handle not stored password correctly.
2013-02-11 14:21:53 +01:00
Klaas Freitag
8d9336f9f4
Removed obsolete scheduler start.
2013-02-11 14:21:21 +01:00
Klaas Freitag
2b5e694181
Set default argument to method.
2013-02-11 14:20:32 +01:00
Klaas Freitag
aa983e4966
Make user password dialog real async working.
2013-02-11 14:18:45 +01:00
Klaas Freitag
424b3a9dfc
cleanup comments and dupes.
2013-02-11 14:18:16 +01:00
Jenkins for ownCloud
5a3bc7af9a
[tx-robot] updated from transifex
2013-02-11 00:05:57 +01:00
Klaas Freitag
4501ec10dc
Make sure that journals are wiped if server changes + some utility
...
functions.
2013-02-10 20:04:03 +01:00
Klaas Freitag
75cc77b947
Fixed build on win.
2013-02-10 16:43:38 +01:00
Klaas Freitag
699ae176df
Revert "Allow setting of custom poll interval through status.php"
...
This reverts commit 39a89e8fc7
.
Conflicts:
src/mirall/folderman.cpp
src/mirall/folderman.h
2013-02-10 14:57:57 +01:00