chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 15:46:15 +02:00
Code Activity
6,663 Commits 4 Branches 173 Tags
v1.7.1-beta1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 131747ea4b Bumped version to 1.7.1 beta1 2014-12-09 15:25:37 +01:00
Klaas Freitag 72a90199db Wizard: Removed superflous text, as it is already in the header. 
This fixes mirall#2358
 2014-12-08 11:12:15 +01:00
Klaas Freitag 49bb861045 Removed useless debug output 2014-12-06 12:37:53 +01:00
Klaas Freitag 1d6661e7e4 Fix the number of displayed items in progress display for removes. 
This fixes mirall#1132

A variable that counts the affected items of the propagator operation
done on a item was added to SyncFileItem. Usually that is 1 because
most operations affect only the item itself. But for removes, the
number can be higher for directories (one remove removes a whole tree).

Some rearrangements were needed.
 2014-12-06 12:31:45 +01:00
Klaas Freitag 9ea359de52 GUI: Check if there are sync folders configured and how proper msg. 
This fixes #2264
 2014-12-03 17:11:42 +01:00
Klaas Freitag c5daf7d1b6 Mac installer: Make the installer background brandable for MacOSX. 2014-12-03 14:37:59 +01:00
Klaas Freitag 3e34d000f2 Propagator: Add the chunk size to PUT requests. 2014-11-25 10:21:33 +01:00
Klaas Freitag 65a307970b Propagator: Compare the actual file size with the request content length 
The values must match. Otherwise the request did succeed, but the file
was not downloaded completely.

This fixes https://github.com/owncloud/mirall/issues/2528
 2014-11-20 18:49:34 +01:00
Klaas Freitag 6eec896282 FolderWatcher: Check for hidden outside of loop 2014-11-06 09:23:30 +01:00
Klaas Freitag a78bb252de Nautilus shell: Remove some useless logging. 2014-11-06 09:23:30 +01:00
Klaas Freitag 1029f9521c tests: exit t5.pl if running against ownCloud 6 
t5.pl checks the environment variable SERVER_VERSION and if that equals
"owncloud6" it bails out after a check of the sharing ocs api.
 2014-10-29 14:24:36 +01:00
Klaas Freitag 825eca078d tests: make t1.pl work on jenkins, for that disable a size compare. 2014-10-29 14:01:58 +01:00
Klaas Freitag 105ff694f2 SyncEngine: Handle 503 condition as soft error to properly handle etags. 
Otherwise the ETags could be removed from the db and cause file
deletes.
 2014-10-28 17:13:21 +01:00
Klaas Freitag 0692fea9d8 discovery: handle 503 reply code from server for directories 
503 for directories means that the dir is a mounted directory from an
external mount which currently is not available. The directory is
ignored and not traversed into during discovery phase.
 2014-10-27 19:21:12 +01:00
Klaas Freitag b691521662 tests: Fix CSync Journal test, use real CSYNC struct from csync_private. 
This fixes bug #2396
 2014-10-27 13:15:33 +01:00
Klaas Freitag ab5dae741a Show GIT SHA sum in cmake output. 2014-10-27 11:54:22 +01:00
Klaas Freitag 0e828d802e Bump version to 1.7.0rc1 2014-10-24 18:20:41 +02:00
Klaas Freitag 9505d7cc51 Updated changelog for 1.7.0 2014-10-24 18:19:16 +02:00
Klaas Freitag 86e13ea06f FolderMan: Use folderForPath method to get the folder object for a path 2014-10-24 15:07:33 +02:00
Klaas Freitag c12d3870cd Merging work branch for a bug fix for bug #2379. 
It closes all db connections if the new local path is a already
synced folder path.
 2014-10-24 14:43:48 +02:00
