chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-20 13:27:08 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins for ownCloud 20d0c835b6 [tx-robot] updated from transifex 2016-07-09 02:18:51 -04:00
arthurchiao 3335c733d7 be case insensitive for MacOSX, too 2016-07-08 15:53:11 +08:00
arthurchiao 4da55b69df ignore case-sensitivity only on windows 2016-07-08 15:12:37 +08:00
Jenkins for ownCloud b7085987b8 [tx-robot] updated from transifex 2016-07-08 02:18:52 -04:00
Jenkins for ownCloud a1b44cd82a [tx-robot] updated from transifex 2016-07-07 02:18:42 -04:00
ckammandMarkus Goetz 11b44358f6 Windows: Skip symlinks and junctions again #5019 (#5036) 
Fixes an accidental behavior change introduced in
055c2ef73f

Affects #4056 and owncloud/enterprise#1225.
 2016-07-07 08:07:19 +02:00
Jenkins for ownCloud 4979181e85 [tx-robot] updated from transifex 2016-07-07 01:15:57 -04:00
Jenkins for ownCloud 651cc25e3f [tx-robot] updated from transifex 2016-07-06 02:19:04 -04:00
Christian Kamm 699d1ba13b owncloudcmd: Make source_dir absolute #5035 
Fixes a problem with relative paths on Windows.
 2016-07-05 15:40:32 +02:00
Christian Kamm 3c575a2f37 Add 'open in browser' to account menu #4824 2016-07-05 14:48:51 +02:00
Christian Kamm bd7ec19644 Set discovery thread priority to low #5017 2016-07-05 13:53:57 +02:00
Daniel MolkentinandGitHub a338b9f269 Merge pull request #5034 from owncloud/fix-5033 
Only accept notification API Capability if endpoint is OCS-enabled
 2016-07-05 12:46:20 +02:00
Jenkins for ownCloud 81ff4e02c5 [tx-robot] updated from transifex 2016-07-05 02:18:32 -04:00
Daniel Molkentin 8a1a2eb5b3 Only accept notification API Capability if endpoint is OCS-enabled 
Fixes #5033
 2016-07-04 18:33:02 +02:00
Jenkins for ownCloud 0c646b974f [tx-robot] updated from transifex 2016-07-04 02:18:34 -04:00
Jenkins for ownCloud e661bf2324 [tx-robot] updated from transifex 2016-07-03 02:18:29 -04:00
Jenkins for ownCloud 2abb5c95bb [tx-robot] updated from transifex 2016-07-02 02:19:18 -04:00
Jenkins for ownCloud c3ef1a996f [tx-robot] updated from transifex 2016-07-01 02:18:37 -04:00
arthurchiao 7a2a439426 fix #5015 overlay icon not show: compare folder paths with no case-sensitivity 2016-07-01 13:03:42 +08:00
Jenkins for ownCloud ce26afb262 [tx-robot] updated from transifex 2016-06-30 02:18:34 -04:00
Jenkins for ownCloud 56e1737c61 [tx-robot] updated from transifex 2016-06-29 02:18:33 -04:00
Olivier Goffart dff57362f9 AccountManager: Don't force the server URL while loading the config. 
While loading the account, only override the server url if Theme::forceConfigAuthType
is set. This restore the behavior from the client 2.1 for theme that did not
use Theme::forceConfigAuthType.

Issue: owncloud/enterprise#1418
 2016-06-28 14:32:03 +02:00
Olivier Goffart 3f3a679f81 Fix the URL from previous commit 
The pull request was merged too early and did not contain the URL change

