Klaas Freitag
1c73a8d4ad
Fix installation for MacOSX
2014-04-28 10:24:12 +02:00
Daniel Molkentin
2d3ea59755
Limit the mac workaround to the Mac OS X platform
2014-04-28 10:13:53 +02:00
Jenkins for ownCloud
b8b064836c
[tx-robot] updated from transifex
2014-04-28 02:07:38 -04:00
Jenkins for ownCloud
3ab1330f63
[tx-robot] updated from transifex
2014-04-28 01:26:40 -04:00
Jenkins for ownCloud
ab711ddc36
[tx-robot] updated from transifex
2014-04-27 02:06:35 -04:00
Jenkins for ownCloud
2a1e67e587
[tx-robot] updated from transifex
2014-04-27 01:25:42 -04:00
Jenkins for ownCloud
1d3febe053
[tx-robot] updated from transifex
2014-04-26 01:25:42 -04:00
Olivier Goffart
165e35c750
t1.pl: change assertLocalAndRemoteDir so we actually test something
2014-04-25 14:35:20 +02:00
Olivier Goffart
9da261acd8
Do not read from the database when upgrading from 1.5
...
We need to make sure that the file id are updated (if the user
had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)
2014-04-25 13:31:44 +02:00
Jenkins for ownCloud
7544f4d367
[tx-robot] updated from transifex
2014-04-25 02:06:36 -04:00
Jenkins for ownCloud
a29a56bce8
[tx-robot] updated from transifex
2014-04-25 01:25:42 -04:00
Olivier Goffart
642c16b09b
Missing EXPORT
2014-04-24 23:57:42 +02:00
Olivier Goffart
5c92c190f0
Add EXPORT macro to owncloudsync library
...
Not all the class are exported currently, only the one that seems to be used
by the command line tools
2014-04-24 23:45:20 +02:00
Olivier Goffart
cc7826e087
Add a compile option to disable renaming when the extension changes
...
This is only used for a very specific server that do not support
changing the extension of files without re-uploading the file.
Since the change is small and self contained, it is guarded by a #ifdef
(Removed old BLACKLIST_ON_ERROR option that is no longer in use)
2014-04-24 11:51:48 +02:00
Jenkins for ownCloud
a154656311
[tx-robot] updated from transifex
2014-04-24 01:25:45 -04:00
hefee
9b7a3d00ee
Using QFile::decodeName instead of QLatin1String
2014-04-23 18:59:40 +02:00
Sandro Knauß
1d862b77af
merged 1.5 into master
2014-04-23 18:54:49 +02:00
Klaas Freitag
888843e655
Removed another file for Jenkins.
2014-04-23 13:22:06 +02:00
Klaas Freitag
28970393f6
Removed a test file as jenkins fails on it.
2014-04-23 13:18:28 +02:00
Klaas Freitag
1af7dc952c
Update to latest GNUInstallDirs cmake module
...
This version correctly detects debians multiarch lib handling and
lets us remove the manually set CMAKE_LIB_INSTALL_DIRS from the rules
file.
2014-04-23 13:04:16 +02:00
Jenkins for ownCloud
62dcfe85e4
[tx-robot] updated from transifex
2014-04-23 01:25:49 -04:00
Markus Goetz
f6711b2842
CMake: Find libraries also on Win host compile
2014-04-22 21:02:08 +02:00
Olivier Goffart
f2519e9d87
Fix function signature: pass argument by const reference
2014-04-22 19:52:09 +02:00
Markus Goetz
94f380c1f0
Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME
2014-04-22 17:05:59 +02:00
Markus Goetz
197d180cb9
Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME
2014-04-22 16:17:49 +02:00
Markus Goetz
4be20db670
Propagator: Add makeConflictFileName function
2014-04-22 16:07:18 +02:00
Olivier Goffart
46d6191bc2
Also list folder for which the alias starts with '.'
...
Fixes #1695
2014-04-22 14:26:08 +02:00
Olivier Goffart
ee22f377af
Start the folder watcher when new folder are added
...
Before, we would only set up a file system watcher when we read the
config at startup. But we also need to do it in the other case when
the user configure new folder to watch
2014-04-22 14:15:43 +02:00
Olivier Goffart
44a04227f1
Update dynamically the error message in the account settings
...
This let the error be shown when the conneciton is missing at startup
And also remove the red background when there is no longer an error
2014-04-22 14:08:37 +02:00
Olivier Goffart
707c6fcc5d
An abort on the reply is not usually a password error.
...
Copy the code from HTTPCredidentials
2014-04-22 12:52:13 +02:00
Olivier Goffart
edb1f61241
Fix compilation without the BUILD_ONLY_LIBRARIES mode
2014-04-22 12:44:01 +02:00
Olivier Goffart
3fac5f91c8
In case of error, report the right error instead of missing etag
...
also, missing etag is not a fatal error
2014-04-22 12:43:38 +02:00
Olivier Goffart
1338c08622
Fix compilation on linux with BUILD_LIBRARIES_ONLY
2014-04-22 11:33:38 +02:00
Olivier Goffart
0cf8091705
Merge pull request #1700 from wakeup/master
...
Fix non-closed p tag
2014-04-22 10:08:29 +02:00
Klaas Freitag
521373f075
More specific log output.
2014-04-22 09:33:07 +02:00
Klaas Freitag
c24732f641
More debugable code.
2014-04-22 09:33:07 +02:00
Jenkins for ownCloud
655188d7b3
[tx-robot] updated from transifex
2014-04-22 01:25:41 -04:00
Markus Goetz
77ac092975
WiP: Attempt to compile without UI
2014-04-21 19:57:15 +02:00
Volkan Gezer
78e5e4ab66
Fix non-closed p tag
2014-04-21 15:29:42 +02:00
Jenkins for ownCloud
934eda128b
[tx-robot] updated from transifex
2014-04-21 01:27:00 -04:00
Daniel Molkentin
ece41921ff
Merge pull request #1697 from wakeup/master
...
Space fix
2014-04-20 15:44:03 +02:00
Volkan Gezer
9b71643c1c
Space fix
2014-04-20 14:54:40 +02:00
Jenkins for ownCloud
ed48b4bbf2
[tx-robot] updated from transifex
2014-04-20 01:26:54 -04:00
Olivier Goffart
b08284e4cc
Fix the background check job for the connection
...
We can't use the quota job for that as it needs the credidentials and therefore
may re-enter the credidential code when we are currently trying to fetch the credentials.
The quotainfo.cpp part of this patch is basically a revert of d836b80153
2014-04-19 09:49:52 +02:00
Jenkins for ownCloud
4731b506e5
[tx-robot] updated from transifex
2014-04-19 01:27:02 -04:00
Olivier Goffart
7d3b0fe0c5
Fix memory leak: Don't need to call strdup here
...
The other_node outlive the trav structure, so we can just use the same pointer
2014-04-18 19:16:10 +02:00
Olivier Goffart
fa38bf7029
Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6
...
We fetch the id from the server, but don't save them in the database.
I Could have used INSTRUCTION_UPDATED for that, but then i would need to update the
reconcile algorithm to take in account the fact that UPDATED is possible there.
Instead, use should_update_etag which means the db is going to be written again
Remove reference to old instruction _UPDATED and _DELETED which does not make sens with
the new propagator
Improve the test to test this case, and that etags are properly writen to the DB
when there is a fake conflict
2014-04-18 18:27:27 +02:00
Olivier Goffart
bfdf638334
Add the files required by the tests.
...
Somehow they got removed with all the moving and merging.
Especially kernelcrash.txt is required for t1.pl
2014-04-18 17:20:42 +02:00
Jenkins for ownCloud
e6664c7790
[tx-robot] updated from transifex
2014-04-17 15:03:55 -04:00
Mr. Jenkins
a90779910a
[tx-robot] updated from transifex
2014-04-17 01:26:53 -04:00