Klaas Freitag a9d8e9dcd8 Setupwizard: Close the database in case of moving the folder. 2014-10-24 13:05:29 +02:00
Klaas Freitag 542e989046 Setup Dialog: Terminate sync if the new folder is a an actual folder. 2014-10-24 11:59:56 +02:00
Klaas Freitag f5c199740d Followup: To unregister a path in socket api use the alias of folder. 2014-10-24 11:36:01 +02:00
Klaas Freitag f37b81c8b7 Unregister path in socketapi before removing it. 2014-10-24 11:12:06 +02:00
Klaas Freitag 114c38c1ff csync tests: add some debug code to get behind the jenkins fails. 2014-10-23 17:33:47 +02:00
Klaas Freitag e726e7aad8 util: Use canonicalFilePath to clean the path opened by explorer. 
This fixes bug #2299
 2014-10-23 10:41:07 +02:00
Klaas Freitag 9f6d7eb587 tests: use the ocs_url in the same semantics as the 1.6 branch. 2014-10-22 16:06:39 +02:00
Klaas Freitag 3243365210 JournalDb: Do not longer always have a write operation on version table. 
Rather read the value from the table and if it is what we expect do not
write it.
 2014-10-22 10:59:58 +02:00
Klaas Freitag 21c8e65d13 csync tests: Fix test after db changes. 2014-10-21 11:26:04 +02:00
Klaas Freitag 26f068bcab SocketApi: Properly manage the database connections. 
Removed the fishy closeDb() method of SqlQuery again.
 2014-10-20 17:31:33 +02:00
Klaas Freitag 04b62b139d Fix compile error and add warning. 2014-10-20 17:10:34 +02:00
Klaas Freitag 2f20f3c65d SocketApi: Instanziate Object to call QFileInfo::exists 
QFileInfo on Qt4 does not have static members.
 2014-10-20 17:05:14 +02:00
Klaas Freitag 53b3e5af1b SocketAPI: Use new class SqlQuery to cache the sql queries. 
This results in better handling of the BUSY condition through SqlQuery.
 2014-10-20 16:55:37 +02:00
Klaas Freitag 3fcb0d2d6b SocketAPI: Properly release precompiled statements. Use sqlite3_close 
rather than its v2 equivalent. That should make it compile on older
linux platforms.
 2014-10-20 10:51:03 +02:00
Klaas Freitag 2dfe0ed42e Remove unused variable, fixes compile warning. 2014-10-20 10:51:03 +02:00
Klaas Freitag b5736fb5a7 Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare. 
Repeat the statements a couple of times and sleep in between.
 2014-10-18 16:16:29 +02:00
Klaas Freitag 7822a6b000 csync_statedb: Finalize the precompiled statements after discovery. 
As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled
statements should not be used across thread borders. However, the reconcile
phase would reuse the statements if defined (it calls statedb function from
a different thread) so it is saver to finalize them at the end of the
update run.
 2014-10-18 14:18:11 +02:00
Klaas Freitag c66c01245b Beautified some debug logging strings. 2014-10-17 11:35:06 +02:00
Klaas Freitag 2f740fe471 tests: Added unicode read an write testcase for ownsql. 2014-10-16 21:21:47 +02:00
Klaas Freitag 36eaff92e5 JournalDb: Some Sql statement fixes, make t7 work again. 
plus some minor fixes.
 2014-10-16 11:22:57 +02:00
Klaas Freitag e51c299937 ownSql: create an null value of an empty string in bindValue. 2014-10-16 11:20:50 +02:00
Klaas Freitag 8c7953a47c ownSql: Proper initialization of result value plus assert on it. 2014-10-16 11:20:21 +02:00
Klaas Freitag ee8a93ae9a ownSql: Proper initialization of errId 2014-10-16 10:39:10 +02:00
Klaas Freitag 89c51e7649 ownsql: Implement the transaction functions. 2014-10-15 19:47:25 +02:00
Klaas Freitag 6c92076ec3 tx.pl: Adopt test t6.pl to the new way of handling precondition failed. 2014-10-15 19:25:34 +02:00
Klaas Freitag 336c95ce5b ownsql: Cleanups: In modern C++, we use 0 instead of NULL 2014-10-15 16:46:39 +02:00
Klaas Freitag babe891242 SyncEngine: Show a warning if post update script can not be exec. 2014-10-15 16:43:58 +02:00
Klaas Freitag eeb5ca42e0 ownsql: Added some paranthisis to make clear whats happening. 2014-10-15 13:29:25 +02:00
Klaas Freitag 74ec90c725 tx.pl: Fix sharing api url, some whitespace fixes. 2014-10-15 13:28:53 +02:00
Klaas Freitag 0094c1ecf5 Make the sync work with new sql implementation. 2014-10-14 20:51:51 +02:00
Klaas Freitag 6b5fcf53eb Test module for the new sql implementation. 2014-10-14 20:51:34 +02:00
Klaas Freitag 357c08c5b3 NewSQL: minor fixes to get stuff going 2014-10-14 12:18:33 +02:00
Klaas Freitag e7d9ec50dc Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi 
Conflicts:
	src/mirall/socketapi.cpp
 2014-10-14 11:43:10 +02:00
