chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-08-28 15:53:08 +02:00
Code Activity
14,618 Commits 4 Branches 173 Tags
v2.7.0-beta2
Commit Graph

14618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz
00d8343e76 SettingsDialogMac: Also start timer for notifications 2018-05-29 20:09:06 +02:00
Nextcloud bot
4089456bc6 [tx-robot] updated from transifex 2018-05-28 00:49:03 +00:00
Roeland Jago Douma
1b756ac80f Merge pull request #318 from nextcloud/upstream/pr/6402 
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
 2018-05-26 21:33:45 +02:00
Roeland Jago Douma
bb1b86b087 Merge pull request #307 from nextcloud/upstream/pr/6366 
test/testsyncengine: testNoLocalEncoding is for Linux
 2018-05-26 21:30:21 +02:00
Nextcloud bot
e9be7fc18a [tx-robot] updated from transifex 2018-05-26 00:54:16 +00:00
Nextcloud bot
37cac61f49 [tx-robot] updated from transifex 2018-05-25 00:55:04 +00:00
Nextcloud bot
c2e0a4a73c [tx-robot] updated from transifex 2018-05-23 16:56:31 +00:00
István Váradi
76c4b05270 Patch the OSX CMakeLists.txt for Xenial 2018-05-22 07:04:09 +02:00
Camila Ayres
122daf4199 Merge pull request #335 from nextcloud/rakekniven-patch-1 
Fixed tiny grammar issue (adds dot to the end of a sentence)
 2018-05-21 17:43:35 +02:00
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
Julius Härtl
5f0b56e13a Merge pull request #326 from nextcloud/upstream/pr/6415 
Nautilus integration: Not a ColumnProvider
 2018-05-17 22:56:57 +02:00
Joss Brown
df8708dd46 postinstall macOS: check if Finder is running 
Some users have disabled Finder, and the postinstall will always reenable Finder, unless it checks Finder status first.
 2018-05-17 21:14:57 +02:00
Roeland Jago Douma
cf4e156fa0 Merge pull request #321 from nextcloud/upstream/qtversion-pkg-name 
macOS: Put Qt version in .pkg name
 2018-05-17 21:13:42 +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
Christian Kamm
629b14266b Nautilus integration: Not a ColumnProvider 
The nautilus plugin doesn't actually define get_columns(), so pretending
to be a ColumnProvider lead to a critical warning on startup.
 2018-05-17 20:52:40 +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
2e0d724e3e Merge pull request #297 from nextcloud/upstream/pr/6336 
- add description for moveToTrash variable
 2018-05-17 15:37:40 +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
Camila Ayres
19ae3e4326 Merge pull request #293 from nextcloud/upstream/pr/6265 
Move remote-deleted files to trash
 2018-05-17 12:20:53 +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
Markus Goetz
b22daf8691 macOS: Put Qt version in .pkg name 2018-05-16 20:08:25 +02:00
whitequark
6dd5876b8a Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty 
As per XDG Base Directories specification:
> If $XDG_RUNTIME_DIR is not set applications should fall back
> to a replacement directory [...]

In practice, the ownCloud client has the fallback, but the plugin
helper does not, and if $XDG_RUNTIME_DIR is not set, the plugin
mysteriously does not work.
 2018-05-16 20:05:46 +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
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