chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-09-30 20:42:52 +02:00
Code
13,527 Commits 4 Branches 173 Tags 91 MiB
v2.6.1-rc1
Commit Graph

13527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomaz Canabrava
9870f39dcb
[CSE] Fetch file-id for subfolders 
File id is a must if we want to call any API.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
 2017-10-18 21:51:36 +02:00
Tomaz Canabrava
9318c487b9
[CSE] Display menu for encrytp / decryot folders 
If the server supports client syde encryption, display
a menu on right click that should display encrypt and decrypt.
ideally it would show the encrypt if the folder is decrypted, and
decrypt if the folder is encrypted but currently there's no way
for the client to know that.
 2017-10-18 21:51:36 +02:00
Tomaz Canabrava
1c32f6bb2e
[CSE] Check the server for client side encryption 
Call the apps api and check if the response has
the client_side_encryption key.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
 2017-10-18 21:51:36 +02:00
Roeland Jago Douma
f9b1c724d6 Merge pull request #19 from nextcloud/no_5.6_drone 
Our 5.6 container is to old. Lets focus on the others for now
 2017-10-18 21:29:47 +02:00
Roeland Jago Douma
4946848d08
Out 5.6 container is to old. Lets focus on the others for now 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-18 21:14:19 +02:00
Roeland Jago Douma
f56e1d167d Merge pull request #18 from nextcloud/up_mas 
Update to oC master
 2017-10-18 21:13:24 +02:00
Roeland Jago Douma
bc7e65b395
Merge branch 'master' of https://github.com/owncloud/client 2017-10-18 21:03:15 +02:00
Markus Goetz
9866010b4c SettingsDialogMac: Fix account display name #6078 2017-10-18 10:41:01 +02:00
Markus Goetz
a3c1052cae owncloudcmd: Fix timestamps, Fix --logdebug 
We did not set a log handler so there were no timestamps.
The --debug didn't have an effect, let's use --logdebug like in GUI version.
(Command line always outputs some log)

Found in owncloud/documentation#3436
 2017-10-18 09:16:05 +02:00
Jenkins for ownCloud
726cbc160c [tx-robot] updated from transifex 2017-10-18 02:19:58 +02:00
Christian Kamm
bf39343920 Sync: Add capability for invalid filename regexes #6092 2017-10-17 17:15:49 +02:00
Markus Goetz
af24b4132d Packaging: Require ZLIB 
For owncloud/enterprise#2295
 2017-10-17 16:53:11 +02:00
Markus Goetz
d339b68715 Checksums: Use addData function 
Our implementation had bad error handling.
This one now uses a new Qt5 addData function.

owncloud/enterprise#2252
 2017-10-17 13:26:54 +02:00
Dominik Schmidt
7f51803d04 Only use $(MAKE) in doc target if make is used as generator 
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
 2017-10-17 12:50:34 +02:00
Jenkins for ownCloud
eadc791795 [tx-robot] updated from transifex 2017-10-17 12:43:06 +02:00
Jenkins for ownCloud
408cf11b2b [tx-robot] updated from transifex 2017-10-17 12:40:55 +02:00
Markus Goetz
e3ba8d3209 Merge branch 'master' into 2.4 2017-10-17 12:37:20 +02:00
Christian Kamm
17b1c83ae5 Activity: Allow sorting of issues and protocol #6086 
The issues tab uses custom ordering where overall and summary sync
issues are displayed first. This ordering is preserved by creating
special sorting logic for the "time" column.

It needed special handling anyway, since sorting by time-string would
have yielded incorrect results.
 2017-10-17 09:47:57 +02:00
Christian Kamm
b2a8ffc577 Abort: Fix crash with early aborts 
_chunkCount could be 0, leading to a floating point exception

I also added initializers for several uninitialized integers in the
upload jobs.
 2017-10-17 09:44:52 +02:00
Christian Kamm
e2711224ed Propagator: Avoid duplicate async abort 2017-10-17 09:44:52 +02:00
Christian Kamm
2ac7e0200a Test case for #5949 2017-10-17 09:44:52 +02:00
Christian Kamm
e6b971b316 TestUtils: Invalidate etags on PUT or chunk-MOVE 2017-10-17 09:44:52 +02:00
Christian Kamm
111bb485ec UploadNG: Avoid div-by-zero for super fast uploads 2017-10-17 09:44:52 +02:00
Piotr Mrowczynski
e10775d34f Fix paused sync file move issue #5949 
Dont abort final chunk immedietally

