Markus Goetz
667c835c49
Revert "remove auth callback setting in the csync module."
...
This commit broke syncing.
We need the callback to supply the password.
This reverts commit 8738128504
.
2014-05-21 20:02:22 +02:00
Daniel Molkentin
5b298abba1
Revert "Set an "active" role for the menubar icon on Mac"
...
Apart from a small mistake in this commit, there seems to be
something else wrong.
This reverts commit 97362cff32
.
2014-05-21 13:00:20 +02:00
Daniel Molkentin
4edbeece49
Fix connection following the update of the QtSingleApplication classes
2014-05-21 12:31:44 +02:00
Daniel Molkentin
97362cff32
Set an "active" role for the menubar icon on Mac
...
Fixes #1730
2014-05-21 11:19:38 +02:00
Daniel Molkentin
3db3c7b876
Update QtSingleApplication and QtLockedFile
...
Fixes stale temp file issues, and is needed for blocking support.
2014-05-21 11:19:38 +02:00
Klaas Freitag
8738128504
remove auth callback setting in the csync module.
2014-05-21 11:09:02 +02:00
Klaas Freitag
069eaf9170
Clear the authentication callbacks set before.
2014-05-21 11:09:02 +02:00
Klaas Freitag
d0b9b002e4
Show the sync icon in case the status is not yet defined.
...
This fixes the problem that on the first sync, no proper status icon is
shown on a potential long update phase.
2014-05-21 11:09:01 +02:00
Eran
fae3e46a59
made the code a little cleaner
2014-05-20 16:56:39 +03:00
Olivier Goffart
bdba56f60b
Always wait on the thread before emiting finished
...
This ensure that there would be no way to have two thread running
Refactor all the location where finished is called in a single function
2014-05-20 12:32:06 +02:00
Jenkins for ownCloud
7087dbc445
[tx-robot] updated from transifex
2014-05-20 01:25:31 -04:00
Daniel Molkentin
7ade4bb6e6
AccountSettings: Handle button states more correctly
...
Fixes #1779
2014-05-19 15:46:23 +02:00
Daniel Molkentin
86117aed0d
autostart unix impl: use mkpath instead of mkdir
...
Fixes TestUtility::testLaunchOnStartup(), if .config/ does not exist.
2014-05-19 12:42:04 +02:00
Jenkins for ownCloud
ed3d9a7479
[tx-robot] updated from transifex
2014-05-19 01:25:29 -04:00
Jenkins for ownCloud
3746a2efff
[tx-robot] updated from transifex
2014-05-18 01:25:29 -04:00
Jenkins for ownCloud
9b53cc66e7
[tx-robot] updated from transifex
2014-05-17 01:25:38 -04:00
Klaas Freitag
43fe7b0d55
Detect directory case sensitivity clash on windows
2014-05-16 15:24:01 +02:00
Daniel Molkentin
5aa6f81ef3
1.6.0rc2
2014-05-16 09:50:50 +02:00
Jenkins for ownCloud
f838f28185
[tx-robot] updated from transifex
2014-05-16 01:25:29 -04:00
Olivier Goffart
e1f8eb5aa5
Another way to force a sync when choosing 'Keep files'
2014-05-15 19:36:01 +02:00
Olivier Goffart
f40a054cb7
Revert "Re-sync immediatly after "Keep files" when all files were removed"
...
This causes infinite sync loops
This reverts commit 8b469d3992
.
2014-05-15 19:29:40 +02:00
Daniel Molkentin
adfb163593
1.6.0rc1
2014-05-15 17:22:01 +02:00
Eran
3777074e84
Remove extra space between the parenthesis when displaying estimation in the system tray
2014-05-15 17:46:25 +03:00
Daniel Molkentin
81c768099e
Folder: Correctly reflect paused state after restart
2014-05-15 15:04:48 +02:00
Daniel Molkentin
4bcaebb322
Decrease debug noise
2014-05-15 15:04:48 +02:00
Olivier Goffart
8b469d3992
Re-sync immediatly after "Keep files" when all files were removed
...
Fixes #1710
2014-05-15 11:48:01 +02:00
Olivier Goffart
bb929db7e6
fix warning
2014-05-15 11:29:23 +02:00
Olivier Goffart
90ee274744
We need to call csync_commit in every error cases
...
Else there will still be outdated tree in the memory and the further sync
will be confused
Relates to #1710
2014-05-15 11:18:06 +02:00
Daniel Molkentin
9f6e9f8e1b
Fix crash: if the credentials cannot be cast, don't deref, assume change
2014-05-15 11:12:18 +02:00
Klaas Freitag
943f9f60e3
Documented core dump catching
2014-05-15 11:11:13 +02:00
Klaas Freitag
f89bfce068
Enable core dumping if the env variable OWNCLOUD_CORE_DUMP is defined
...
Set OWNCLOUD_CORE_DUMP to anything to get a core dump in case of
crashing.
2014-05-15 11:01:21 +02:00
Klaas Freitag
ef44a59bed
Better debugability.
2014-05-15 09:45:50 +02:00
Klaas Freitag
d96139f698
Commented verbose logging.
2014-05-15 09:45:50 +02:00
Daniel Molkentin
de970eb0a5
Fix wizard flow with shibboleth
2014-05-15 09:43:26 +02:00
Jenkins for ownCloud
7a28b44128
[tx-robot] updated from transifex
2014-05-15 01:25:29 -04:00
Eran
5310a3cc1d
better time prediction
2014-05-14 16:57:14 +03:00
Daniel Molkentin
17a2e224c4
Fix memleak
2014-05-14 12:53:12 +02:00
Klaas Freitag
87386ce001
Fix testcase.
...
It failed because the directory where change happened triggered a
notification within the second before, so the event was skipped.
2014-05-14 12:49:11 +02:00
Daniel Molkentin
5ed4710d64
Merge pull request #1726 from owncloud/debian_bsd
...
Make Debian GNU/kFreeBSD compile
2014-05-14 12:20:17 +02:00
Klaas Freitag
5493c22584
Do not dispatch invalid progress information to avoid "unknown" messages
2014-05-14 11:52:22 +02:00
Klaas Freitag
64f4d1b387
Removed block parameter from terminateSync.
...
Do not pretend to immediately terminate the sync but let csync
finish planfully and free the mutex.
2014-05-14 11:52:22 +02:00
Daniel Molkentin
cdd8c8165b
Add missing header to fix Qt5 compilation
2014-05-14 11:22:56 +02:00
Daniel Molkentin
16ffd7fbe4
Merge pull request #1765 from owncloud/shibcookies
...
CookieJar refactoring required to overcome issues in Shibboleth support
2014-05-14 11:14:42 +02:00
Daniel Molkentin
ba959f7cf9
CookieJar refactoring required to overcome issues in Shibboleth support
...
The shibboleth implementation no longer maintains its own QNAM.
Instead, MirallAccessManager now holds a custom QNAM implementation
which saves cookies to a file on disk.
This patch also reduces some complexity wrt the browser window,
which used to be deleted via a roundtrip to its callee, which
is not longer required.
Fixes #1764 and Enterprise bug #165
Going forward, AbstractCredentials::getQNAM() could maybe removed entirely.
2014-05-14 11:11:45 +02:00
Eran
1509c4ffba
made the time description more malleable ,added support for none size update estimation (ie.. deletion), made the estimation more responsive at start and less jittery after some time
2014-05-14 10:55:04 +03:00
Jenkins for ownCloud
cf145feed8
[tx-robot] updated from transifex
2014-05-14 01:25:29 -04:00
hefee
07f57b1982
make Debian GNU/kFreeBSD compile
2014-05-13 16:51:42 +02:00
Klaas Freitag
e62eb62a01
Merge pull request #1179 from tomswartz07/master
...
Add exclusion for OSX ._<filename> files
2014-05-13 15:35:50 +02:00
Olivier Goffart
574e030caf
Use a different key than "user" to store the shib user
...
There is a HACK from commit fa0a2764a4
Which save the http user as a user for all credidentials, but that
cannot work with shibboleth
Fixes https://github.com/owncloud/enterprise/issues/175
2014-05-13 11:54:36 +02:00
Klaas Freitag
3705a42375
Remove misleading error message of "unknown error" for custom errnos.
2014-05-13 10:39:37 +02:00