mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-29 00:26:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
12266 commits 476 branches 255 tags 479 MiB
Commit graph

5874 commits

Author SHA1 Message Date
Markus Goetz
367d0c39e8
Logging: Avoid the word "Error" 
The old code printed "QNetworkReply::NoError"
 2018-06-06 20:24:32 +02:00
Christian Kamm
e1ab5f3811
Network settings: If no proxy host given, show "no proxy" #5885 
What happens internally is that a proxy without a hostname gets treated
as no proxy.
 2018-06-06 20:11:09 +02:00
Olivier Goffart
073a5184cb
Use std::chrono::milliseconds to represent milliseconds 2018-06-06 17:26:53 +02:00
Olivier Goffart
c4af4a5a85
More Button: Use SVG and fix size so it renders good in highdpi 
When the more button was changed from using a text to an icon,
the size computation was not adjusted proerly to that of a button
with an icon.

And using svg allows it to be rendered correctly with high-dpi

It looks much much nicer now
 2018-06-06 13:55:34 +02:00
Olivier Goffart
012c638d4e
Uploads: Don't delete unexisting chunks 
Since commit 4dc49ff3, we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.

Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
 2018-06-06 09:52:02 +02:00
Christian Kamm
de9fb7dc9a
Silence warning by removing unnecessary this capture 2018-06-06 09:15:25 +02:00
Christian Kamm
550b845037
SocketApi/Sharing: Add "copy public link" to menu #6356 
* The new menu option will fetch shares and create a new link share if
  no "context menu share" currently exists.
* Various cleanup of common operations in socketapi happened as well,
  in particular there's now FileData::get() that calculates all the
  relevant paths that are useful for most socketapi actions.
 2018-06-06 09:15:23 +02:00
Markus Goetz
eb097cbffb
Notifications: Lower hiding timeout 
With the 4.5sec timeout, it was very easy to accidently hit the wrong notification
when the previous one dissapeared so late.
 2018-06-05 21:24:56 +02:00
Markus Goetz
de1032ebd7
Q_UNUSED: Sprinkle around 2018-06-05 20:45:51 +02:00
Markus Goetz
d3cbe63801
macOS: Implement new dynamic Finder menu items #6328 2018-06-05 20:40:40 +02:00
Markus Goetz
648911f3ab
macOS: Unload the Finder extension on exit #5382 #3819 2018-06-05 20:22:02 +02:00
Christian Kamm
4a81ae75cf
Logging: Add persistent auto-logdir option #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
428cfc5e1c
LogDir: Compress log when switching files #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
9319b6594e
LogDir: Go to new file on Problem/Abort too #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
63c2474b70
Folders: Use "Problem" icon for unresolved conflicts #6277 2018-06-05 19:59:19 +02:00
Christian Kamm
ed5e413751
Share link: Update permission wording #6192 2018-06-05 19:46:04 +02:00
Olivier Goffart
613fd30021
SyncJournalDb::setSelectiveSyncList: Always use a transaction 
Issue #6431
 2018-06-05 11:15:51 +02:00
Christian Kamm
c57e4dcf03
Blacklisting must prevent parent etag updates #6411 2018-06-05 10:12:11 +02:00
Roeland Jago Douma
a0c458d937
Fix output add E2E again 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-05 09:02:41 +02:00
Olivier Goffart
f4f228de3e
FolderStatusModel: fix potential assert 
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
 2018-06-05 08:12:58 +02:00
Olivier Goffart
3e508329b5
csync_update: add the checksum in the discovery log 
Issue #6414
 2018-06-05 07:52:29 +02:00
Roeland Jago Douma
32ae670c4e
Merge pull request #325 from nextcloud/upstream/ssl-button-speed 
SslButton: Improve speed (especially on macOS) #6031
 2018-06-04 17:14:38 +02:00
Roeland Jago Douma
4bd6f2b26d
Merge pull request #323 from nextcloud/upstream/upload-finished-flag 
Upload: Simplify 'finished' flag
 2018-06-04 17:14:17 +02:00
Roeland Jago Douma
c1171d700e
Merge pull request #322 from nextcloud/upstream/pr/6404 
Excludes: Expand doc, Desktop.ini only in root folder
 2018-06-04 17:13:23 +02:00
Roeland Jago Douma
3a1dc44ec8
Merge pull request #320 from nextcloud/upstream/issue/6403 
propagateuploadv1: don't finalize after a done()
 2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4
Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder 
Forbid to encrypt or decrypt a non-empty folder.
 2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8
Merge pull request #319 from nextcloud/upstream/issue/4424 
Folder: normalize the local path.
 2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264
Merge pull request #317 from nextcloud/upstream/issue/3146 
SslButton: Add HTTP/2 info #3146
 2018-06-04 16:01:44 +02:00
Olivier Goffart
393f6c2310
SyncEngine: remove the "CSync" wording from the error messages 
They are confusing for the user.
Example in issue #6274
 2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc
CSync: Remove unused error codes 
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
 2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31
CSync: reconcile never returns an error 2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69
csync: remove CSYNC_PARAM_ERROR 
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
 2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree 
Small refactoring
 2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6
Forbid to encrypt or decrypt a non-empty folder. 
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return

as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish

2 - verify if the folder is empty locally

as the user could have send some files to the folder.
 2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5
Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314 
Fix cloudproviders after merging #314
 2018-06-04 15:32:36 +02:00
Roeland Jago Douma
f96206705a
Merge pull request #315 from nextcloud/upstream/pr/6379 
Discovery: Error if properties are missing #6317
 2018-06-03 19:58:21 +02:00
Roeland Jago Douma
4b1c6bb833
Fix cloudproviders after merging #314 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef
Merge pull request #314 from nextcloud/upstream/pr/6373 
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
 2018-06-02 20:20:19 +02:00
Julius Härtl
c9634d65aa
Merge pull request #313 from nextcloud/upstream/pr/6380 
ConnectionValidator: change the minimum server version
 2018-06-01 15:43:19 +02:00
Markus Goetz
b8b9b93a6e
ShareDialog: macOS grey odditiy #5774 2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b
Propagator: remove a bunch of code related to the 'Shared' directory 
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
 2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4
ConnectionValidator: change the minimum server version 
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
 2018-06-01 13:17:11 +02:00
Olivier Goffart
1b587a1241
ConnectionValidator::Status use Q_ENUM 
So no need to have a manual conversion to QString
This is only used in debug message anyway.
 2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb
Move ClientProxy and ConnecitonValidator to gui 
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
 2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411
owncloudcmd: Do not overwrite the http timeout for json jobs 
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
 2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4
owncloudcmd: Do not read the proxy settings from the gui's config file 
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
 2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc
Folder: remove unused member 2018-05-31 21:56:44 +02:00
Roeland Jago Douma
c6ef8eec0a
Merge pull request #305 from nextcloud/upstream/pr/6363 
SyncEngine: Use separate state for two unicode conversions
 2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349 
Don't delete contents behind directory junctions #6322
 2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70
Merge pull request #311 from nextcloud/upstream/pr/6371 
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
 2018-05-29 20:33:34 +02:00