chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-08 20:53:10 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph

6388 Commits

Author SHA1 Message Date
Christian Kamm
7154a001d6 Sharing: Use maximum allowed permissions for new share #6346 
The client already computed the valid permissions, there was just a typo
that meant we didn't end up using them.
 2018-05-15 19:26:40 +02:00
Markus Goetz
e82869d10e HTTP2: Only from Qt 5.9.4 #6285 2018-05-15 19:23:11 +02:00
Olivier Goffart
88347a985f Adjust the Move To Trash patch 
(PR #6265)

 - Remove the UI completely
 - Move the #ifdef inside the FileSystem::moveToTrash function, so it is easier to
   implement on other platforms
 - Q_OS_UNIX includes mac, so we need to disable it. (not using Q_OS_LINUX because of
   other BSD that uses XDG spec as well
 - Translate the error messages
 - Add a couple of doc comments
 2018-05-15 19:10:41 +02:00
Christian Kamm
2d1d651fcd Don't delete contents behind directory junctions #6322 
QFileInfo::isSymLink() does detect reparse points that are symlinks but
returns false for junctions. The new function FileSystem::isJunction()
can detect those and is used to not recursively delete files inside
directories that are junctions.

See also https://bugreports.qt.io/browse/QTBUG-45344 and the
discussion in the PR https://codereview.qt-project.org/#/c/113019/.
 2018-05-15 18:42:44 +02:00
Markus Goetz
d33692cdc7 NO_SHIBBOLETH: Fix warning 2018-05-15 18:31:12 +02:00
Christian Kamm
1fa88c9820 FolderStatusModel: Refresh folders on Problem sync #6337 
We don't want to refresh too frequently. But Problem is very close to
Success and very common.
 2018-05-15 18:08:17 +02:00
Christian Kamm
ad750f569c Tray: Change icon for unresolved conflicts #6277 2018-05-15 17:58:10 +02:00
Olivier Goffart
2fcd7b20b8 SocketAPI: "Open in browser" and disable Share entries when sharing is disabled. 
This adds "Open in browser" entry in the menu (Issue #5903)

Also mark the entries as disabled when the file is not yet on the server.
If re-sharing is not allowed for that file, a disabled explaination
entry is added to the menu.
If sharing is disabled globaly in the branding or in the server,
the share entry will not be present.
(Issues #4205 and #4608)

Meta issue #6292
 2018-05-15 17:39:30 +02:00
Oleg Solovyov
f9fe24feb9 Move remote-deleted files to trash 
Squashed from https://github.com/owncloud/client/pull/6265

Linux only, Hidden option, disabled by default
 2018-05-15 17:23:38 +02:00
Camila San
d629f2259d Changes from qCWarning to qCDebug. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:19:29 +02:00
Camila San
bbff83fe7c Only updates the list of apps when there is a change in the server (not 304 status). 
Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:03:51 +02:00
Camila San
402dc6c33b Checks for http status code before building navigation apps menu. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:03:51 +02:00
Camila San
23a759ef4a Adds 304 http status code as valid. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:03:51 +02:00
Camila San
77ebccee72 Adds methods to set/get navigation apps etag response header. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:03:51 +02:00
Camila San
d7286872f6 Adds function to add raw header to the request. 
Function added to be able to add If-None-Match to save the ETag.

Signed-off-by: Camila San <hello@camila.codes>
 2018-05-07 18:03:42 +02:00
Roeland Jago Douma
889c930b36 Merge pull request #75 from nextcloud/new_flow 
Add weblogin flow for NC > 12
 2018-05-03 14:07:44 +02:00
Roeland Jago Douma
56e17c25b2 Change loading bar to NC blue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 13:55:27 +02:00
Roeland Jago Douma
ef2d113930 Mark credentials as valid if there is no error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
35e8d0437d Address comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6809f12e68 Allow the user to sign in again 
If the user is signed out (for whatever reason). Show a popup
with the loginflow again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
ac1664b525 Actually use webflow credentails 
* Detect invalid auth (if the users token is removed for example)
* Properly store and fetch from keychain

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6b43d80c01 Start with persisting credentials 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
356f9b4831 Actually connect properly to server 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
715c738ebf Add urlschema handler so w can catch the nc:// urls 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c763a6e7fb Show webview with page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c4a88fe57e Add QWebView as a dependency 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Camila Ayres
9338dadaab Merge pull request #265 from k1l1/log_files_path 
Put log files somewhere else #221 (name conflict)
 2018-05-02 15:30:34 +02:00
Kilian Pfeiffer
56c1d79c49 fixes windows crash / renaming changed 2018-04-30 16:09:04 +02:00
Camila Ayres
64cbc88474 Merge pull request #251 from nextcloud/clientSideEncryptionV4 
Client side encryption v4.
 2018-04-26 19:56:55 +02:00
Kilian Pfeiffer
cd926e5b84 resolving name conflict in logfiles 2018-04-24 15:47:23 +02:00
Roeland Jago Douma
75609c1b2c Merge pull request #254 from ad1rie1/FIX32BitApplication 
Fix #6394
 2018-04-22 20:57:36 +02:00
Camila Ayres
25b40cc852 Merge pull request #255 from ad1rie1/FixDeprecatedTR 
Fix Use of Deprecated trUtf8.
 2018-04-20 11:11:05 +02:00
Adrien
8e52f1237b Fix Use of Deprecated trUtf8 2018-04-19 12:02:26 +02:00
Adrien
5f0a021c04 Fix #6394 2018-04-19 11:35:03 +02:00
Kilian Pfeiffer
40b1f051a4 log files are visible now 2018-04-17 17:59:03 +02:00
Kilian Pfeiffer
faf64958ec changed paths of logfiles 2018-04-17 15:54:05 +02:00
Tomaz Canabrava
7432d6a814 Merge branch 'master' into clientSideEncryptionV4 2018-04-10 16:18:58 +02:00
Daniel Nicoletti
16aa54ed64 Do not create new db entries when the remote tree does not have proper values 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3e05bd1da0 Do not detach encrypted files vector 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3eb3535d0f Fix downloading NEW encrypted files 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
defe2d7631 Fix matching encrypted data for downloading 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
b12066f1aa Properly remove encryption data from JSON of deleted file 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a9208f6581 Remove unused encrypted property 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
6e63a538b7 Make sure bool _currentLockingInProgress is first defined to false 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a7a8de8787 Fix matching encrypted file for download 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d93f7269b8 Properly mark encrypted files for removal 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f Fix merging remote and local trees when e2e files are involved 
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
c0ef36b8fa Use QUuid to generate random names 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
60fc5d6dd4 Fix upload of existing encrypted files by matching only filename 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d5ab642e46 Fix sync status running when encryption data is missing 
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".

This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
 2018-04-09 13:23:52 +02:00