chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
12,647 Commits 4 Branches 173 Tags
techpreview-v2
Commit Graph
12647 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Molkentin e833d01288 Re-Apply: Disambiguate socket API pathes on Windows with user name 
Addresses #3411
 2016-05-02 16:09:48 +02:00
Olivier Goffart 3047682223 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
 2016-05-02 14:12:04 +02:00
Jenkins for ownCloud c91dd94728 [tx-robot] updated from transifex 2016-05-02 02:19:41 -04:00
Jenkins for ownCloud 52f9f44b51 [tx-robot] updated from transifex 2016-05-01 02:19:18 -04:00
Olivier Goffart 93e0d52dd3 Merge pull request #4769 from orion1024/curl-check-in-perl-tests 
Adding CURL check in t6.pl
 2016-04-30 14:25:21 +02:00
orion1024 9f3e576348 Adding CURL check in t6.pl 
Aborts immediately if CURL not found, to avoid misleading errors later.
 2016-04-30 11:44:16 +02:00
Jenkins for ownCloud 49748191a9 [tx-robot] updated from transifex 2016-04-30 02:19:14 -04:00
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
Olivier Goffart 5479aaeb5b Merge remote-tracking branch 'origin/2.2' 2016-04-28 16:38:46 +02: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, 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
 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
Christian Kamm 8dc178a9f3 Share link: Consistent order of options owncloud/core#24122 2016-04-26 07:45:41 +02:00
Jenkins for ownCloud 64b6486327 [tx-robot] updated from transifex 2016-04-25 08:26:49 -04:00
Klaas Freitag 35d4b96339 Set base version to 2.3.0. For 2.2, please use the branch 2.2 2016-04-25 14:15:17 +02:00
Jenkins for ownCloud 335e333e28 [tx-robot] updated from transifex 2016-04-24 02:19:04 -04:00