chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-11-04 10:40:18 +01:00
Code Activity
14,674 Commits 4 Branches 173 Tags
v2.7.0-beta3
Commit Graph

14674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm
687b6f5655 Discovery: Error if properties are missing #6317 2018-05-16 16:42:20 +02:00
Olivier Goffart
b0f539fc1f cmake: Remove references of now unused WITH_TESTING 
Issue #6318
 2018-05-16 13:00:17 +02:00
Olivier Goffart
d4aebd30de Utility::fsCasePreserving: remove UNIT_TESTING ifdef 
Since the release package will be build with unit test, we don't
want to query the env variable at every call to fsCasePreserving.
So only test the env variable at startup.
And the testutility can still change the value.

(The env variable is still used from t8.pl and maybe smashbox)

Issue #6318
 2018-05-16 12:57:20 +02:00
Markus Goetz
f6b67a866a test/testsyncengine: testNoLocalEncoding is for Linux 2018-05-15 23:06:39 +02:00
Christian Kamm
583399ad53 Set launch-on-startup when the first account is set up 
The previous code would disable it when the second account was
configured.

See #6347
 2018-05-15 22:59:16 +02:00
Christian Kamm
ea142b8018 Conflicts with user name: Fix tests 2018-05-15 22:54:48 +02:00
Christian Kamm
f244cc4d4a SyncEngine: Use separate state for two unicode conversions 
It's unlikely that there were interaction effects but still seems safer
to use different conversion state for the path and rename_path.
 2018-05-15 22:44:10 +02:00
Christian Kamm
17d174e6fa Conflicts: Add user name to conflict file name #6325 
For the case of uploading conflict files only.
 2018-05-15 22:38:35 +02:00
Christian Kamm
ce0e2d0b88 SyncJournal: Don't use LIKE with paths 
Paths can contain the wildcards % and _ and that would lead to odd
behavior.

This patch also clarifies the behavior of avoidReadFromDbOnNextSync()
which previously dependend on whether "foo/bar" or "foo/bar/" was
passed as input.

Possibly affects #6322
 2018-05-15 19:44:00 +02:00
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
Oleg Solovyov
66eeb96c54 - doc: linux-only setting 2018-05-15 18:25:27 +02:00
Oleg Solovyov
09ade2b892 - add description for moveToTrash variable 2018-05-15 18:22:36 +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
Julius Härtl
5e2270bd57 Merge pull request #247 from nextcloud/adds-etag-navigation-apps 
Checks for 304 response in the navigation apps request
 2018-05-08 06:55:41 +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
Camila Ayres
3b0b0fea33 Merge pull request #282 from ivaradi/master 
Fix Debian build (another attempt)
 2018-05-06 19:23:31 +02:00
István Váradi
ceb83c3709 Merge branch 'master' of github.com:nextcloud/client 2018-05-06 18:28:34 +02:00
István Váradi
a602df065e Fixed the name of the Qt WebEngine package 2018-05-06 17:12:17 +02:00
István Váradi
181f3bbd26 Added build dependency on qt5webengine-dev (#281) 2018-05-06 16:17:16 +02:00
István Váradi
7e210cfcb3 Merge branch 'master' of github.com:nextcloud/client 2018-05-06 10:24:21 +02:00
István Váradi
fee2872a98 Added build dependency on qt5webengine-dev 2018-05-06 09:53:49 +02:00
Roeland Jago Douma
880f256a62 Merge pull request #278 from ivaradi/master 
Fix Debian build
 2018-05-03 22:20:44 +02:00
István Váradi
7827fe4151 Fix Debian build 2018-05-03 19:02:49 +02:00
Roeland Jago Douma
e40bddb2c2 Merge pull request #276 from nextcloud/no_debian 
Build no debian while it fails
 2018-05-03 14:38:38 +02:00
Roeland Jago Douma
ed3a723ad2 Build no debian while it fails 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 14:28:11 +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