Markus Goetz [Mon, 22 Feb 2016 10:13:29 +0000 (11:13 +0100)]
SyncEngine: Improve error message for ignored files/folders #4143
Hefee [Sat, 20 Feb 2016 09:34:34 +0000 (10:34 +0100)]
Merge branch '2.1'
Hefee [Sat, 20 Feb 2016 09:33:13 +0000 (10:33 +0100)]
fix typo occured->occurred
Jenkins for ownCloud [Sat, 20 Feb 2016 06:15:28 +0000 (01:15 -0500)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 19 Feb 2016 08:16:37 +0000 (09:16 +0100)]
Merge pull request #4488 from owncloud/21-updates
doc updates for 2.1.1 release
Carla Schroder [Thu, 18 Feb 2016 18:31:51 +0000 (10:31 -0800)]
doc updates for 2.1.1 release
Daniel Molkentin [Wed, 17 Feb 2016 13:16:05 +0000 (14:16 +0100)]
Use correct values for items in version.rc
Jenkins for ownCloud [Wed, 17 Feb 2016 07:19:09 +0000 (02:19 -0500)]
[tx-robot] updated from transifex
Daniel Molkentin [Tue, 16 Feb 2016 16:56:51 +0000 (17:56 +0100)]
Add comment, transliterate copyright symbol
Daniel Molkentin [Tue, 16 Feb 2016 15:19:02 +0000 (16:19 +0100)]
Add file description, copyright to win32 VERSIONINFO struct
Jenkins for ownCloud [Tue, 16 Feb 2016 07:19:01 +0000 (02:19 -0500)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 15 Feb 2016 16:59:01 +0000 (17:59 +0100)]
Tests: Add a test for the timeAgoInWords function
Klaas Freitag [Mon, 15 Feb 2016 16:58:32 +0000 (17:58 +0100)]
Utility: Make the timeAgoInWords method a bit more verbose
Klaas Freitag [Mon, 15 Feb 2016 16:57:03 +0000 (17:57 +0100)]
ActivityWidget: Set timespec to UTC for JSON values.
This will fix the problem in #4439 that the time display
jumps if the timezone is changed on windows.
Daniel Molkentin [Mon, 15 Feb 2016 14:42:02 +0000 (15:42 +0100)]
Win32: More complete resource specification
Add application and vendor name
Addresses #4473
Jenkins for ownCloud [Mon, 15 Feb 2016 07:19:06 +0000 (02:19 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Feb 2016 07:18:43 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Feb 2016 07:18:44 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 12 Feb 2016 07:18:46 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 11 Feb 2016 14:06:00 +0000 (15:06 +0100)]
Use oc:size instead of quota-used-bytes to get the sizes of folder (#4459)
Olivier Goffart [Thu, 11 Feb 2016 13:38:38 +0000 (14:38 +0100)]
SyncJounral: add an index on the error blacklist table
https://github.com/owncloud/enterprise/issues/1035
Jenkins for ownCloud [Thu, 11 Feb 2016 07:19:16 +0000 (02:19 -0500)]
[tx-robot] updated from transifex
Daniel Molkentin [Wed, 10 Feb 2016 19:01:54 +0000 (20:01 +0100)]
Merge pull request #4461 from owncloud/bump-year-to-2016
Bump year to 2016
Lukas Reschke [Wed, 10 Feb 2016 18:52:55 +0000 (19:52 +0100)]
Bump year to 2016
My yearly contribution to the client :wink:
Olivier Goffart [Wed, 10 Feb 2016 16:47:06 +0000 (17:47 +0100)]
Merge branch restore_backup
Olivier Goffart [Wed, 10 Feb 2016 14:38:21 +0000 (15:38 +0100)]
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
Daniel Molkentin [Wed, 10 Feb 2016 11:57:03 +0000 (12:57 +0100)]
Merge remote-tracking branch 'origin/2.1'
Olivier Goffart [Wed, 10 Feb 2016 11:35:26 +0000 (12:35 +0100)]
Use a constant for ConnectionValidator::DefaultCallingIntervalMsec
So there is no runtime initialization
Daniel Molkentin [Tue, 9 Feb 2016 14:56:40 +0000 (15:56 +0100)]
ChangeLog: Set release date
Klaas Freitag [Tue, 9 Feb 2016 11:59:09 +0000 (12:59 +0100)]
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.
Jenkins for ownCloud [Tue, 9 Feb 2016 07:18:41 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 8 Feb 2016 16:00:39 +0000 (17:00 +0100)]
Nautilus integration: Remove Shebang from plugin source.
This fixes #4436
Jenkins for ownCloud [Mon, 8 Feb 2016 15:11:58 +0000 (10:11 -0500)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 8 Feb 2016 15:10:25 +0000 (16:10 +0100)]
nsi translations: finally escape the NSIS lineends correctly.
This will now finally fix #3519
Daniel Molkentin [Mon, 8 Feb 2016 14:55:29 +0000 (15:55 +0100)]
Update ChangeLog
Olivier Goffart [Mon, 8 Feb 2016 13:28:25 +0000 (14:28 +0100)]
Merge remote-tracking branch 'origin/2.1'
Conflicts:
doc/building.rst
Jocelyn Turcotte [Mon, 8 Feb 2016 12:27:44 +0000 (13:27 +0100)]
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.
Olivier Goffart [Mon, 8 Feb 2016 11:35:29 +0000 (12:35 +0100)]
Merge pull request #4437 from owncloud/dev/doninstalltests
Don't install tests and cmocka lib
Olivier Goffart [Mon, 8 Feb 2016 11:07:34 +0000 (12:07 +0100)]
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
Daniel Molkentin [Sun, 7 Feb 2016 23:21:57 +0000 (00:21 +0100)]
update Changelog
Daniel Molkentin [Sat, 6 Feb 2016 14:01:04 +0000 (15:01 +0100)]
Doc: Instruct to use sha256 for Authenticode signing
Klaas Freitag [Fri, 5 Feb 2016 16:57:24 +0000 (17:57 +0100)]
Enable replacement of strange substrings also for nsh files.
Olivier Goffart [Fri, 5 Feb 2016 14:30:29 +0000 (15:30 +0100)]
fix compilation with TOKEN_AUTH_ONLY
Daniel Molkentin [Fri, 5 Feb 2016 13:55:29 +0000 (14:55 +0100)]
Bring build documentation up to date, use docker for Win32 xbuild
Hefee [Fri, 5 Feb 2016 13:14:07 +0000 (14:14 +0100)]
Don't install tests and cmocka lib.
Neither tests nor the libcmocka needs to be installed globally.
Daniel Molkentin [Fri, 5 Feb 2016 11:12:35 +0000 (12:12 +0100)]
Add Dockerfile that allows cross compiling the client
Daniel Molkentin [Thu, 4 Feb 2016 13:20:33 +0000 (14:20 +0100)]
Move ocdoc to current documentation master to catch up with new design
Jocelyn Turcotte [Tue, 2 Feb 2016 09:43:44 +0000 (10:43 +0100)]
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.
Jenkins for ownCloud [Tue, 2 Feb 2016 07:18:29 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 1 Feb 2016 07:18:22 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 30 Jan 2016 07:18:35 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Klaas Freitag [Fri, 29 Jan 2016 11:49:54 +0000 (12:49 +0100)]
Merge pull request #4396 from owncloud/fix_enum_csync
Use the proper enum representations of file types in csync.
Klaas Freitag [Fri, 29 Jan 2016 09:43:31 +0000 (10:43 +0100)]
csync_update: Remove unneeded checks of previous commit.
Jenkins for ownCloud [Fri, 29 Jan 2016 07:18:55 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Klaas Freitag [Thu, 28 Jan 2016 10:44:13 +0000 (11:44 +0100)]
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.
Klaas Freitag [Wed, 27 Jan 2016 13:11:37 +0000 (14:11 +0100)]
csync_update: Handle comparision of file types properly.
Note that the structs use different enums for the file types, unfortunately.
Klaas Freitag [Wed, 27 Jan 2016 13:10:52 +0000 (14:10 +0100)]
csync_update: Use the csync defines rather than plain numbers.
Daniel Molkentin [Tue, 26 Jan 2016 13:09:38 +0000 (14:09 +0100)]
Merge remote-tracking branch 'origin/2.1'
Jenkins for ownCloud [Mon, 25 Jan 2016 07:18:23 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Jan 2016 07:18:22 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 23 Jan 2016 07:18:34 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Fri, 22 Jan 2016 17:13:25 +0000 (18:13 +0100)]
OS X: The --strict option isn't supported on the build machine
XCode is too old.
Jocelyn Turcotte [Fri, 22 Jan 2016 17:03:18 +0000 (18:03 +0100)]
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.
Jocelyn Turcotte [Fri, 22 Jan 2016 15:54:14 +0000 (16:54 +0100)]
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
Jocelyn Turcotte [Fri, 22 Jan 2016 15:54:04 +0000 (16:54 +0100)]
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.
Jocelyn Turcotte [Fri, 22 Jan 2016 15:48:32 +0000 (16:48 +0100)]
Fix gen_sym_files.py trying to process non-macho files
Since it processes all files under PlugIns uncondisionally, it would
now try to process the Info.plist file in the FinderSyncExt bundle.
Christian Kamm [Fri, 22 Jan 2016 10:56:05 +0000 (11:56 +0100)]
Share dialog: More error handling with password policy #4209
Jocelyn Turcotte [Thu, 21 Jan 2016 12:33:03 +0000 (13:33 +0100)]
Bring back the automatic authentication popups
Users have complained that they don't see the notification when it is
shown and are not aware that their files aren't syncing.
Remove the non-interactive credentials fetch logic and add make sure
that the shibboleth popup will flash in the taskbar instead.
This will still not allow the popup to show in front in all cases,
but this is a compromise that we have to chose.
This reverts commit
dcb687929f1323e9fea8a9e4bd48cdd3fa8312d9.
Issue https://github.com/owncloud/enterprise/issues/990
Jenkins for ownCloud [Fri, 22 Jan 2016 07:18:44 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Christian Kamm [Thu, 21 Jan 2016 13:10:37 +0000 (14:10 +0100)]
Sharing: Fix resharing items with limited permissions #4357 #4358
Klaas Freitag [Thu, 21 Jan 2016 10:40:16 +0000 (11:40 +0100)]
Win Admin: Added script to create stable toolchain prj. in OBS
Jenkins for ownCloud [Thu, 21 Jan 2016 07:18:29 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 20 Jan 2016 12:44:30 +0000 (13:44 +0100)]
SyncEngine: fix inode after move if the file has moved on the file system
This is the fix for issue #4370
Step to reproduce the bug:
1) have lots of files in directory "dir1"
2) do mkdir dir2 && mv dir1/* dir2
3) DURING the sync (which takes time because of the many moves) do mkdir dir3 && mv dir2/* dir3/
4) observe that files are PUT in the next sync
The problem is that SyncJournalFileRecord::SyncJournalFileRecord will fail to
get the inode after the forst move because the files are already moved on the
filesystem. Normaly it should use the inode from the discovery phase in that
case but that is not working because it comes from the remote node in case of
moves, so the code in SyncEngine::treewalkFile would not set the inode.
Test in https://github.com/owncloud/smashbox/pull/143
Christian Kamm [Wed, 20 Jan 2016 09:47:01 +0000 (10:47 +0100)]
Update: Check checksum for renamed files #2983
This currently doesn't do much because we only compute content
checksums for .eml files.
Christian Kamm [Wed, 20 Jan 2016 12:17:54 +0000 (13:17 +0100)]
Sharing: Allow only one share dialog per path #3184
Christian Kamm [Wed, 20 Jan 2016 11:41:52 +0000 (12:41 +0100)]
AccountSettings: Auto-expand only single folders #4283
Christian Kamm [Tue, 19 Jan 2016 13:03:13 +0000 (14:03 +0100)]
Share dialog: Error reporting with password policy #4209
Christian Kamm [Tue, 19 Jan 2016 12:37:06 +0000 (13:37 +0100)]
Share dialog: Remove unintended spinner when password required
Jenkins for ownCloud [Wed, 20 Jan 2016 07:18:29 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 20 Jan 2016 06:15:17 +0000 (01:15 -0500)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 19 Jan 2016 16:39:43 +0000 (17:39 +0100)]
AccountSettings: fix Add Folder button size #4373
Christian Kamm [Tue, 19 Jan 2016 08:58:00 +0000 (09:58 +0100)]
Win: Fix filesystem detection for exFAT workaround #2701
Daniel Molkentin [Mon, 18 Jan 2016 15:16:28 +0000 (16:16 +0100)]
Add mac system tray fix as deployed on the build machine
Fixes #3918
Markus Goetz [Mon, 18 Jan 2016 12:34:00 +0000 (13:34 +0100)]
Changelog for 2.1.1
Jocelyn Turcotte [Mon, 18 Jan 2016 10:37:19 +0000 (11:37 +0100)]
shell: Update binaries to fix the Directory Opus warning
Jenkins for ownCloud [Mon, 18 Jan 2016 07:18:25 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 17 Jan 2016 07:18:45 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 16 Jan 2016 07:18:48 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 15 Jan 2016 12:16:52 +0000 (13:16 +0100)]
Upload: Chunk size can be changed in the config file
Added a new "chunkSize" entry in the General group of the owncloud.cfg
which can be set to the size, in bytes, of the chunks.
This allow user with hude bandwidth to select more optimal chunk size
Issue #4354
Klaas Freitag [Fri, 15 Jan 2016 11:14:16 +0000 (12:14 +0100)]
csync_private: Fix comment about size of file id buffer
Jenkins for ownCloud [Fri, 15 Jan 2016 07:18:51 +0000 (02:18 -0500)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Thu, 14 Jan 2016 15:24:29 +0000 (16:24 +0100)]
OS X shell: Don't allow sharing sync roots #3505
Jocelyn Turcotte [Thu, 14 Jan 2016 14:02:56 +0000 (15:02 +0100)]
Windows shell: Remove unneeded Winsock code #4356
Jocelyn Turcotte [Thu, 14 Jan 2016 12:01:18 +0000 (13:01 +0100)]
Windows: Fix the progress text being cut but a few pixels
QFontMetrics::boundingRect doesn't return the right size for this
font size for some reason, while it works well if we remove the
smaller point size adjustment for the progress font.
To avoid having to debug the font system in Qt just increase the
existing +2px adjustment to +5px so that it renders fine.
Jenkins for ownCloud [Thu, 14 Jan 2016 07:19:05 +0000 (02:19 -0500)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 13 Jan 2016 16:49:41 +0000 (17:49 +0100)]
SyncEngine: For server older than 8.1, ignore invalid char in new directories
Server older than 8.1 cannot cope with invalid char in the filename
so we must not send them from the client. We were already checking
for new files, but not for renames or new directories.
https://github.com/owncloud/enterprise/issues/1009
Olivier Goffart [Wed, 13 Jan 2016 10:57:15 +0000 (11:57 +0100)]
FolderDelegate: fix positions and margin
- Fix the margin of the progressbar to let some room for the '...' button
- Fix the size of the "Add Folder" button
Jocelyn Turcotte [Wed, 13 Jan 2016 10:42:49 +0000 (11:42 +0100)]
Fix the folder option button click
The height adjustment done to place the button in the middle of the
non-error area was only done for rendering. Make sure that we do the
same adjustment when mapping click events as well.
Also replace some wrong occurences of aliasMargin*2 for margin.
Olivier Goffart [Wed, 13 Jan 2016 09:31:02 +0000 (10:31 +0100)]
ConfigFile: Create the directory when using --confdir and it does not exist
Previously we would fail to start if the directory was not existing.
This was working for relative directory, but it should also work for
absolute ones
https://github.com/owncloud/enterprise/issues/970
Jenkins for ownCloud [Wed, 13 Jan 2016 07:19:20 +0000 (02:19 -0500)]
[tx-robot] updated from transifex