chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-30 08:42:48 +01:00
Code
15,218 Commits 4 Branches 173 Tags 91 MiB
v3.1.0
Commit Graph

15218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz
634dad033f Debug: Attempt to make log more useful 2016-01-05 15:12:00 +01:00
Jocelyn Turcotte
6e3809528e Fix OK statuses not being broadcasted during a sync #3944 
Since the presence of any path in SyncEngine::_syncedItems
would translate in a SYNC status, platforms that don't refresh
all their status cache after an UPDATE_VIEW message like OS X
or Windows would keep displaying that status even after all
files are successfully synchronized.

- Read SyncFileItem::_status to determine the status to display mid-sync
- Match moved paths also to _renameTarget since this might be the
  path to match
- Make sure that PropagateDirectory jobs also set SyncFileItem::_status
  properly
 2016-01-05 15:08:26 +01:00
Markus Goetz
60a6b2b0c3 OS X: Also show desktop notifications when app is active 2016-01-05 13:33:05 +01:00
Christian Kamm
2662203fb7 Windows: Fix deleting and replacing of read-only files #4308 2016-01-05 13:15:59 +01:00
Olivier Goffart
1bb76f5343 Attempt to recover from backup restoration on the server 
If all the files bring us to past timestamp, it is possibly a backup
restoration in the server. In which case we want don't want to just
overwrite newer files with the older ones.

Issue #2325
 2016-01-05 12:14:18 +01:00
Christian Kamm
d4edab02b0 Propagator: Deal with directories becoming files #4302 
Note, in particular the revised order of directory deletion jobs.
 2016-01-05 10:26:41 +01:00
Christian Kamm
5cc4c03b6a Propagator: Deal with files becoming directories #4302 
This needed adjustments in reconcile, to mark the item as SYNC
as well as additions to the LocalMkdir job.
 2016-01-05 10:26:41 +01:00
Jenkins for ownCloud
5382901859 [tx-robot] updated from transifex 2016-01-05 03:04:45 -05:00
Jocelyn Turcotte
2e7a3f9e37 Fix a missing sync-exclude.lst file not failing the sync 
After c3cf6aef7d the invokeMethod calls
should be adjusted to pass the new method arguments.

The result was currently a passing sync with this error message on
the console:
QMetaObject::invokeMethod: No such method OCC::Folder::slotSyncFinished()
 2016-01-04 17:01:21 +01:00
Markus Goetz
c8b3df6668 OS X: Fix alignment of "Copy" button in protocol #4207 2016-01-04 16:16:15 +01:00
Grigorii Horos
69d9840b89 Dolphin integration: use system icons for labels in KDE 
Cherry-picked from https://github.com/owncloud/client/pull/4252
 2016-01-04 12:57:24 +01:00
Olivier Goffart
639301e9e9 Merge remote-tracking branch 'origin/2.1' 
Conflicts:
	VERSION.cmake
 2016-01-04 12:38:59 +01:00
Olivier Goffart
970cdcfdbb SocketAPI: SHARE: Fix the paths when creating the share dialog 
The socket api uses native folder separator. We need to use QDir::cleanPath
for anything else so we only work with '/' everywhere else in the code

This fixes the sharing dialog on window.

Issue #4311
 2016-01-04 12:06:09 +01:00
Daniel Molkentin
0ef9bd9e23 Remove bearer plugins 
Causes regressions due to constant Wifi scanning
 2016-01-04 11:54:11 +01:00
Daniel Molkentin
16030a61eb Enable HiDpi scaling with Qt 5.6 2016-01-04 11:50:00 +01:00
Daniel Molkentin
5487fc1f9c Ensure Qt translator does always get loaded. 2016-01-04 11:50:00 +01:00
Jenkins for ownCloud
92677da3e4 [tx-robot] updated from transifex 2016-01-04 02:19:22 -05:00
Jenkins for ownCloud
6d38d4e085 [tx-robot] updated from transifex 2016-01-03 02:19:00 -05:00
Jenkins for ownCloud
a16361e823 [tx-robot] updated from transifex 2015-12-31 02:19:14 -05:00
Jenkins for ownCloud
03415b286c [tx-robot] updated from transifex 2015-12-29 02:18:39 -05:00
Jenkins for ownCloud
72a503e93f [tx-robot] updated from transifex 2015-12-28 02:19:02 -05:00
Jenkins for ownCloud
6a6bce4bef [tx-robot] updated from transifex 2015-12-25 02:19:06 -05:00
Jenkins for ownCloud
e64833a217 [tx-robot] updated from transifex 2015-12-23 02:19:07 -05:00
Klaas Freitag
a759ba1d9e Do not use nullptr, old compilers die on it. 2015-12-22 15:07:51 +01:00
Klaas Freitag
7ed243d3cd Move version to 2.1.1 git. 2015-12-22 11:18:20 +01:00
Klaas Freitag
afa8d671be shell integration: Create a plugin for nemo out of the nautilus one. 2015-12-22 11:05:00 +01:00
Klaas Freitag
c607707580 Backport of #4245 2015-12-22 10:26:13 +01:00
Klaas Freitag
8f26bb698d Merge pull request #4245 from masoudcs/masoudcs-patch-1 
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
 2015-12-22 10:15:14 +01:00
