chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-15 09:30:05 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
702 Commits
Author SHA1 Message Date
Michael SchusterandGitHub 8c2d77c68f Merge pull request #1699 from Milokita/test-file-fix 
apply http2 qt resend patch from owncloud
 2020-01-19 18:11:36 +01:00
Dominique Fuchs d7a9940973 Fix failing of several tests by including ocsjob source (after its inclusion in accountstate in a previous commit) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 10:53:43 +01:00
Dominique Fuchs db92d5bfff append the correct folderwatcher (platform specific) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 10:39:56 +01:00
XNG 768cf7e1ae apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 14:36:25 +08:00
XNG d87a88e39f apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 14:13:03 +08:00
XNG 314c00a8b7 apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 13:59:15 +08:00
Michael SchusterandGitHub 4d5dd0f49c Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-20 21:33:19 +02:00
Camila San 19491ff85f Once client gets 401/403 from the server, check if remote wipe was requested. 
- When the the users logs because of 401 or 403 errors, it checks if the
server requested the remote wipe. If yes, locally deletes account and folders
connected to the account and notify the server. If no, proceeds to ask the
user to login again.
- The app password is restored in the keychain.
- WIP: The change also includes a test class for RemoteWipe.

Signed-off-by: Camila San <hello@camila.codes>
 2019-10-17 20:11:31 +02:00
Camila AyresandGitHub 6c56811636 Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-17 13:37:01 +02:00
Dominique Fuchs f993e7c555 Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-10-08 08:31:31 +02:00
asapelkin 17f39bd09d little loops optimization 
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
 2019-10-07 01:29:55 +03:00
Dominique FuchsandGitHub 4edab98b58 Merge branch 'master' into owncloud 2019-09-10 11:03:39 +02:00
Dominique FuchsandGitHub 07df659a3f Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles 2019-09-09 21:46:39 +02:00
Samir Benmendil 5e3c2d2a96 Fix fullPath matching 
Signed-off-by: Samir Benmendil <me@rmz.io>
 2019-08-15 03:00:26 +01:00
Samir Benmendil 14279104ae Read .sync_exclude.lst in each subdirectory 
Signed-off-by: Samir Benmendil <me@rmz.io>
 2019-08-15 03:00:26 +01:00
Sebastian Grund a9bea53c89 issue1216: added sync-exclude entry for emacs recovery files 
Signed-off-by: Sebastian Grund <grund92@gmx.de>
 2019-05-22 08:52:37 +02:00
Joshua Sterner bd9fcd88d8 testMove3LevelDirWithFile now uses mv function to move the directory 
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com>
 2019-05-09 04:12:33 -07:00
Joshua Sterner b6ff17c50b Fixed Issue #1000 - Subfolders of moved folders not synced 
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com>
 2019-05-09 04:12:33 -07:00
Camila San b5b2ef3120 Updates test to fit new configuration default value. 
Signed-off-by: Camila San <hello@camila.codes>
 2019-04-12 16:22:07 +02:00
Roeland Jago DoumaandGitHub 3b5d8f0277 Merge branch 'master' into upstream/pr/6656 2018-11-01 08:07:55 +01:00
Roeland Jago DoumaandGitHub dd39887f2b Merge pull request #641 from nextcloud/upstream/pr/6621 
TestOAuth: Don't have global static QObject
 2018-10-30 22:38:51 +01:00
Roeland Jago DoumaandGitHub d246c1e8b9 Merge branch 'master' into upstream/pr/6485 2018-10-24 08:27:11 +02:00
Roeland Jago DoumaandGitHub 24606c0105 Merge branch 'master' into upstream/pr/6632 2018-10-23 22:51:12 +02:00
Roeland Jago DoumaandGitHub 6b7328bb87 Merge branch 'master' into upstream/pr/6632 2018-10-23 22:48:34 +02:00
Roeland Jago DoumaandGitHub f3529e3dd7 Merge branch 'master' into upstream/pr/6674 2018-10-23 21:43:13 +02:00
tuxmaster5000 f9c6449c05 Fix include file 2018-10-12 15:56:26 +02:00
tuxmaster5000 3c00c09ea8 Rename owncloud tests to nextcloud 2018-10-12 14:52:18 +02:00
Olivier GoffartandCamila San 08e4ba3363 Data-Fingerprint: Fix backup detection when fingerprint is empty 
Add a test to test the data fingerprint feature make me realize it was broken.
The code was relying in the distinction between empty and null QByteArray,
but this was a bad idea as this difference is lost when going through QString.
 2018-09-10 20:44:03 +02:00