Use sync and async aborts
 2017-10-17 09:44:52 +02:00
Jenkins for ownCloud
30957479a3 [tx-robot] updated from transifex 2017-10-17 02:18:34 +02:00
Jenkins for ownCloud
b4ab53dd32 [tx-robot] updated from transifex 2017-10-16 02:18:33 +02:00
Jenkins for ownCloud
a314eeb892 [tx-robot] updated from transifex 2017-10-15 02:18:35 +02:00
Jenkins for ownCloud
644ddf318c [tx-robot] updated from transifex 2017-10-14 02:18:36 +02:00
Christian Kamm
f598ac89ac HttpCreds: Fix retry after wrong password #5989 
This is an ugly solution.
 2017-10-13 14:24:37 +02:00
Christian Kamm
3f7b3ca962 Checksums: Improve logging and add global disable #5017 2017-10-13 13:08:20 +02:00
Jenkins for ownCloud
104c6edcde [tx-robot] updated from transifex 2017-10-13 02:18:37 +02:00
Jenkins for ownCloud
94b673dc8e [tx-robot] updated from transifex 2017-10-12 02:18:38 +02:00
Christian Kamm
096cd348f0 Doc: Update FAQ entry on deeply nested directories #1067 2017-10-11 16:01:46 +02:00
Christian Kamm
01c2ffe2ae PropagateDownload: Read Content-md5 header #6088 2017-10-11 09:06:23 +02:00
Jenkins for ownCloud
0a4370236d [tx-robot] updated from transifex 2017-10-11 02:18:35 +02:00
Jenkins for ownCloud
fe8d2b397e [tx-robot] updated from transifex 2017-10-10 02:18:44 +02:00
Christian Kamm
92e90f9c55 Context menu: More detailed status messages 
Previously it could only display synchronization progress or "up to
date". Now it also communicates the same overall state that the icon
shows.

See owncloud/enterprise#2134
 2017-10-09 14:14:31 +02:00
Roeland Jago Douma
9eabd2a32a Merge pull request #6 from nextcloud/mergeWithOrigin 
Update master from current owncloud master
 2017-10-09 08:50:13 +02:00
Jenkins for ownCloud
3eb2642b11 [tx-robot] updated from transifex 2017-10-09 02:18:35 +02:00
Jenkins for ownCloud
99192a6dec [tx-robot] updated from transifex 2017-10-08 02:18:36 +02:00
Jenkins for ownCloud
cffc1fd1c4 [tx-robot] updated from transifex 2017-10-07 02:18:37 +02:00
Olivier Goffart
b8f7c6daae CMakeLists.txt: Put -pie as a linker flag were it belongs 
Fixes warning introduced by PR #6040
 2017-10-06 14:35:56 +02:00
Markus Goetz
cd07865da6 Settings Dialog: Fix display name compilation for macOS #6078 2017-10-06 13:34:40 +02:00
Thomas Müller
315e38e814 Use display-name from the ocs call in the settings dialog 2017-10-06 10:59:20 +02:00
Jenkins for ownCloud
95b90271b6 [tx-robot] updated from transifex 2017-10-06 02:18:35 +02:00
Christian Kamm
19c6757a0f
Rename detection: File size must be equal 
Comparison of file sizes for potential conflicts was added in
0eb9401c62, but did not extend to checking
the file size in case of potential local moves.

This commit adds this check and adds tests for various move+change
scenarios.
 2017-10-05 22:01:42 +02:00
Christian Kamm
3636a59830
t9.pl: Make more reliable 
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
 2017-10-05 22:01:42 +02:00
Markus Goetz
548302c367
ChangeLog: Re-format and re-order 2017-10-05 22:01:42 +02:00
Markus Goetz
a64a33c589
ChangeLog: More 2.4.0 changes 2017-10-05 22:01:42 +02:00
Christian Kamm
01bbbb7d08
Excludes: Fix bug with escapes in the regex, add tests 2017-10-05 22:01:42 +02:00