bb32831a60
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/gui/folderman.cpp
2014-07-17 11:31:45 +02:00
743c1c2eda
SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect.
...
For each configured sync folder send an UPDATE_VIEW directly after
the socket connect to make the shell integration updating the view.
2014-07-17 11:26:03 +02:00
0e9a08cbbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-07-17 11:25:08 +02:00
d2445ec72d
PropagatorQNAM: Never send if-match header for new files.
2014-07-17 11:23:11 +02:00
fef713aaed
SocketAPI: Create the socket API instance in folderman.
2014-07-17 11:22:18 +02:00
c4d73688a6
Folderman: Fix path detection in folderForPath().
2014-07-17 11:21:02 +02:00
56b721b2eb
propagator_qnam: fix warning
2014-07-17 11:05:16 +02:00
2981b37219
Use file size of factor of four because of the createLocalFile algorithm
2014-07-17 10:29:13 +02:00
cfc2f84d3e
[tx-robot] updated from transifex
2014-07-17 01:25:28 -04:00
2a5691e575
tests: Fix assertion.
2014-07-16 17:26:06 +02:00
774432066e
tests: Reverted previous change, do not append in createLocalFile()
2014-07-16 17:25:18 +02:00
e6c501de8e
FolderMan: More useful logging.
2014-07-16 16:59:20 +02:00
d5a8661480
tests: do not use system any more to modify files, rather perl native.
2014-07-16 14:06:57 +02:00
2fdb3cfdfb
Merge branch 'il'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/propagator_qnam.cpp
2014-07-16 10:49:16 +02:00
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
e5191acd73
[tx-robot] updated from transifex
2014-07-16 01:25:23 -04:00
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
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
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
0202351a27
Propagator: Fix crash when logging out during upload
...
Fixes #1957
2014-07-14 19:53:42 +02:00
ea690c285b
Make NSIS installer work with new structure
2014-07-14 13:12:31 +02:00
28879712e9
Make krazy target work again
2014-07-14 12:19:32 +02:00
3c2e43d883
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
2014-07-14 10:50:53 +02:00
dde06dfaba
[tx-robot] updated from transifex
2014-07-14 01:25:21 -04:00
eb0f074097
[tx-robot] updated from transifex
2014-07-13 02:06:11 -04:00
b6c9b5645c
[tx-robot] updated from transifex
2014-07-13 01:25:20 -04:00
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
a281b36d6f
SocketAPI: send the path with UPDATE_VIEW
2014-07-11 12:34:04 +02:00
7772501cdf
Remove unused socketPath variable.
2014-07-11 12:33:43 +02:00
2c904afd04
OS X explicitly requires the neon include path to be set
2014-07-11 12:11:04 +02:00
2cc13fb74a
Fix includes in mac specific headers
2014-07-11 11:38:01 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
d1b991e198
Fix windows compilation
2014-07-10 22:58:58 +02:00
00f793a841
CMake: Remove accidentially added typo to fix build.
2014-07-10 17:20:40 +02:00
bdb9598227
SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.
2014-07-10 16:35:18 +02:00
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
3477ea0eeb
Fix build with TOKEN_ONLY_AUTH
...
It was broken by commit 6ff38d8005
2014-07-10 15:26:55 +02:00
9dacad99fa
t1.pl: Change the corruption creation command.
2014-07-10 12:07:28 +02:00
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
d3b599b727
Fix build of the test on Qt5
2014-07-10 10:42:02 +02:00
4369151cd8
[tx-robot] updated from transifex
2014-07-10 03:57:24 -04:00
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
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
e0c2e8ed86
folder: remove TOKEN_AUTH_ONLY
...
Folder is no longer in the libowncloudsync
2014-07-09 22:44:08 +02:00
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
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
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
8aacb3f7ec
Remove undeeded include
2014-07-09 22:44:08 +02:00
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
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
Daniel Molkentin