mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,264 Commits 194 Branches 287 Tags 562 MiB
ecb7347d33
Commit Graph

586 Commits

Author SHA1 Message Date
Olivier Goffart
dc1070d02d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	CHANGELOG.md
	VERSION.cmake
	src/gui/MacOSXBundleInfo.plist
	src/gui/folderstatusmodel.h
	src/gui/settingsdialog.cpp
 2020-02-25 11:45:27 +01:00
Olivier Goffart
fc69d5271e Run clang-tidy check for modernize-use-nullptr 2020-02-10 16:41:07 +01:00
Olivier Goffart
1622615d5f Run clang-tidy with modernize-use-override 
And also replace all remaining Q_DECL_OVERRIDE to just override
 2020-02-10 16:41:07 +01:00
Olivier Goffart
a6f1a976a6 fixup test 2020-02-10 15:15:15 +01:00
Olivier Goffart
aaa51e203d Tests: add a couple of move tests 
This was an attempt to reproduce #7722, but this actually does not
reproduce it
 2020-02-10 15:15:15 +01:00
Hannah von Reth
bc21511eec [OAuth] Fix naming 2020-02-10 14:36:32 +01:00
Hannah von Reth
6ad402543a Remove old test scripts 
Fixes: 7679
 2020-02-04 14:24:45 +01:00
Hannah von Reth
120c696edb Fix saving of cookies 
Fixes: #7700
 2020-02-03 15:55:48 +01:00
Hannah von Reth
c8d1e081c1 Tests: Add test for behaviour on unexpected user in authentication reply 2020-01-24 14:00:43 +01:00
Hannah von Reth
168e062d7c [Oauth] move oauth refresh to oauth.cpp 2020-01-24 14:00:43 +01:00
Hannah von Reth
e113f8069e Oauth: Cleanup 2020-01-24 14:00:43 +01:00
Hannah von Reth
d0943439b7 Move oauth from ui -> libsync 2020-01-24 14:00:43 +01:00
Hannah von Reth
69f74a6398 [CMAKE] Cleanup cmocka tests 2020-01-20 12:19:57 +01:00
Hannah von Reth
4a1e8202a0 [CMAKE] Use ecm for autotests 2020-01-20 12:19:57 +01:00
Hannah von Reth
41649c6d7a [CMAKE] Set C standard for C unittests 2020-01-09 15:39:32 +01:00
Hannah von Reth
6725cd5826 [CMAKE] Resolve some issues discovered during review 2020-01-09 15:39:32 +01:00
Hannah von Reth
9a11f4e9f1 [CMAKE] Use KDECmakeSettings 2020-01-09 15:39:32 +01:00
Hannah von Reth
a6fba2d200 [CMAKE] Start using extra cmake modules 2020-01-09 15:39:32 +01:00
Hannah von Reth
a94804c75d [OAuth] Add state parameter to negotiation 2019-12-16 19:55:40 +01:00
Hannah von Reth
ac1102070f Merge branch '2.6' 2019-12-06 16:52:12 +01:00
Olivier Goffart
112e78ba94 Support for openid connect 2019-11-20 14:32:57 +01:00
Olivier Goffart
ba99c38d19 Don't show the "All files deleted" popup when unselecting everything with selective sync 
Issue #7337
 2019-11-18 11:28:47 +01:00
Olivier Goffart
50179c3b54 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	.drone.yml
        VERSION.cmake
 2019-11-11 11:44:31 +01:00
Olivier Goffart
48d3c8432e VFS: Do not overwrite existing files by placeholder 
For issue #7557 and #7556

Note: this change the API of the VFS plugin, so the VFS plugin needs small
adaptations
 2019-11-03 17:01:48 +01:00
Olivier Goffart
6b361f2cc2 Merge remote-tracking branch 'origin/2.6' 2019-10-31 17:05:42 +01:00
Olivier Goffart
60d28c44be Test: Fix testsyncvirtualfiles test 
Like previous commit, the failure was caused by two conflicting commits
 2019-10-30 18:26:16 +01:00
Olivier Goffart
79e9168beb Fix build of tests. 
Resulted from a conflict between two patches
 2019-10-30 17:51:28 +01:00
Christian Kamm
16a8823e11 Vfs: Lots of tests and corrections for suffix edge cases 
Avoid or deal with problems that happen when suffixed files exist on the
server or suffix and non-suffixed files exist locally.

See #7350, #7261.
 2019-10-30 14:41:01 +01:00
Olivier Goffart
292e983d7c Merge remote-tracking branch 'origin/2.6' into master 2019-10-14 14:12:03 +02:00
Olivier Goffart
fb84e4c990 When moving is allowed but deleting is not, do not restore moved items 
Issue #7293
 2019-10-11 13:09:07 +02:00
