Klaas Freitag
2a5691e575
tests: Fix assertion.
2014-07-16 17:26:06 +02:00
Klaas Freitag
774432066e
tests: Reverted previous change, do not append in createLocalFile()
2014-07-16 17:25:18 +02:00
Klaas Freitag
e6c501de8e
FolderMan: More useful logging.
2014-07-16 16:59:20 +02:00
Klaas Freitag
af3fae9c28
Bumped to 1.6.2 rc1
2014-07-16 14:32:58 +02:00
Klaas Freitag
d5a8661480
tests: do not use system any more to modify files, rather perl native.
2014-07-16 14:06:57 +02:00
Klaas Freitag
d3b72940fd
Updated Changelog for 1.6.2
2014-07-16 11:56:17 +02:00
Daniel Molkentin
e8de3e855a
1.6.2
2014-07-16 11:43:13 +02:00
Klaas Freitag
71338000a4
SetupWizard: Keep initial local folder to compare later for changes.
...
If the local folder changes, the sync has to be reinitialized as
well. Until now we did not detect that, which led to the case that
the sync folder was not reinitialized in case only the local folder
changed in the setup dialog.
2014-07-16 11:37:46 +02:00
Olivier Goffart
2fdb3cfdfb
Merge branch 'il'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/propagator_qnam.cpp
2014-07-16 10:49:16 +02:00
Olivier Goffart
8961e61f60
Merge branch '1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-07-16 09:57:40 +02:00
Jenkins for ownCloud
e5191acd73
[tx-robot] updated from transifex
2014-07-16 01:25:23 -04:00
Olivier Goffart
d697969f36
Use another way to detect that the server was reconfigured
...
Before, we would only detect it if all the files were removed, and no
file where added or changed. This may not be enough because there might
be a welcome.txt file. Now, we check that none of the file stays the same,
and some files are removed.
Relates issue #1948
2014-07-15 18:09:08 +02:00
Olivier Goffart
51e9c5fd96
propagator_qnam Fix signal slot connection
...
Fix the signature so it can be connected
This was hapenning if the derver does not support X-OC-MTime
issue #1963
2014-07-15 18:08:26 +02:00
Klaas Freitag
997504c03c
FolderMan: Unload folder method added.
...
unloadFolder now correctly removes a folder from all maps and signal
mappers.
2014-07-15 16:07:23 +02:00
Markus Goetz
0202351a27
Propagator: Fix crash when logging out during upload
...
Fixes #1957
2014-07-14 19:53:42 +02:00
Jenkins for ownCloud
dde06dfaba
[tx-robot] updated from transifex
2014-07-14 01:25:21 -04:00
Jenkins for ownCloud
eb0f074097
[tx-robot] updated from transifex
2014-07-13 02:06:11 -04:00
Jenkins for ownCloud
b6c9b5645c
[tx-robot] updated from transifex
2014-07-13 01:25:20 -04:00
Klaas Freitag
a281b36d6f
SocketAPI: send the path with UPDATE_VIEW
2014-07-11 12:34:04 +02:00
Klaas Freitag
7772501cdf
Remove unused socketPath variable.
2014-07-11 12:33:43 +02:00
Daniel Molkentin
d1b991e198
Fix windows compilation
2014-07-10 22:58:58 +02:00
Klaas Freitag
00f793a841
CMake: Remove accidentially added typo to fix build.
2014-07-10 17:20:40 +02:00
Klaas Freitag
bdb9598227
SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.
2014-07-10 16:35:18 +02:00
Klaas Freitag
c6deb392fd
SocketAPI: Enhance SyncFileStatus to have share information.
...
Added a new class SyncFileStatus to reflect that properly.
2014-07-10 16:28:40 +02:00
Olivier Goffart
3477ea0eeb
Fix build with TOKEN_ONLY_AUTH
...
It was broken by commit 6ff38d8005
2014-07-10 15:26:55 +02:00
Klaas Freitag
9dacad99fa
t1.pl: Change the corruption creation command.
2014-07-10 12:07:28 +02:00
Olivier Goffart
73e35c66af
owncloudcmd: fix the --trust option
...
We can't call csync_set_userdata in owncloudcmd because it is
going to be overwritten later in the SyncEngine.
So we had an object of type SyncEngine* that we cast to CmdOptions*
and the trust flag was in the padding, so was some random data.
Therefore we must use global variables in that case in order to
know if we should ignore the certificate.
2014-07-10 11:19:23 +02:00
Olivier Goffart
d3b599b727
Fix build of the test on Qt5
2014-07-10 10:42:02 +02:00
Jenkins for ownCloud
4369151cd8
[tx-robot] updated from transifex
2014-07-10 03:57:24 -04:00
Olivier Goffart
846773efd3
Define Q_DECL_OVERRIDE for Qt4
...
That macro is new in Qt5, define it as well when compiling with Qt4
so we can use it in mirall
Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
2014-07-09 23:31:56 +02:00
Olivier Goffart
bcfa34357b
Add Q_DECL_OVERRIDE for all function that are overriding something
...
This was made automatically with
clang-modernize -override-macros -add-override
2014-07-09 23:31:56 +02:00
Olivier Goffart
e0c2e8ed86
folder: remove TOKEN_AUTH_ONLY
...
Folder is no longer in the libowncloudsync
2014-07-09 22:44:08 +02:00
Olivier Goffart
b80a3876ab
cleanup the CMakeLists.txt
...
Headers need not to be added if they are not going to be installed
The list was incomplete anyway, and most of the _HEADERS variables
were even not used
2014-07-09 22:44:08 +02:00
Olivier Goffart
26e17f58ef
Engine: Do not reset the csync log callback in the engine
...
It is already set in Folder and we don't want to use the Logger
in command line clients
2014-07-09 22:44:08 +02:00
Olivier Goffart
45d1567057
Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
...
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients
Also the FolderWatcher is only used by the folder and not used by the
command line clients
2014-07-09 22:44:08 +02:00
Olivier Goffart
8aacb3f7ec
Remove undeeded include
2014-07-09 22:44:08 +02:00
Olivier Goffart
99ee81a489
Utility: Move showInFileManager in its own file
...
And get rid of GUI in the Utility namespace
2014-07-09 22:44:08 +02:00
Olivier Goffart
517ffbd783
Utility: remove Utility::dataLocation
...
It is used only from one location, so put the code there
2014-07-09 22:44:08 +02:00
Olivier Goffart
7dd926d4f1
Utility: move raiseDisalog to owncloudGui
...
Reduce the GUI dependency in the Utility namespace used by libowncloudsync
2014-07-09 22:44:08 +02:00
Olivier Goffart
cbc7942a00
Added t8.pl that test case sensitivity issues
...
Made some change in the .cpp code in order to be able to test
the code when the file system is case sensitive
2014-07-09 22:44:08 +02:00
Olivier Goffart
63cd5ef563
ProtocolWidget: limit the number of items
...
That should save memory instead of letting the number of items grow
to infinity
2014-07-09 15:48:03 +02:00
Jenkins for ownCloud
3806905f5b
[tx-robot] updated from transifex
2014-07-09 01:25:24 -04:00
Olivier Goffart
82c254fecf
propagator_qnam: Avoid using too much memory
...
The idea here was that the buffer would be maximum 8KiB, not minimum.
2014-07-08 15:30:53 +02:00
Jenkins for ownCloud
2496f23e45
[tx-robot] updated from transifex
2014-07-08 01:25:22 -04:00
Olivier Goffart
86bea9a9af
shibboleth: Fix the waiting curser that would not disapear
...
Fix #1915
2014-07-07 14:08:13 +02:00
Jenkins for ownCloud
4bb1172c84
[tx-robot] updated from transifex
2014-07-05 01:25:23 -04:00
Klaas Freitag
88f26fb548
HTTP Creds: In case of Keychain error, open the interact password dialog
...
But in case the user clicks cancel in the interactive dialog, invalidate
the credentials. Emit fechted() also in error case.
2014-07-04 13:27:35 +02:00
Klaas Freitag
a9f1de84f0
HTTP Credentials: Read the password from the old location if not found.
...
Earlier clients used QtKeychain without a QSettings object, which made
QtKeychain to write the password encrypted into a settings default
location, ie. the registry under windows.
If we can not find a password at the new location it is tried to read
the password from the old default location once. That makes people
happy in migration scenarios.
2014-07-04 13:27:22 +02:00
Jenkins for ownCloud
367ff79ef1
[tx-robot] updated from transifex
2014-07-04 01:25:25 -04:00
Daniel Molkentin
2961c44bbe
NSIS: look for socketapiclient in the right place
2014-07-03 09:35:45 +02:00