Olivier Goffart
a0b913f65d gui: Word Wrap in QInputDialog (#4197) 2015-12-22 10:08:17 +01:00
Jenkins for ownCloud
271b2f8c5b [tx-robot] updated from transifex 2015-12-22 02:19:06 -05:00
Olivier Goffart
cf5b1e401c csync_vio_local_stat: Win: fetch mtime and size if not previously fetched 
Since owncloud 2.1, csync_vio_local_stat was optimized because readdir
would already fetch most of the info.  This works for the discovery,
but not later.  And we used this function later for symliks and co.

So this fixes the .lnk on windows

Issue #4300
 2015-12-21 14:25:30 +01:00
Olivier Goffart
11174ddf4c PropagateLocalRemove: Make it possible to remove read only files (#4277) 2015-12-21 13:25:10 +01:00
Olivier Goffart
48a0ffdc9e Systray: Use the original name for the rename notification #4295 
Otherwise it shows twice as "newname was renamed to newname".
Because _file is set to the new name in PropagateLocalRename::start
 2015-12-21 11:06:39 +01:00
Jenkins for ownCloud
3664be1480 [tx-robot] updated from transifex 2015-12-21 02:18:42 -05:00
Jenkins for ownCloud
c5cd584b63 [tx-robot] updated from transifex 2015-12-19 02:19:06 -05:00
Jenkins for ownCloud
ca1c8a0121 [tx-robot] updated from transifex 2015-12-17 02:19:04 -05:00
Jenkins for ownCloud
3649c90605 [tx-robot] updated from transifex 2015-12-16 02:19:03 -05:00
Jenkins for ownCloud
89cb27f224 [tx-robot] updated from transifex 2015-12-13 02:18:46 -05:00
Jenkins for ownCloud
0d808114b6 [tx-robot] updated from transifex 2015-12-11 02:19:06 -05:00
Christian Kamm
0555c88425 User Sharing: Match user names and case insensitive #4269 2015-12-10 14:56:15 +01:00
Christian Kamm
e2d1a5a41d Share UI: Allow typing in a sharee 
Previously you *had* to select one of the completion options, even
if the text in the lineedit was identical to one of the options.
 2015-12-10 13:49:47 +01:00
Christian Kamm
df1b309b36 FolderWatcher: Remove IN_DONT_FOLLOW #3475 
This fixes the case of the root folder being symlinked.
 2015-12-10 13:05:43 +01:00
Christian Kamm
e3b53b7e74 Log: Remove scary messages :) 2015-12-10 11:50:19 +01:00
Christian Kamm
d8d9fcf2f4 Silence warning about zorder in .ui file. 2015-12-10 11:10:49 +01:00
Christian Kamm
ae806e8214 Merge remote-tracking branch 'origin/2.1' 2015-12-10 11:07:20 +01:00
Christian Kamm
8b5474ff67 SocketAPI: Don't use ERROR for SoftErrors #3944 2015-12-10 11:02:38 +01:00
Christian Kamm
f65a29df5d SocketAPI: Ensure messages are consistent #3944 
Before we blindly broadcasted the result of a sync action. That was
often different from what a subsequent FILE_STATUS query would report.
 2015-12-10 10:43:17 +01:00
Christian Kamm
fd18c565b0 SocketAPI: Fix file error cache #3944 2015-12-10 10:43:17 +01:00
Christian Kamm
fbb85fab81 Activity tab doesn't vanish with too many accounts #4188 
The bug was introduced by a bad merge.
 2015-12-10 09:43:16 +01:00
Jenkins for ownCloud
db0674dc76 [tx-robot] updated from transifex 2015-12-10 02:40:19 -05:00