Jocelyn Turcotte [Fri, 6 May 2016 10:32:01 +0000 (12:32 +0200)]
[shell/windows] Fix the windows status push not working (#4784)
Since the windows implementation first does cache lookups using the
path string, directories need to be passed identically as through
RETRIEVE_FILE_STATUS.
Change the convention to never have a trailing slash for directories
in the protocol. This allows the convention to be applied without
having to access the disk (since we'd need to know if the path is
represented by a directory) and also matches the convention of the
rest of the sync engine. Individual file manager plugins are then
responsible of handling pushed paths as not ending with a trailing
slash.
This also:
- Moves the trailing slash removal logic from the SyncFileStatusTracker
to the SocketApi class
- Remove the unneeded QString::normalized call in fileStatus, since
this should already be done by the FolderWatcher and plugins
Jenkins for ownCloud [Fri, 6 May 2016 06:19:00 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 4 May 2016 12:19:18 +0000 (14:19 +0200)]
Dolphin plugin: fix build with branding
Make sure that the name of the _export.h file is the same no matter the plugin
Jenkins for ownCloud [Wed, 4 May 2016 06:19:15 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 3 May 2016 14:28:09 +0000 (16:28 +0200)]
NSIS: Properly uninstall both x64 and x86 DLLs #4762
Viel hilft viel ;-)
Markus Goetz [Tue, 3 May 2016 13:16:07 +0000 (15:16 +0200)]
Qt patches: Update with information about Qt 5.6
Jocelyn Turcotte [Tue, 3 May 2016 11:04:34 +0000 (13:04 +0200)]
Merge branch 'overlayIconFixes' into 2.2 (#4765)
Jocelyn Turcotte [Thu, 28 Apr 2016 20:43:53 +0000 (22:43 +0200)]
[osx] Fix missing overlay icons on client startup
Since the statuses are cached and that we can't invalidate the cache,
sending NOP would need to be overwritten by the default OK status
once the client successfully connected. But instead of remembering
which files we NOPed, rather wait until we are ready to sync before
sending the REGISTER_PATH message to the socket API client. It will
also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS
requests.
Also remove AccountState::canSync, since it does the same as
isConnected and syncing is not an account responsibility.
Jocelyn Turcotte [Thu, 28 Apr 2016 19:20:24 +0000 (21:20 +0200)]
Avoid a SyncFileStatusTracker private overload with the same name
Having an overload as a private function in the same class makes the
code harder to follow. Rename the private fileStatus to syncFileItemStatus.
Jocelyn Turcotte [Thu, 28 Apr 2016 17:33:55 +0000 (19:33 +0200)]
Simplify the root status logic
Go through fileStatus like other cases to make sure that all use
cases go through the same code path. This also makes sure to use
lookupProblem which will use lower_bound which is more efficient
for larger sets of sync problems.
This also fixes the issue with lookupProblem that prevented it to
properly match an empty pathToMatch, caused by the fact that the
problem map contains relative paths not starting with a slash.
Jocelyn Turcotte [Thu, 28 Apr 2016 17:03:13 +0000 (19:03 +0200)]
Fix the root item sync status #4682
Make sure that we push the new status when the status of the SyncEngine
changed. SyncEngine::started comes a bit late, only when the propagation
starts, although it's better in this case since child folders will
only switch to Sync in aboutToPropagate.
Also fix an issue with SyncEngine::findSyncItem when using an empty
fileName; this would match and return the wrong item, even though
not currently happening with the code since fileStatus won't call
it with an empty fileName anymore.
Jocelyn Turcotte [Thu, 28 Apr 2016 12:38:46 +0000 (14:38 +0200)]
Fix the sync status push for parent directories #4682
As before, we rely on metadata-update SyncFileItem entries for parent
directories to notify us that a directory contains files to propagate,
and to know when all children were propagated through its itemCompleted
signal.
Those metadata SyncFileItems however have a None direction and we need
to add a explicit directory check to show them as Sync.
This fix also handles new files as well as existing ones, so no need
to keep a separate logic for new files.
Klaas Freitag [Tue, 3 May 2016 09:36:56 +0000 (11:36 +0200)]
Fix nautilus and nemo plugin branding strings. (#4780)
* Fix nautilus and nemo plugin branding strings.
Fix for owncloud/enterprise#1314
* nautilus plugin: Add a comment why the line needs to stay unchanged.
Jenkins for ownCloud [Tue, 3 May 2016 06:19:16 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 2 May 2016 15:34:21 +0000 (17:34 +0200)]
Propagator: fix qt4 build
propagatedownload.cpp:712:35: error: 'seenLockedFile' is a protected member of 'OCC::OwncloudPropagator'
Signals are protected in Qt4 but public in Qt5, mark the class accessing it
as friend when compiling with Qt4
Daniel Molkentin [Wed, 20 Apr 2016 14:51:17 +0000 (16:51 +0200)]
Re-Apply: Disambiguate socket API pathes on Windows with user name
Addresses #3411
Olivier Goffart [Mon, 2 May 2016 12:01:47 +0000 (14:01 +0200)]
ShareDialog: show the error message in red
Do the visual stuff from designer.
The previous code that was ment to change the color in red did not work
and changed it to gray instead.
Also I don't see why there should be a frame.
Issue #4773
Jenkins for ownCloud [Mon, 2 May 2016 06:19:41 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 1 May 2016 06:19:18 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 30 Apr 2016 06:19:14 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
ckamm [Fri, 29 Apr 2016 14:14:18 +0000 (16:14 +0200)]
LockWatcher: Keep an eye on Windows file locks (#4758)
When a conflict-rename or a temporary-rename fails, notify the
LockWatcher. It'll regularly check whether the file has become
accesible again. When it has, another sync is triggered.
owncloud/enterprise#1288
Roeland Douma [Fri, 29 Apr 2016 12:11:27 +0000 (14:11 +0200)]
Add spinner during sharee search (#4764)
Fixed #4740
When searching for sharees we should display a loading spinner.
Olivier Goffart [Fri, 29 Apr 2016 06:52:17 +0000 (08:52 +0200)]
Merge remote-tracking branch 'origin/2.1' into 2.2
Olivier Goffart [Fri, 29 Apr 2016 06:49:27 +0000 (08:49 +0200)]
PropagateDownload: Throw an error if the file is empty while it should not have been (#4753)
If the downloaded file is empty but the PROPFIND previously announced it
should not have been empty, this might mean the file was somehow corrupted
because of a bug on the server and that we should therefore not accept
the file.
Normaly we accept a change between the actual size of the file and what we
got during discovery because the file might have been updated to a new version
inbetween. But after this patch we won't accept the file if it was replaced
by an empty file.
Will help for issue #4583
Also requested by IL for issue 548
Jenkins for ownCloud [Fri, 29 Apr 2016 06:19:14 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Thu, 28 Apr 2016 12:55:29 +0000 (14:55 +0200)]
Shibboleth: Load username from config for UI (#4751)
For https://github.com/owncloud/enterprise/issues/1034
Daniel Molkentin [Thu, 28 Apr 2016 11:53:06 +0000 (13:53 +0200)]
Merge pull request #4756 from owncloud/revert-4738-fix_3411
Revert "Disambiguate socket API pathes on Windows with user name"
Daniel Molkentin [Thu, 28 Apr 2016 11:52:15 +0000 (13:52 +0200)]
Revert "Disambiguate socket API pathes on Windows with user name"
Klaas Freitag [Thu, 28 Apr 2016 11:46:10 +0000 (13:46 +0200)]
Merge pull request #4738 from owncloud/fix_3411
Disambiguate socket API pathes on Windows with user name
Klaas Freitag [Thu, 28 Apr 2016 11:45:30 +0000 (13:45 +0200)]
Merge pull request #4748 from owncloud/win_stat_revisited
vio for windows: Use more graceful create file params.
Christian Kamm [Thu, 28 Apr 2016 10:43:06 +0000 (12:43 +0200)]
Checksums: Skip uploads of .eml files only #4754
This is a workaround. A correct solution would still update file metadata
such as the mtime. See #4755.
Christian Kamm [Thu, 28 Apr 2016 08:44:13 +0000 (10:44 +0200)]
Fix perl tests #4722
* The dav auth realm is "sabre/dav" for newer server versions
* Content checksums are enabled generally, so conflict detection
is smarter
Christian Kamm [Thu, 28 Apr 2016 07:21:42 +0000 (09:21 +0200)]
FolderWizard: Sort remote folders #4612
Christian Kamm [Thu, 28 Apr 2016 07:18:38 +0000 (09:18 +0200)]
Selective sync: Sort folders in FolderStatusModel #4612
Jenkins for ownCloud [Thu, 28 Apr 2016 06:19:20 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Thu, 28 Apr 2016 05:36:50 +0000 (07:36 +0200)]
Protocol: Make timestamp column width fit the text #4721
ckamm [Thu, 28 Apr 2016 05:17:17 +0000 (07:17 +0200)]
Merge pull request #4739 from ckamm/trackdirty
Overlay icons: Track touched files #4730
Christian Kamm [Thu, 14 Apr 2016 13:15:08 +0000 (15:15 +0200)]
Overlay icons: Track touched files #4730
This uses the file watcher to keep track of files that were modified
in order to assign them the blue icon.
This is transient state that's not persisted across restarts.
Markus Goetz [Wed, 27 Apr 2016 10:22:12 +0000 (12:22 +0200)]
sqlite: Update to version 3.12.2
For OS X and Windows
Markus Goetz [Wed, 27 Apr 2016 10:19:49 +0000 (12:19 +0200)]
ConnectionValidator: Also set short timeout for capabilities job
Default timeout was 5 min.
Klaas Freitag [Wed, 27 Apr 2016 09:37:21 +0000 (11:37 +0200)]
Vio for windows: Removed the overlap param again.
After discussion and studying docs again we agreed that
the parameter is not neccessary here as it only affects
the process that opens the handle. And we do not want to
do async stuff.
Olivier Goffart [Wed, 27 Apr 2016 09:21:58 +0000 (11:21 +0200)]
AccountSettings: context menu: don't rely on the alias
Don't rely on the alias to know weather we shuld show a context menu or not.
Use the classify function to know if it's a root folder instead
Olivier Goffart [Wed, 27 Apr 2016 09:21:13 +0000 (11:21 +0200)]
Workaround ubuntu 16.04 systemtray bug (#4693) (#4747)
Klaas Freitag [Wed, 27 Apr 2016 09:17:42 +0000 (11:17 +0200)]
vio for windows: Use more graceful create file params.
Christian Kamm [Wed, 27 Apr 2016 08:37:17 +0000 (10:37 +0200)]
Remote folder selection: improve path typing #4745 #4746
* Scroll to the target typed path
* Show non-404 errors that were triggered by typing paths
Jenkins for ownCloud [Wed, 27 Apr 2016 06:19:20 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 26 Apr 2016 15:34:10 +0000 (17:34 +0200)]
Merge pull request #4741 from owncloud/fix-alias
Accountsettings: Generate an alias for new folders
Olivier Goffart [Tue, 26 Apr 2016 14:09:39 +0000 (16:09 +0200)]
Folder: Generate an alias for new folders
Before commit
1a51b6718a345f1e5f28dd1f4e0c04bdaeeb5357, the wizard was
making sure folder had an alias but this is no longer the case.
So generate still an unique alias.
Alias is not used in the UI any longer, it's just use for internal purposes.
For issue #4737
Markus Goetz [Tue, 26 Apr 2016 14:53:23 +0000 (16:53 +0200)]
Merge pull request #4744 from owncloud/fixAliasesOnceMore2
UI: Fix account name/alias display oddities #4577
Markus Goetz [Tue, 26 Apr 2016 14:38:03 +0000 (16:38 +0200)]
UI: Fix account name/alias display oddities #4577
Daniel Molkentin [Wed, 20 Apr 2016 14:51:17 +0000 (16:51 +0200)]
Disambiguate socket API pathes on Windows with user name
Addresses #3411
Christian Kamm [Tue, 26 Apr 2016 11:10:53 +0000 (13:10 +0200)]
Checksums: Use the first supported type if nothing is preferred
ckamm [Tue, 26 Apr 2016 10:04:53 +0000 (12:04 +0200)]
Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate
Overlay icons: Fix invalidation with nautilus #3249
Christian Kamm [Tue, 26 Apr 2016 09:49:56 +0000 (11:49 +0200)]
Overlay icons: Fix invalidation with nautilus #3249
This avoids an extra socketapi call after invalidate_extension_info
is called from a STATUS message.
Christian Kamm [Tue, 26 Apr 2016 09:01:01 +0000 (11:01 +0200)]
Overlay icons: Fix duplicate icons in nautilus #3249
Christian Kamm [Tue, 26 Apr 2016 05:45:41 +0000 (07:45 +0200)]
Share link: Consistent order of options owncloud/core#24122
(cherry picked from commit
8dc178a9f3091e92a18ca17a274487342312069c)
Olivier Goffart [Tue, 26 Apr 2016 08:38:20 +0000 (10:38 +0200)]
QTokenizer: fix Qt4 build
QSharedPointer::reset is new in Qt5
Jenkins for ownCloud [Tue, 26 Apr 2016 06:19:11 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 25 Apr 2016 12:26:49 +0000 (08:26 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Apr 2016 06:19:04 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Apr 2016 05:15:28 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Fri, 22 Apr 2016 15:40:09 +0000 (08:40 -0700)]
Merge pull request #4704 from owncloud/doc_overlay_icons
Doc: Draft overlay icons
Roeland Douma [Fri, 22 Apr 2016 12:40:55 +0000 (14:40 +0200)]
Merge pull request #4717 from owncloud/fix_webdav_property
Only 1 : between namespace and property
Roeland Jago Douma [Fri, 22 Apr 2016 12:38:43 +0000 (14:38 +0200)]
Only 1 : between namespace and property
Jenkins for ownCloud [Fri, 22 Apr 2016 10:16:18 +0000 (06:16 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 22 Apr 2016 10:05:15 +0000 (12:05 +0200)]
Merge pull request #4715 from owncloud/translate-desktop-ini
Adding new resource for the desktop.ini file
Daniel Molkentin [Fri, 22 Apr 2016 09:23:09 +0000 (11:23 +0200)]
Fix search & replace error in Dockerfile
Thomas Müller [Fri, 22 Apr 2016 08:58:57 +0000 (10:58 +0200)]
Adding new resource for the desktop.ini file
Olivier Goffart [Fri, 22 Apr 2016 08:09:07 +0000 (10:09 +0200)]
Theme: missing virtual keyword
Olivier Goffart [Fri, 22 Apr 2016 08:05:50 +0000 (10:05 +0200)]
Quota: Add branding option for the base folder (#4714)
As discussed on issue ##4460
Having the quote to be queried on subfolder is wrong in the generic case,
so add a branding option to configure it.
This partially reverts commit
ff4cdc3161ddbb74a0fe10f969043ff898fbb93a
Klaas Freitag [Fri, 22 Apr 2016 07:56:53 +0000 (09:56 +0200)]
Doc: Applied review feedback for overlay icon docs.
Klaas Freitag [Fri, 22 Apr 2016 07:47:06 +0000 (09:47 +0200)]
Merge pull request #4713 from owncloud/fix_win-sis
Fix sync to Windows deduplication enabled storages
Jenkins for ownCloud [Fri, 22 Apr 2016 06:19:11 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Thu, 21 Apr 2016 13:41:34 +0000 (15:41 +0200)]
Windows VIO: Remove unused variable.
Klaas Freitag [Wed, 20 Apr 2016 12:15:38 +0000 (14:15 +0200)]
local_vio_win: Fix handling files that have been deduplicated
as part of Windows SIS or Data Deduplication. Fixes #4056
Klaas Freitag [Thu, 21 Apr 2016 13:01:11 +0000 (15:01 +0200)]
Merge pull request #4689 from owncloud/overlays_handle_root
SyncFileStatusTracker: Add a method to handle the root folder of the sync.
Also, handle new files put in the sync in the statustracker logic.
Klaas Freitag [Thu, 21 Apr 2016 12:54:13 +0000 (14:54 +0200)]
SocketAPI: Code simplifications as asked for in the review.
Klaas Freitag [Thu, 21 Apr 2016 11:56:08 +0000 (13:56 +0200)]
SyncFileStatusTracker: Remember the state of new files.
In the before-propagate slot, new files that wait to be
pushed to the server are remembered in the _syncProblems
map. That way, the parents show a sync icon properly as
asked for in #4682.
After the item has been transfered properly, the item is
removed from the map again because success is the default.
Olivier Goffart [Thu, 21 Apr 2016 10:52:05 +0000 (12:52 +0200)]
owncloudcmd: Save the selective sync list on the first run
For issue #4690
In the first run, the journal might not exist, we should not cancel
setting the selective sync list
Daniel Molkentin [Thu, 21 Apr 2016 10:50:43 +0000 (12:50 +0200)]
Merge pull request #4709 from owncloud/fix_4691
Use QTokenizer to properly parse netrc
Daniel Molkentin [Wed, 20 Apr 2016 15:46:53 +0000 (17:46 +0200)]
Use QTokenizer to properly parse netrc
Addresses #4691
Daniel Molkentin [Thu, 21 Apr 2016 10:24:58 +0000 (12:24 +0200)]
Update doc and Dockerfile for 2.2 builds
Olivier Goffart [Thu, 21 Apr 2016 09:46:01 +0000 (11:46 +0200)]
Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
Disable validation of transmission checksums by default
Olivier Goffart [Thu, 21 Apr 2016 09:43:44 +0000 (11:43 +0200)]
Checksums: remove the downloadChecksumValidationEnabled option
Added in previous commit from pull request #4663
As discussed, we do not need this option so no need to introduce
a new dependency on the config file in the sync engine
Jenkins for ownCloud [Thu, 21 Apr 2016 06:19:12 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Wed, 20 Apr 2016 15:14:12 +0000 (17:14 +0200)]
SocketAPI: Return NOP state if folder is diconnected or paused.
Later, we can send a specific state for that.
Klaas Freitag [Wed, 20 Apr 2016 15:13:06 +0000 (17:13 +0200)]
Nautilus plugin: Be more robust against new states from socketapi
Do not bail out if an unknown state comes from SocketApi
Klaas Freitag [Wed, 20 Apr 2016 15:12:21 +0000 (17:12 +0200)]
Nautilus plugin: Remove the bogus logging
Markus Goetz [Wed, 20 Apr 2016 13:54:05 +0000 (15:54 +0200)]
Merge pull request #4708 from owncloud/aliasGui
UI: Remove alias from more places #4577 #4695
Markus Goetz [Wed, 20 Apr 2016 12:27:50 +0000 (14:27 +0200)]
UI: Remove alias from more places #4577 #4695
Jenkins for ownCloud [Wed, 20 Apr 2016 06:19:08 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Tue, 19 Apr 2016 17:28:46 +0000 (10:28 -0700)]
a bit of editing on new section
Klaas Freitag [Tue, 19 Apr 2016 16:20:23 +0000 (18:20 +0200)]
Doc: Draft overlay icons
Klaas Freitag [Tue, 19 Apr 2016 16:18:00 +0000 (18:18 +0200)]
SocketAPI: Display a warning on the directory if there are errors
Errors with individual files within a directory now result in
a warning label on the parent directories.
Markus Goetz [Tue, 19 Apr 2016 14:09:48 +0000 (16:09 +0200)]
Merge pull request #4696 from owncloud/issue4573_negative_content_length
Discovery: Be more explicit about files with unknown size #4573
Markus Goetz [Mon, 18 Apr 2016 15:33:25 +0000 (17:33 +0200)]
Discovery: Be more explicit about files with unknown size #4573
Also related https://github.com/owncloud/core/issues/23468
Roeland Douma [Tue, 19 Apr 2016 11:14:04 +0000 (13:14 +0200)]
Merge pull request #4700 from owncloud/fix_4409
Use expireDate if returned by the OCS Share API
Roeland Jago Douma [Tue, 19 Apr 2016 09:22:32 +0000 (11:22 +0200)]
Use expireDate if returned by the OCS Share API
If an app modifies the expiration date (for example the password policy
app) then on more recent versions of the server we will get the share
object back REST style. We should use that info!
Fixes #4409
Jenkins for ownCloud [Tue, 19 Apr 2016 06:19:15 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Roeland Douma [Mon, 18 Apr 2016 19:29:26 +0000 (21:29 +0200)]
Merge pull request #4687 from owncloud/fix_share-permissions-namespace
The share-permissions namespace was moved