Olivier Goffart
80b5f3f43d
Never overwrite the size from the db when updating the metadata
...
the size on the server might be different from the size on the client
with certain backend so it should be ignored.
(cherry picked from commit 9222db6df9b19a21e1bea5a238d745d96a6385e3)
2016-03-17 10:48:49 +01:00
Christian Kamm
4900703970
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
(cherry picked from commit 7bd4f95b8c
)
2016-03-15 15:17:35 +01:00
Markus Goetz
ecd44f70de
Submodule: Use https path
...
Else I got a git hickup here
2016-03-15 11:55:28 +01:00
Markus Goetz
9d5307d04c
Propagator: On remove move, take size from DB
...
Some servers can claim different sizes for on-the-fly protected/encrypted
MS Office files during discovery.
2016-03-15 10:28:47 +01:00
Markus Goetz
9460aa7f21
SyncEngine: Also emit item in other code path
...
Else a user of this library cannot build a complete list of items.
2016-03-14 18:12:07 +01:00
Carla Schroder
6493421109
Merge pull request #4509 from owncloud/build-client
...
improve client build instructions
2016-02-29 08:00:12 -08:00
Carla Schroder
0052386b41
correct OBS url for client building
2016-02-26 08:41:33 -08:00
Carla Schroder
e1909c3bd1
add OBS link for client building
2016-02-26 08:37:54 -08:00
Carla Schroder
8ce9388d29
corrections to client building instructions
2016-02-26 08:32:52 -08:00
Carla Schroder
c13637b105
improve client build instructions
2016-02-24 13:31:19 -08:00
Carla Schroder
424bf6f06a
Merge pull request #4503 from owncloud/client-regkeys
...
Add note that branded clients have custom windows registry key names
2016-02-23 09:47:10 -08:00
Carla Schroder
46c3c9e0fc
fix formatting
2016-02-23 09:45:30 -08:00
Carla Schroder
85f6c5fda8
Add note that branded clients have custom windows registry key names
2016-02-23 09:42:40 -08:00
Hefee
74f74e0363
fix typo occured->occurred
2016-02-20 10:33:13 +01:00
Daniel Molkentin
bd72408e7a
Merge pull request #4488 from owncloud/21-updates
...
doc updates for 2.1.1 release
2016-02-19 09:16:37 +01:00
Carla Schroder
a32381a2a4
doc updates for 2.1.1 release
2016-02-18 10:31:51 -08:00
Olivier Goffart
cd83772112
SyncJounral: add an index on the error blacklist table
...
https://github.com/owncloud/enterprise/issues/1035
2016-02-11 14:38:38 +01:00
Olivier Goffart
893e22691d
ConnectionValidator: Make sure we intercept propfind error
...
If the PROPFIND return an invalid code (like 200) then we would
not recieve the error signal and we would never sync again.
Found while investigating https://github.com/owncloud/enterprise/issues/1068
2016-02-10 15:38:21 +01:00
Daniel Molkentin
c98bf174ed
ChangeLog: Set release date
2016-02-09 15:57:01 +01:00
Klaas Freitag
ae3b9f112c
Linux shell integration: Do not call sed from absolute path.
...
sed is in /bin/ rather than in /usr/bin on some systems, which
makes the scripts fail in the build environment. sed should be
in the PATH tough.
2016-02-09 13:01:03 +01:00
Jenkins for ownCloud
7fd9e751e0
[tx-robot] updated from transifex
2016-02-09 02:18:41 -05:00
Jenkins for ownCloud
95a58e74ca
[tx-robot] updated from transifex
2016-02-08 10:11:58 -05:00
Klaas Freitag
b70a95ba30
nsi translations: finally escape the NSIS lineends correctly.
...
This will now finally fix #3519
2016-02-08 16:11:18 +01:00
Daniel Molkentin
72e14643f7
Update ChangeLog
2016-02-08 15:55:29 +01:00
Jocelyn Turcotte
f140d3447c
OS X: Fix the file system watcher ignoring unicode paths #4424
...
Add a missing string normalization when fetching the path
from the file system event.
2016-02-08 13:30:08 +01:00
Olivier Goffart
6b643c7501
Discovery: don't ignore recall file #4420
...
The ".sys.admin#recall#" is the recall file and should not be ignored
even if hidden.
The remote discovery do not need to detect hidden files because it
is already detected by csync in all cases. So this avoid code duplication
2016-02-08 12:07:34 +01:00
Daniel Molkentin
24920a4ad1
update Changelog
2016-02-08 00:21:57 +01:00
Daniel Molkentin
65655584e9
Doc: Instruct to use sha256 for Authenticode signing
2016-02-06 15:01:31 +01:00
Klaas Freitag
e397056d2e
Enable replacement of strange substrings also for nsh files.
2016-02-05 17:59:34 +01:00
Olivier Goffart
54a278edb9
fix compilation with TOKEN_AUTH_ONLY
2016-02-05 15:30:29 +01:00
Daniel Molkentin
b0acc475b0
Bring build documentation up to date, use docker for Win32 xbuild
2016-02-05 14:55:29 +01:00
Daniel Molkentin
834a971e2a
Add Dockerfile that allows cross compiling the client
2016-02-05 12:17:31 +01:00
Daniel Molkentin
6701927840
Move ocdoc to current documentation master to catch up with new design
2016-02-04 14:21:23 +01:00
Jocelyn Turcotte
e4ae279f7b
Fix the crash reporter not launching
...
The proper path needs to be returned from CopyFramework
in order for install_name_tool to be run on the destination.
2016-02-02 10:43:52 +01:00
Jenkins for ownCloud
25e0d1eac3
[tx-robot] updated from transifex
2016-02-02 02:18:29 -05:00
Jenkins for ownCloud
d42faa80a6
[tx-robot] updated from transifex
2016-02-01 02:18:22 -05:00
Jenkins for ownCloud
a92c756fa9
[tx-robot] updated from transifex
2016-01-30 02:18:35 -05:00
Klaas Freitag
4cf94ed62a
Merge pull request #4396 from owncloud/fix_enum_csync
...
Use the proper enum representations of file types in csync.
2016-01-29 12:49:54 +01:00
Klaas Freitag
57c7727479
csync_update: Remove unneeded checks of previous commit.
2016-01-29 10:43:31 +01:00
Jenkins for ownCloud
8480fc7ae5
[tx-robot] updated from transifex
2016-01-29 02:18:55 -05:00
Klaas Freitag
5ae81aa96c
Nemo Shell Integration: Add missing conversion script.
...
This script creates the Nemo plugin out of the Nautilus plugin.
Both are source compatible, but need to include the right modules
depending on the name of the file manager.
The script is called by cmake.
2016-01-28 11:44:13 +01:00
Klaas Freitag
28907ec0c3
csync_update: Handle comparision of file types properly.
...
Note that the structs use different enums for the file types, unfortunately.
2016-01-27 14:11:37 +01:00
Klaas Freitag
7ddfa79950
csync_update: Use the csync defines rather than plain numbers.
2016-01-27 14:10:52 +01:00
Jenkins for ownCloud
ba87178dee
[tx-robot] updated from transifex
2016-01-25 02:18:23 -05:00
Jenkins for ownCloud
8de21cc37f
[tx-robot] updated from transifex
2016-01-24 02:18:22 -05:00
Jenkins for ownCloud
063444801a
[tx-robot] updated from transifex
2016-01-23 02:18:34 -05:00
Jocelyn Turcotte
46e384a2f2
OS X: The --strict option isn't supported on the build machine
...
XCode is too old.
2016-01-22 18:13:25 +01:00
Jocelyn Turcotte
5092243080
OS X: Fix macdeployqt not to embed symlinks when ran multiple times
...
ln has a special syntax to create the symlink inside the last path if it's
a directory (or a symlink to a directory).
Also pass --strict to codesign --verify to catch this kind of error.
2016-01-22 18:04:46 +01:00
Jocelyn Turcotte
110f3710be
OS X: Make sure Qt frameworks have the right structure
...
This fixes the codesign verification by making sure that the Qt
framework bundles follow the required structure described at:
https://developer.apple.com/library/ios/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
2016-01-22 16:58:41 +01:00
Jocelyn Turcotte
6096a836a4
Do a codesign --verify before running spctl
...
codesign is less strict than spctl and gives more output.
codesign -d alone doesn't verify but only prints.
2016-01-22 16:54:04 +01:00