Klaas Freitag 09b0ba31ef Sql: New implementation of ownSql class to go away from Qt's own Sql 2014-10-14 11:14:57 +02:00
Klaas Freitag 26ffa078ef SocketAPI: Cache database conections and statements 2014-10-13 17:31:40 +02:00
Klaas Freitag dd28a645a1 SocketAPI: Cleanup, removed helper namespace, added as private methods. 2014-10-13 15:38:57 +02:00
Klaas Freitag 561e3c780d socketapi: if the filename is empty, it's actually / 2014-10-13 15:36:13 +02:00
Klaas Freitag 8371e34d87 Nautilus overlay: minor cleanups 2014-10-13 14:59:23 +02:00
Klaas Freitag 46fd79604d JournalDb: Do not use static variable for path. 2014-10-13 14:49:53 +02:00
Klaas Freitag d08c2de619 Use sqlite C api. 2014-10-13 14:14:43 +02:00
Klaas Freitag ab40ba2f75 owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl 
method in a subclass of HTTPCredentials.
 2014-10-11 17:17:43 +02:00
Klaas Freitag bbcb8ba3e7 credentials: Allow to trust ssl certs in subclasses of HTTPCredentials. 
This allows to handle the --trust option in owncloudcmd. In the
owncloudcmd subclass of the httpcredentials, we allow to manually trust
the ssl certificate through a command line switch.
 2014-10-11 17:17:43 +02:00
Klaas Freitag 2f5cea0e73 owncloudcmd: Add a custom ssl verification callback for neon. 
That fixes the SSL related problems we had with ci.owncloud.org
 2014-10-11 15:55:37 +02:00
Klaas Freitag d491663143 owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211 2014-10-11 15:14:07 +02:00
Klaas Freitag 8eaeba6486 owncloudcmd: Fix url handling with csync, make owncloudcmd sync again. 
This fixes mirall issue #2211
 2014-10-11 12:21:26 +02:00
Klaas Freitag 9bb89dced5 Less offensive logging, only use error if there was one. 2014-10-10 10:16:59 +02:00
Klaas Freitag 61967f6e1b csync tests: conform to read only db. 2014-10-09 17:45:20 +02:00
Klaas Freitag 32fea6523f Use climits for ULONG_MAX rather than modern C++ option 2014-10-09 11:03:07 +02:00
Klaas Freitag d1c1a18226 SyncJournal: Use precompiled statement in blacklist query. 2014-10-09 10:05:20 +02:00
Klaas Freitag 04558beabe SyncJournal: Use the NOCASE Collate for blacklist query. 2014-10-09 10:05:20 +02:00
Klaas Freitag 425d0d77c5 Two little typo fixes. 2014-10-09 10:05:20 +02:00
Klaas Freitag edf7cd29dd csync statedb: Set PRAGMA synchronous to NORMAL for read only db. 2014-10-09 10:05:20 +02:00
Klaas Freitag 27318dded6 csync statedb: Issue a warning if sqlite is not compiled thread safe. 2014-10-09 10:05:20 +02:00
Klaas Freitag 11fe0c5b4b csync statedb: Open the statedb in read only mode and with mutex set. 
For that, sqlite3_open_v2 is used with the appropiate flags.
 2014-10-09 10:05:20 +02:00