Olivier GoffartandCamila San b3e4ec9454 FolderMan::checkPathValidityForNewFolder: make sure to work when folder points to deleted folders 
Note that we also needed to adjust the server url to contains the user name
in the folder wizard. (As checkPathValidityForNewFolder expect the user name)

Issue #6654
 2018-09-09 22:02:44 +02:00
Olivier GoffartandCamila San d202942a2c Reconcile: When detecting a local move, keep the local mtime 
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
 2018-09-09 21:38:10 +02:00
Olivier GoffartandCamila San 7019f03e46 TestOAuth: Don't have global static QObject 
Fix a strange warning seen on the log from the CI on Windows in
https://github.com/owncloud/client/pull/6621

The test shows, at the beginning
QObject::connect: No such signal DesktopServiceHook::destroyed(QObject*)
And crashes at the and.

My guess is that when QDesktopServices::setUrlHandler is called, the
QMetaObject is not yet initialized

But this is probably not the reason of the crash
 2018-09-09 18:16:59 +02:00
Christian KammandCamila San cba0627a9c Ensure GETFileJob notices finishing #6581 
It could happen that readyRead was emitted for incoming data while the
download was not yet finished. Then the network job could finish with
no more data arriving - so readyRead wasn't emitted again.

To fix this, the finished signal also gets connected to the readyRead
slot.
 2018-09-09 11:50:00 +02:00
Christian KammandCamila San 2844c925eb Show a tray message when a folder watcher becomes unreliable #6119 2018-08-28 17:04:25 +02:00
Olivier GoffartandRoeland Jago Douma d114212333 OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Roeland Jago Douma 38b89a3fa0 Update testutility 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-28 13:37:02 +02:00
Roeland Jago Douma 6ab7e814a5 Fix tests to actually compile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-28 13:37:02 +02:00
Christian KammandRoeland Jago Douma 16ba0cf47e Blacklist: Add unittest #6411 2018-06-11 14:50:01 +02:00
Christian KammandRoeland Jago Douma 77fcff5bdf Conflicts: Change tags to be more user friendly #6365 
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
 2018-06-11 14:40:40 +02:00
Christian KammandRoeland Jago Douma 3556482bce TestChunkingNG: Remove unneeded test code 2018-06-07 08:53:12 +02:00
Olivier GoffartandRoeland Jago Douma 012c638d4e Uploads: Don't delete unexisting chunks 
Since commit 4dc49ff3, we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.

Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
 2018-06-06 09:52:02 +02:00
Roeland Jago DoumaandGitHub c1171d700e Merge pull request #322 from nextcloud/upstream/pr/6404 
Excludes: Expand doc, Desktop.ini only in root folder
 2018-06-04 17:13:23 +02:00
Olivier GoffartandRoeland Jago Douma 0443f8dd4d csync: Simplify csync_walk_local_tree/csync_walk_remote_tree 
Small refactoring
 2018-06-04 15:41:38 +02:00
Roeland Jago DoumaandGitHub 1262cbf4ef Merge pull request #314 from nextcloud/upstream/pr/6373 
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
 2018-06-02 20:20:19 +02:00
Olivier GoffartandCamila San 311307e8cb Move ClientProxy and ConnecitonValidator to gui 
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
 2018-05-31 21:56:55 +02:00
Roeland Jago DoumaandGitHub c6c42c3c70 Merge pull request #311 from nextcloud/upstream/pr/6371 
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
 2018-05-29 20:33:34 +02:00
Roeland Jago DoumaandGitHub bb1b86b087 Merge pull request #307 from nextcloud/upstream/pr/6366 
test/testsyncengine: testNoLocalEncoding is for Linux
 2018-05-26 21:30:21 +02:00
Roeland Jago DoumaandGitHub 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
Christian KammandCamila San 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
Christian KammandCamila San 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
Olivier GoffartandCamila San 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