(Issue #4877)
 2016-06-28 14:17:16 +02:00
Olivier GoffartandMarkus Goetz cde9017340 GUI: Show link to the page that allow to add a new token (#4963) 
If owncloud >= 9.1 is detected:
and add a link to the ownCloud page that allow to add device token.

Issue #4877
 2016-06-28 12:25:04 +02:00
Jenkins for ownCloud 05a7c18635 [tx-robot] updated from transifex 2016-06-28 02:19:16 -04:00
Jocelyn TurcotteandGitHub 3a77074b97 Merge pull request #5007 from owncloud/rebuildWinShellIntegration 
Rebuild win shell integration
 2016-06-27 18:02:42 +02:00
Jocelyn TurcotteandGitHub 446e7cbd93 Fix a QAction leak (#5008) 
Attach the accout menu QAction to the menu rather than the
ownCloudGui since it should be destroyed when the context
menu is cleared.
 2016-06-27 16:22:51 +02:00
ckammandMarkus Goetz b4d26ba952 Fix windows HiDPI #4994 (#4998) 
This was removed in 0194ebb222
because it breaks on Linux. However, it looks like it is correct
for Windows. In the meantime the surrounding ifdef has changed
from !Q_OS_MAC to Q_OS_WIN, so reverting it makes sense.
 2016-06-27 16:17:58 +02:00
Jocelyn TurcotteandMarkus Goetz 622017adcf Fix a deadlock when shutting down during discovery (#4993) 
Since the SyncEngine now quits and waits for the discovery thread,
the main thread can enter a deadlock where the discovery thread waits
for its directory result.

Add a 2 seconds timer to the discovery thread wait condition
to limit the deadlock time.
 2016-06-27 16:12:39 +02:00
Jocelyn Turcotte 088a4f0bbe binaries: Update to build 42 owncloud/client#4977 2016-06-27 15:30:03 +02:00
Jocelyn Turcotte ba96fb89a5 shell_integration/windows: Set VS output directory in the binary submodule 
This allows creating a new build simply by hitting F7 in visual studio
and then committing the changed files in the binary submodules without
having to know which files to move where.
 2016-06-27 15:23:37 +02:00
Jocelyn Turcotte 70ae11fcad shell_integration/windows: Add a manually-increased build number 
Since this isn't yet built together with the rest, we can't reliably
use the client version without having to rebuilt the extension manually
on each release. But it would still be nice to be able to tell if a user
has the right version or not loaded, so instead just tag each update of
the DLLs with a separate release version.

This means that every time we update those binaries we'll have to manually
increment the number in the header, but worst case we'll forget from time
to time but we'll be able to know if we didn't, and know if we can rely on
the number or not.
 2016-06-27 15:13:47 +02:00
ckammandJocelyn Turcotte 86fd982b00 SocketAPI: Use different pipe name #4977 (#4997) 
Named pipe names that contain backslashes sometimes lead to problems.
 2016-06-27 15:13:08 +02:00
ckammandMarkus Goetz bdb304f8ec Share: Permissions for federated shares on servers >=9.1 #4996 (#5001) 
This disables the workaround 487e1fdca5ee04fc98c1ed77898df70d740967c8
for servers that are new enough to support fine grained permissions
on federated shares.

The consequence is that the 'reshare' permission is now granted by
default and that users can edit permissions on the usual fine-grained
level again.

The way the client deals with servers <9.1 is unchanged.
 2016-06-27 11:09:51 +02:00
Jenkins for ownCloud 001075daf0 [tx-robot] updated from transifex 2016-06-27 02:18:35 -04:00
Jenkins for ownCloud 2a98aa7130 [tx-robot] updated from transifex 2016-06-26 02:18:40 -04:00
Jenkins for ownCloud 9904fb200e [tx-robot] updated from transifex 2016-06-25 02:18:39 -04:00
Jenkins for ownCloud 6822ae5bec [tx-robot] updated from transifex 2016-06-24 02:18:52 -04:00
Christian Kamm 440a804836 Tray: Add minimal mode as workaround and testing tool #4985 #4990 2016-06-23 10:22:43 +02:00
Jenkins for ownCloud 9b66dd7166 [tx-robot] updated from transifex 2016-06-23 02:18:31 -04:00
Christian Kamm 7601783553 Fix Qt4 build 2016-06-22 15:47:33 +02:00
Christian Kamm 6e9df8673f Merge remote-tracking branch 'origin/2.2' 2016-06-22 15:41:37 +02:00
Christian Kamm c0b0bd5b63 owncloudcmd: Fix --exclude regression 
It's ok if the system exclude file is missing when --exclude is
specified explicitly.
 2016-06-22 15:30:20 +02:00
Jenkins for ownCloud 28d86cee17 [tx-robot] updated from transifex 2016-06-22 02:18:48 -04:00
ckammandMarkus Goetz 32bb8295a2 csync: Use the full file stat destructors (#4992) 
* For csync_file_stat_t and csync_vio_file_stat_t
* Add original_name to the vio file stat destructor
 2016-06-21 12:06:21 +02:00
Jocelyn Turcotte 5d71ad83ec Fix the Qt4 build 
QSharedPointer::reset doesn't exist in Qt4.
 2016-06-21 12:04:26 +02:00
Markus GoetzandGitHub ab24980001 Merge pull request #4979 from jturcotte/2.2 
Memory improvements during propagation
 2016-06-21 10:00:41 +02:00
ckammandMarkus Goetz 07dea72c37 Setup csync logging earlier (#4991) 
We were missing some csync related log output during startup.

Discovered in #4967
 2016-06-21 09:58:53 +02:00
Jenkins for ownCloud a734be347b [tx-robot] updated from transifex 2016-06-21 02:18:36 -04:00
Daniel Molkentin 1443ddc7c9 This branch is headed towards 2.2.3 now 2016-06-20 17:42:19 +02:00