Klaas Freitag 12b09fab67 CaseClash: more defensive logging on Windows. 2014-10-03 11:54:32 +02:00
Klaas Freitag ed5a8ab090 Push version to beta3 2014-10-03 11:37:00 +02:00
Klaas Freitag 41fa562dce blacklisting: disable broken remove stale entries function for now. 2014-10-03 11:35:18 +02:00
Klaas Freitag 6c2ce06fea tx.pl: Set the SSL relaxing env variable. 2014-10-03 10:33:30 +02:00
Klaas Freitag fee18dd457 Push version to beta2 2014-10-01 21:04:13 +02:00
Klaas Freitag 81d3ce8257 cmake: Commented setting of the INSTALL_PREFIX var on Mac 2014-10-01 20:55:39 +02:00
Klaas Freitag dff1f77dfa SocketAPI: remove nonsense FIXME's. 2014-09-30 17:12:07 +02:00
Klaas Freitag 29987ca2aa Overlays Linux: Add the state to the cache to save calls to add_emblem 
The SocketAPI sends status updates for files without being asked for.
And in order to not draw the emblem again if it had not changed, the
state is compared before calling add_emblem
 2014-09-30 13:57:06 +02:00
Klaas Freitag 479b340d75 Folderman: Check if socketApi member is non zero, no crashes. 2014-09-30 12:33:51 +02:00
Klaas Freitag 06c48f58cc SyncEngine: Use proper start indicator, max unit64. 
This avoids a warning.
 2014-09-30 12:29:24 +02:00
Klaas Freitag 0ee81a2865 SocketAPI: Set permission of the socket Directory. 
Set that to be accessible by the owner only.
 2014-09-30 11:23:49 +02:00
Klaas Freitag e78c251832 SocketAPI: Split up for specific linux and mac implementation. 2014-09-30 11:23:49 +02:00
Klaas Freitag efbc495f79 overlays Nautilus: Adopt to the use a local unix socket not TCP. 
Also, use the appname to find the correct branded icons.
 2014-09-30 11:17:05 +02:00
Klaas Freitag 788c27bf2f cmake: Fix installation of overlay icons on linux 2014-09-29 16:08:49 +02:00
Klaas Freitag b1c842373d Add OWNCLOUDSYNC_EXPORT to make building on windows. 2014-09-26 10:07:50 +02:00
Klaas Freitag 98d9f7924d SocketAPI: Before reporting something new check for parent permissions. 
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.

As discussed in mirall issue #1931
 2014-09-25 21:52:20 +02:00
Klaas Freitag 172295289e Permissions: If a top level shared dir is removed, do not restore files in it 
A top level shared dir can always be removed on the client, even if it is
read only shared. In that case, the removal means "unsharing". Fixed the
permission check accordingly.

See bug #1918 for more information.
 2014-09-25 15:39:14 +02:00
Klaas Freitag 8ba08d7e87 Activity View: honor error string even if no warning 
that allows to specify a more specific user message to be displayed.
 2014-09-25 15:03:54 +02:00
Klaas Freitag 8915f94931 Mac Overlays: handle filenames with slashes properly. 
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
 2014-09-25 12:24:32 +02:00
Klaas Freitag 31bf844452 DownloadJob: Refresh the FileInfo after renaming the target file. 
Otherwise the activity view reports file size 0.
 2014-09-25 10:59:08 +02:00
Klaas Freitag 2e12acdf32 doc: add a memo about the issue that defines the permission flags. 2014-09-24 16:35:50 +02:00
Klaas Freitag 2c67a7ca71 progress: Set a clear start indication in the progress. 
Before, 0 was used to indicate the sync start which wipes the activity
window. However, if there _are_ no synced items but only ignored items
the overall counter stays zero which wipes the list all the time.

This fixes bug #2171
 2014-09-23 15:58:06 +02:00
Klaas Freitag 688b8dcc38 MacOverlays: Pass isDir flag to isRegisteredPath method 
With that, a path can be added to directories to also detect the
sync top directory.

This fixes bug #2053
 2014-09-23 10:25:11 +02:00
Klaas Freitag 280edee1db cmake: fix typo 2014-09-23 10:25:11 +02:00
Klaas Freitag 8f8265b219 Mac Installer: Add file name quoting. 2014-09-22 16:45:33 +02:00
Klaas Freitag 00ae3c3120 Mac Installer: Rename the final package to branded. 2014-09-22 16:38:51 +02:00