Olivier Goffart
06e3a98e8d Fix Upload of large (> 2GiB) files 
Issue #7506

This is a regression introduced by the delta sync feature (as the chunk offset
changed from being the chunk number to be the byte offset, it needs to be a
qint64 now)
 2019-10-09 13:55:06 +02:00
Olivier Goffart
4eeb6483b5 Merge remote-tracking branch 'origin/2.6' 2019-10-08 11:11:05 +02:00
Christian Kamm
ed7ec006f0 Tests: Fail if the initial sync fails 2019-10-08 09:37:29 +02:00
Olivier Goffart
1597b2edc1 Tests: introduce ItemCompletedSpy to avoid a bit of code duplication 2019-10-07 22:36:55 +02:00
Christian Kamm
5f3682a47d Propagate dir: Never write the etag on remote mkdir #7481 
It must always only be written once all children are successfully
propagated.
 2019-10-07 14:33:15 +02:00
Hannah von Reth
2fcc92dfee Avoid Windows crt warning by an alternative implementation 2019-10-07 14:03:06 +02:00
Christian Kamm
976db2ef84 Test: Disable local discovery parallelism in permission test 
Adding parallelism broke the test because it depended on the order of
discovery.
 2019-09-16 19:52:19 +02:00
Markus Goetz
e1b31d742c Discovery: List local directories from thread #7456 #7439 2019-09-09 20:41:55 +02:00
Christian Kamm
99fd45051a Discovery: If a move is forbidden, restore the source 
Previously the source was deleted (or attempted to be deleted), even if
the new location was not acceptable for upload. This could make data
unavilable on the server.

For #7410
 2019-09-02 09:58:59 +02:00
Christian Kamm
1e652e12b5 Propagation: Fix delete-before-rename bug #7441 
By introducing a PropagateRootDirectory job that explicitly
separates the directory deletion jobs from all the other jobs.

Note that this means that if there are errors in subJobs the
dirDeletionJobs won't get executed.
 2019-08-30 18:33:23 +02:00
Christian Kamm
0f606229f2 Checksums: Fix crash due to threading issue 
The checksum computation thread was potentially using a QFile that was
deleted in the gui thread.

For #7368
 2019-08-07 21:22:48 +02:00
Christian Kamm
4fd9bdc4b4 Vfs: Remove old db record when dehydrating via rename 
For #7338
 2019-07-25 15:21:54 +02:00
Christian Kamm
d09c4fd2e8 Vfs: Ensure pins change with (de-)hydration 
Previously an implicit hydration of a file in an online-only folder
would not change the pin state and cause a dehydration on the next
sync.
 2019-07-24 16:16:39 +02:00
Christian Kamm
199163187a Vfs: Preserve pin state on hydration 
For #7322 and #7323
 2019-07-18 20:00:28 +02:00
Christian Kamm
aafa903a02 Drone: Skip DatabaseErrorTest 
It seems reliable when run manually, but frequently breaks when executed
by drone.
 2019-07-15 11:37:59 +02:00
Christian Kamm
75ddb8dd80 Vfs: Make test pass with different suffix #7279 2019-06-28 10:48:18 +02:00
Christian Kamm
6b89747a26 VfsSuffix: Wipe stale pin states #7273 
Previously the pin states of deleted files stayed in the 'flags'
database and could be inadvertently reused when a new file with the same
name appeared. Now they are deleted.

To make this work right, the meaning of the 'path' column in the 'flags'
table was changed: Previously it never had the .owncloud file suffix.
Now it's the same as in metadata.path.

This takes the safe parts from #7274 for inclusion in 2.6. The more
elaborate database schema changes (why use 'path' the join the two
tables in the first place?) shall go into master.
 2019-06-27 15:57:20 +02:00
Christian Kamm
86b15ffb20 RequestEtagJob: Consistently parse etags #7271 
Previously RequestEtagJob did return the etag verbatim (including extra
quotes) while the db had the parsed form. That caused the etag
comparison during discovery move detection to always fail. The test
didn't catch it because the etags there didn't have quotes.

Now:
- RequestEtagJob will parse the etag, leading to a consistent format
- Tests have etags with quotes, detecting the problem
 2019-06-27 13:08:18 +02:00
Christian Kamm
02a9b16b0f Vfs: Move pin state if files move #7250 
Previously renames of items didn't carry the pin state with them.
 2019-06-23 10:23:37 +02:00
Christian Kamm
e653924e06 Vfs: Don't let new local files start out unpinned #7250 
If one adds a new file to an online-only folder the previous behavior
was to upload the file in one sync and dehydrate it in the next. Now
these new files get set to Unspecified pin state, making them retain
their data.
 2019-06-23 10:23:37 +02:00