1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-25 10:42:46 +01:00
Commit Graph

4882 Commits

Author SHA1 Message Date
Klaas Freitag
d080f7f7a7 Remove stray cat handling. 2013-11-06 13:28:38 +01:00
Klaas Freitag
ee69176a6b Revert "Add straycat handling functions."
This reverts commit 171669c3a4.
This needs to be implemented in a different way.
2013-11-06 13:21:45 +01:00
Klaas Freitag
fc33b5a8ab Fix treewalk test, clean test condition. 2013-11-06 13:13:44 +01:00
Klaas Freitag
bae3d2fc1b Fixed assertLocalAndRemoteDir arguments. 2013-11-06 11:31:51 +01:00
Klaas Freitag
eb33879906 Fix some requirement mentions in the INSTALL file. 2013-11-06 11:29:57 +01:00
Klaas Freitag
63069e4739 New test script for remote renames. 2013-11-06 11:29:57 +01:00
Klaas Freitag
862fffae39 Add more test data. 2013-11-06 11:29:57 +01:00
Klaas Freitag
60c56644ef Changes for more convenient test environment. 2013-11-06 11:29:57 +01:00
Klaas Freitag
95cc4c310b Read all data incl. file_id in get_stat_by_inode. 2013-11-06 11:29:56 +01:00
Klaas Freitag
171669c3a4 Add straycat handling functions. 2013-11-06 11:29:56 +01:00
Klaas Freitag
3fb7429f60 Cleanup renaming and record straycats to remove them from journal. 2013-11-06 11:29:56 +01:00
Klaas Freitag
de3963ac75 Set file_id correctly for renamed files. 2013-11-06 11:29:56 +01:00
Klaas Freitag
b6152c19d6 Adjust generic build documentation to the current state. 2013-11-06 11:13:55 +01:00
Daniel Molkentin
800abbf8b7 Make http credentials work 2013-11-05 18:16:00 +01:00
Daniel Molkentin
3af622d535 Make quota display work 2013-11-05 18:15:47 +01:00
Klaas Freitag
ee4cbf52dc Remove straycats collected in the reconcile phase from journal. 2013-11-05 17:53:01 +01:00
Klaas Freitag
5cd2be058d Fix local rename. 2013-11-05 17:50:09 +01:00
Klaas Freitag
3a21edca2b Keep originalFile member as QString rather than C string.
This avoids encoding problems with interesting file names.
2013-11-05 17:48:51 +01:00
Klaas Freitag
c6a926842a Fix recursivley flag misinterpretation. 2013-11-05 17:47:51 +01:00
Daniel Molkentin
440b5164ad Build fix 2013-11-04 16:41:59 +01:00
Daniel Molkentin
cc5f17a7d2 Merge remote-tracking branch 'origin/master' into account_refactoring
Conflicts:
	src/mirall/accountsettings.cpp
	src/mirall/folder.cpp
