ckamm
e6b937f508
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
2016-04-29 16:14:18 +02:00
Roeland Douma
31c13f74fb
Add spinner during sharee search ( #4764 )
...
Fixed #4740
When searching for sharees we should display a loading spinner.
2016-04-29 14:11:27 +02:00
Olivier Goffart
be466b47b7
Merge remote-tracking branch 'origin/2.1' into 2.2
2016-04-29 08:52:17 +02:00
Olivier Goffart
11b144957b
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
2016-04-29 08:49:27 +02:00
Jenkins for ownCloud
817e97c148
[tx-robot] updated from transifex
2016-04-29 02:19:14 -04:00
Markus Goetz
29932004ae
Shibboleth: Load username from config for UI ( #4751 )
...
For https://github.com/owncloud/enterprise/issues/1034
2016-04-28 14:55:29 +02:00
Daniel Molkentin
6d83e841a9
Merge pull request #4756 from owncloud/revert-4738-fix_3411
...
Revert "Disambiguate socket API pathes on Windows with user name"
2016-04-28 13:53:06 +02:00
Daniel Molkentin
b43a9421d2
Revert "Disambiguate socket API pathes on Windows with user name"
2016-04-28 13:52:15 +02:00
Klaas Freitag
e70b78d14b
Merge pull request #4738 from owncloud/fix_3411
...
Disambiguate socket API pathes on Windows with user name
2016-04-28 13:46:10 +02:00
Klaas Freitag
6814342d1f
Merge pull request #4748 from owncloud/win_stat_revisited
...
vio for windows: Use more graceful create file params.
2016-04-28 13:45:30 +02:00
Christian Kamm
68126dcff6
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 .
2016-04-28 12:59:39 +02:00
Christian Kamm
e7f00339e6
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
2016-04-28 10:44:37 +02:00
Christian Kamm
a36b4ec863
FolderWizard: Sort remote folders #4612
2016-04-28 09:29:07 +02:00
Christian Kamm
074f8eadb1
Selective sync: Sort folders in FolderStatusModel #4612
2016-04-28 09:29:07 +02:00
Jenkins for ownCloud
6a51ae5b1b
[tx-robot] updated from transifex
2016-04-28 02:19:20 -04:00
Christian Kamm
af5f2d3860
Protocol: Make timestamp column width fit the text #4721
2016-04-28 07:37:42 +02:00
ckamm
38bad564a0
Merge pull request #4739 from ckamm/trackdirty
...
Overlay icons: Track touched files #4730
2016-04-28 07:17:17 +02:00
Christian Kamm
c2fa3fb4c8
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.
2016-04-28 07:16:49 +02:00
Markus Goetz
f7082ee3df
sqlite: Update to version 3.12.2
...
For OS X and Windows
2016-04-27 12:22:12 +02:00
Markus Goetz
f7c6efb391
ConnectionValidator: Also set short timeout for capabilities job
...
Default timeout was 5 min.
2016-04-27 12:19:49 +02:00
Klaas Freitag
051a348afd
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.
2016-04-27 11:37:21 +02:00
Olivier Goffart
d0af3ede05
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
2016-04-27 11:21:58 +02:00
Olivier Goffart
0da2adcbe0
Workaround ubuntu 16.04 systemtray bug ( #4693 ) ( #4747 )
2016-04-27 11:21:13 +02:00
Klaas Freitag
07bdd519e9
vio for windows: Use more graceful create file params.
2016-04-27 11:17:42 +02:00
Christian Kamm
0829a94c92
Remote folder selection: improve path typing #4745 #4746
...
* Scroll to the target typed path
* Show non-404 errors that were triggered by typing paths
2016-04-27 10:37:17 +02:00
Jenkins for ownCloud
faf2514be2
[tx-robot] updated from transifex
2016-04-27 02:19:20 -04:00
Markus Goetz
4ea2edcf4a
Merge pull request #4741 from owncloud/fix-alias
...
Accountsettings: Generate an alias for new folders
2016-04-26 17:34:10 +02:00
Olivier Goffart
cd29875b76
Folder: Generate an alias for new folders
...
Before commit 1a51b6718a#4737
2016-04-26 16:53:24 +02:00
Markus Goetz
85bc3b276f
Merge pull request #4744 from owncloud/fixAliasesOnceMore2
...
UI: Fix account name/alias display oddities #4577
2016-04-26 16:53:23 +02:00
Markus Goetz
ce5ca8a42e
UI: Fix account name/alias display oddities #4577
2016-04-26 16:47:47 +02:00
Daniel Molkentin
ce6a365328
Disambiguate socket API pathes on Windows with user name
...
Addresses #3411
2016-04-26 14:49:45 +02:00
Christian Kamm
09eea7f5f2
Checksums: Use the first supported type if nothing is preferred
2016-04-26 13:10:53 +02:00
ckamm
043350f49d
Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate
...
Overlay icons: Fix invalidation with nautilus #3249
2016-04-26 12:04:53 +02:00
Christian Kamm
f657bd0cd9
Overlay icons: Fix invalidation with nautilus #3249
...
This avoids an extra socketapi call after invalidate_extension_info
is called from a STATUS message.
2016-04-26 11:49:56 +02:00
Christian Kamm
b4cf17d99d
Overlay icons: Fix duplicate icons in nautilus #3249
2016-04-26 11:02:59 +02:00
Christian Kamm
12bf6e39b7
Share link: Consistent order of options owncloud/core#24122
...
(cherry picked from commit 8dc178a9f3
2016-04-26 10:44:29 +02:00
Olivier Goffart
4e7c09de83
QTokenizer: fix Qt4 build
...
QSharedPointer::reset is new in Qt5
2016-04-26 10:38:20 +02:00
Jenkins for ownCloud
31f2c3e76a
[tx-robot] updated from transifex
2016-04-26 02:19:11 -04:00
Jenkins for ownCloud
64b6486327
[tx-robot] updated from transifex
2016-04-25 08:26:49 -04:00
Jenkins for ownCloud
335e333e28
[tx-robot] updated from transifex
2016-04-24 02:19:04 -04:00
Jenkins for ownCloud
41eb5f0a3f
[tx-robot] updated from transifex
2016-04-24 01:15:28 -04:00
Carla Schroder
030184fad9
Merge pull request #4704 from owncloud/doc_overlay_icons
...
Doc: Draft overlay icons
2016-04-22 08:40:09 -07:00
Roeland Douma
7d285d0225
Merge pull request #4717 from owncloud/fix_webdav_property
...
Only 1 : between namespace and property
2016-04-22 14:40:55 +02:00
Roeland Jago Douma
d3a93322d2
Only 1 : between namespace and property
2016-04-22 14:38:43 +02:00
Jenkins for ownCloud
8694db1c49
[tx-robot] updated from transifex
2016-04-22 06:16:18 -04:00
Daniel Molkentin
19eca84d4f
Merge pull request #4715 from owncloud/translate-desktop-ini
...
Adding new resource for the desktop.ini file
2016-04-22 12:05:15 +02:00
Daniel Molkentin
665c3f40e1
Fix search & replace error in Dockerfile
2016-04-22 11:26:46 +02:00
Thomas Müller
f8f394eb0a
Adding new resource for the desktop.ini file
2016-04-22 10:58:57 +02:00
Olivier Goffart
0711abbf56
Theme: missing virtual keyword
2016-04-22 10:09:07 +02:00
Olivier Goffart
84ac2e64e0
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 ff4cdc3161
2016-04-22 10:05:50 +02:00
