1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-18 13:24:49 +02:00
Commit Graph

6222 Commits

Author SHA1 Message Date
rakekniven
8d90c8c17b Fixed tiny grammar issue 2018-05-20 11:17:46 +02:00
Julius Härtl
6a5654d6d2 Merge pull request #294 from nextcloud/upstream/pr/6330
SocketAPI: "Open in browser" and disable Share entries when sharing i…
2018-05-19 16:09:50 +02:00
Julius Härtl
9196ab1c98 Merge pull request #246 from k1l1/master
scary wording on big changes #216 (translations missing)
2018-05-19 15:44:04 +02:00
Kilian Pfeiffer
bb65eb8cdd changed wording
https://github.com/nextcloud/client/issues/216
2018-05-19 13:17:25 +02:00
Julius Härtl
b7a67863a7 Merge pull request #306 from nextcloud/upstream/pr/6347
Set launch-on-startup when the first account is set up
2018-05-18 16:08:52 +02:00
Roeland Jago Douma
b7d5aff901 Merge pull request #303 from nextcloud/upstream/issue/6322
SyncJournal: Don't use LIKE with paths
2018-05-18 13:56:25 +02:00
Roeland Jago Douma
1dc3c156d4 Merge pull request #304 from nextcloud/upstream/pr/6364
Conflicts: Add user name to conflict file name #6325
2018-05-18 13:56:14 +02:00
Julius Härtl
0283e1bfaa Merge pull request #295 from nextcloud/upstream/pr/6329
Tray: Change icon for unresolved conflicts #6277
2018-05-18 08:53:49 +02:00
Roeland Jago Douma
3b4fcfcc65 Merge pull request #302 from nextcloud/upstream/pr/6352
Sharing: Use maximum allowed permissions for new share #6346
2018-05-17 21:11:33 +02:00
Roeland Jago Douma
33555292ae Merge pull request #301 from nextcloud/upstream/pr/6353
HTTP2: Only from Qt 5.9.4 #6285
2018-05-17 15:39:09 +02:00
Roeland Jago Douma
36572b79c3 Merge pull request #298 from nextcloud/upstream/no-shibboleth
NO_SHIBBOLETH: Fix warning
2018-05-17 15:38:04 +02:00
Roeland Jago Douma
cbeb9af7fd Merge pull request #296 from nextcloud/upstream/issue/6337
FolderStatusModel: Refresh folders on Problem sync #6337
2018-05-17 15:37:20 +02:00
Markus Goetz
9ef42b4835 SslButton: Improve speed (especially on macOS) #6031
From 1+n*450msec to 1*450msec
2018-05-16 21:03:06 +02:00
Christian Kamm
a2675b559b Upload: Simplify 'finished' flag
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-05-16 20:57:26 +02:00
Christian Kamm
5f7fd7c551 Excludes: Expand doc, Desktop.ini only in root folder
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-05-16 20:29:12 +02:00
Olivier Goffart
ad276a4bce Folder: normalize the local path.
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)

Issue #4424
2018-05-16 20:26:09 +02:00
Olivier Goffart
3506c52be9 propagateuploadv1: don't finalize after a done()
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)

Issue #6403
2018-05-16 20:23:47 +02:00
Markus Goetz
434f093f98 SslButton: Add HTTP/2 info #3146 2018-05-16 20:10:51 +02:00
Christian Kamm
1868b2f3ec IssuesWidget: addItem performance improvement
Ensure adding a new item isn't usually O(n) by keeping track of which
items have associated issues.
2018-05-16 16:49:41 +02:00
Christian Kamm
a0d7095b2c IssuesWidget: Don't allow two issues for the same file/folder
This is intended to safeguard against invalidation bugs that cause the
same error to be added again for every sync run.
2018-05-16 16:49:03 +02:00
Christian Kamm
a0d5e31423 INSTRUCTION_IGNORE now carries a direction
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
2018-05-16 16:48:31 +02:00
Christian Kamm
11b6b48c75 ProtocolItem: Adjust the way data is stored again
The struct makes it easy to pack data and should consume less memory
overall.
2018-05-16 16:48:06 +02:00
Christian Kamm
800f1ace0c SyncResult: Make sure the number of conflicts is correct #6226
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.

Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.

Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
2018-05-16 16:47:27 +02:00
Christian Kamm
75194d1821 SyncEngine: Make "local discovery?" question available
Also fix the minor bug that was mentioned and add tests.
2018-05-16 16:46:40 +02:00
Christian Kamm
2defaf099d Issues tab: Invalidate issues selectively #6226
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
2018-05-16 16:45:39 +02:00
Christian Kamm
01f83ff398 ProgressInfo: Add information for local vs remote discovery 2018-05-16 16:45:13 +02:00
Christian Kamm
8077748c9d slotFolderDiscovered: Fix 'local' always being false
It was unused, so no harm done.
2018-05-16 16:44:36 +02:00
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
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
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
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