2013-11-04 16:38:55 +01:00
Daniel Molkentin
85d5b82811 - Make saving/restoring accounts work.
- Prepare for fetching quota
2013-11-04 16:36:23 +01:00
Klaas Freitag
7b99d02875 Change order of the local assert of directories. 2013-11-04 14:55:17 +01:00
Olivier Goffart
f0a1ac4346 Fix syncing folder with nothing in it
Do the start after connecting, as the finish may be imediate if there
is nothing to do.
2013-10-31 12:11:56 +01:00
Olivier Goffart
bdc39f9cc2 Allow folder that are prefix of another 2013-10-31 11:41:56 +01:00
Olivier Goffart
d3ae2f42a7 Reset the proxy module property at every sync
This is required for the fix for #713
Since the module properties are shared in global variables shared by
every folders, removing another folder may clean the proxy settings.
So we need to restore them at every sync
2013-10-31 11:39:43 +01:00
Olivier Goffart
1a6a6758d3 We need to restore the read_from_db flag AFTER closedir
Else, we might dispatch to the wrong close call (the one from owncloud
instead of the one from the db,  resulting in a memory leak
2013-10-31 11:38:00 +01:00
Olivier Goffart
f5391def6b Don't cleanup in owncloud's vio_module_shutdown
All the cleanup is done in owncloud_commit which should
necessarily be called.

Should fix https://github.com/owncloud/mirall/issues/713
The problem was that csync_destroy was called on another csync
instance in another thread, resulting in a crash

Yes, there is still a problem with the proxy settings.
2013-10-31 11:38:00 +01:00
Olivier Goffart
0a99aa5fc7 Don't forget to close the database.
The code was removed when the code to write the database was removed.
But we still need to close the database
2013-10-31 11:14:21 +01:00
Olivier Goffart
df39ab0b2f Don't leak the system tray 2013-10-31 10:52:19 +01:00
Olivier Goffart
28833ee5ac Fix crash when removing folder while syncing.
We need to set _thread to 0 after destoying it
2013-10-31 10:51:45 +01:00
Olivier Goffart
c9cfa16929 Fix memory leak by properly cleaning memory in csync_commit
Restore two lines that were losts in the big merge from csync master
(b5ed352aa3)
2013-10-31 10:05:15 +01:00
Olivier Goffart
8c4ecb4fba Only use etag to know if we should use the db or not
Null file id might just mean the server don't support file id.
So use the database even if fileid is null
2013-10-31 10:02:20 +01:00
Klaas Freitag
c66a1d1895 Removed unused code from LocalRename 2013-10-30 18:14:33 +01:00
Klaas Freitag
cdee0dc1cf Added a PropagateLocalRename job to do local renames. 2013-10-30 17:37:34 +01:00
Klaas Freitag
a43c5fcfe8 Fix header name according to changes on server master. 2013-10-30 17:37:34 +01:00
Klaas Freitag
0b5f1e6dd2 Make tests compile without propagate code. 2013-10-30 17:35:25 +01:00
Klaas Freitag
17d5e67d96 Handle remote renames better. 2013-10-30 17:34:40 +01:00
Klaas Freitag
4412ec38e4 Properly check if the file type has changed. 2013-10-30 17:34:40 +01:00
Klaas Freitag
70b6a5a8b1 Adjust header name to latest server implementation. 2013-10-30 17:34:40 +01:00
Olivier Goffart
5c67f39476 Ignore error 404 on DELETE
This may happen if we have stale entries in the database
2013-10-30 17:33:06 +01:00
Olivier Goffart
fb47657b1f Make F6 in the account config sync the selected folder, for debugging purposes
Issue #409
2013-10-30 16:58:08 +01:00
Olivier Goffart
76d46af4b7 Revert "Implement a sync now button"
Actually, after discussion with the team, we decided this button is a bad idea

This reverts commit b56fcd8ebd.
2013-10-30 16:48:28 +01:00
Daniel Molkentin
86af2848dd Merge remote-tracking branch 'origin/master' into account_refactoring
Conflicts:
	src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
Daniel Molkentin
4ca310b63b Remove ownCloudInfo for good 2013-10-30 16:33:15 +01:00
Daniel Molkentin
59bc1d8966 Credential Store is no longer static
It now belongs to HttpCredentials
2013-10-30 16:32:34 +01:00
Daniel Molkentin
14c2ff44f3 More porting to Account class
- Finish port of owncloud setup wizard to Account
- Deprive MirallConfigFile of the customHandle
2013-10-30 16:31:47 +01:00
Olivier Goffart
b56fcd8ebd Implement a sync now button
The button is in the account config, next to the "pause/resume" button

Fixes #409
2013-10-30 16:27:00 +01:00
Olivier Goffart
e38d6d974b Replace _Button* with _button
Identifiers starting with underscore and uppercase are reserved in C++.
2013-10-30 15:52:30 +01:00
Olivier Goffart
9500c5ffab Do not change the instruction anymore when we finish an item
The status is in the status.  Keep the original instruction so the
UI knows what to display for eath item
2013-10-30 10:46:05 +01:00