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,445 Commits 4 Branches 173 Tags
v1.7.0-beta4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz 5d048c18bc Sqlite3: Switch to WAL 
This is faster.
 2014-10-20 23:09:28 +02:00
Markus Goetz 0fb779d363 SyncEngine: De-initialize recursive PROPFIND value correctly 2014-10-20 22:24:28 +02:00
Markus Goetz d33b68ccc9 CSync: Error out if DB error 2014-10-20 19:32:06 +02:00
Markus Goetz f0dc3725e8 ownSql: Still also use sqlite3 busy handler 2014-10-20 17:26:25 +02:00
Markus Goetz 2de22b408b SyncEngine: Avoid transaction warning 2014-10-20 17:20:58 +02:00
Markus Goetz 7dbb98c2e5 SyncEngine/SyncJournalDB: Don't keep transactions open 2014-10-20 16:50:55 +02:00
Markus Goetz 8b35cda4c6 SyncEngine: Refactor startSync() code 2014-10-20 15:51:50 +02:00
Markus Goetz cb36a37779 SyncEngine/SyncJournalDB: Fix creation of .csync_journal 2014-10-20 14:27:00 +02:00
Markus Goetz 704c5f2de7 NetworkJobs: Higher timeout for pre-oC7 
Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update),
the oc7 doesn't.
 2014-10-20 13:34:09 +02:00
Markus Goetz f1006ca8b0 owncloudcmd: Always need exclude list 
Try to load the system list or the user supplied list.

For #2322
 2014-10-17 15:58:01 +02:00
Markus Goetz 93c85711d1 ownSql: Always use finish() 2014-10-17 13:39:48 +02:00
Markus Goetz e5ef5f2410 Revert "socketapi: if the filename is empty, it's actually /" 
Not needed, the socketapi checks for "".

This reverts commit 561e3c780d.
 2014-10-17 13:29:34 +02:00
Markus Goetz b1c10c8454 Remove references to qsqlite3 2014-10-16 17:51:17 +02:00
Markus Goetz 1d5b3aadea sqlite3: Bundle 3.8.6 for Mac and Windows 
it is linked into ocsync.
 2014-10-16 17:38:45 +02:00
Markus Goetz 2d420cd72c ownSql: Always use SQLITE_TRANSIENT 
More safe.
 2014-10-16 15:30:50 +02:00
Markus Goetz 707d6880a8 main: Show console message if already running 2014-10-16 15:25:33 +02:00
Markus Goetz dbad1a8d45 ownSql: Don't allow copying of SqlQuery 
This fixes a crash on OS X where the destructor
calls sqlite3 to invalidate the underlying handle.
 2014-10-16 15:10:25 +02:00
Markus Goetz eb60aca34f SyncJournalDB: Clarify debug message 2014-10-13 17:29:26 +02:00
Markus Goetz 4d3020421a SocketAPI: Remove old dbFileRecord function 
We will use the _capi functions
 2014-10-13 17:29:26 +02:00
Markus Goetz f1ce0a1cf3 SocketAPI: Use non-recursive (heuristic) computation of icons 2014-10-13 17:29:26 +02:00
Markus Goetz b285e98988 SQlite: Print versions we use 2014-10-11 17:33:35 +02:00
Markus Goetz ef48de34f7 Logger: Log the thread pointer 
Maybe we can somehow reduce this to make it not so many characters wide?
 2014-10-11 16:58:47 +02:00
Markus Goetz f8f5a7ceaa OS X Overlay Icons: Fix static analyzer warnings 2014-10-10 11:44:40 +02:00
Markus Goetz b01839e9a4 OS X: Remove dead JSON code 2014-10-10 11:44:40 +02:00
Markus Goetz 75dbf12ae6 CSync: Remove dead code 2014-10-10 11:44:40 +02:00
Markus Goetz f0fef4f232 OS X: Fix .app creation for non-system Qt 2014-10-09 16:50:03 +02:00
Markus Goetz 32aaecd832 macdeployqt: Fix missing symbol 2014-10-09 12:07:00 +02:00
Markus Goetz 6fbd28d228 Merge branch 'overlayicon_cache' into 1.7 2014-10-08 11:02:58 +02:00
Markus Goetz ef019cdbfa OS X Overlay Icons: Fix Finder plugin crash 
By enabling ARC for GCDAsyncSocket (as we should have done before
https://github.com/robbiehanson/CocoaAsyncSocket/wiki/ARC) there
is no chance anymore for a situation where the to-be-written NSData*
is deleted before the socket has had a chance to write it.
Interestingly, this only happened after switching to local sockets,
probably because of how immediatly the NSData* would be sent.

This commit also keeps the debug symbols for the Finder plugin.
 2014-10-03 07:23:43 +02:00
Markus Goetz b6d97cfffb OS X Overlay Icons: Introduce a short term cache for rendered icons 
This is for #2093
 2014-10-01 13:21:29 +02:00
Markus Goetz 52c12b33c3 OS X: CMD+H should hide the dialog 2014-09-30 15:21:55 +02:00
Markus Goetz 02f971b534 OS X Overlay Icons: Fix request for sync dir itself 2014-09-30 12:53:35 +02:00
Markus Goetz f8b73eb9d9 SocketApi: Port OS X to use local sockets 2014-09-30 07:36:20 +02:00
Markus Goetz 0539098371 OS X: Update GCDAsyncSocket 
The two files are from the fork from
https://github.com/jdiehl/CocoaAsyncSocket/tree/socketUN
It supports unix domain sockets.

SHA1 was 7e97fc876522c7bf2a2a434cf40579ae9daf9da5
 2014-09-30 07:09:39 +02:00
Markus Goetz 2fddf05515 OS X: Overlay Icons: Load from bundle-specific path 
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
 2014-09-12 15:09:47 +02:00
Markus Goetz 91d1864840 OS X: Overlay Icons: Less verbose debug output 2014-09-12 15:09:46 +02:00
Markus Goetz 0edd4d3c02 OS X: Overlay icons: Don't show if folder is not marked as being an oC folder 2014-09-12 11:46:53 +02:00
Markus Goetz 4ce03e8b61 OS X: Fix Overlay icon retrieval 
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
 2014-09-07 11:38:23 +02:00
Markus Goetz 1909b465dc CSync: Show file size and inode during update traversal 
With the previous code, we saw those values only when the file/dir was also in the local DB
 2014-09-05 15:23:33 +02:00
Markus Goetz 69066013c1 ownCloudTheme: Fix casing in appName() 
Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.
 2014-09-03 17:30:34 +02:00
Markus Goetz 49c40a4b11 OS X: Have the PKG installer also be signed 2014-09-02 17:57:22 +02:00
Markus Goetz d1eff0ae24 OS X: Add sign_app.sh 2014-09-02 16:14:00 +02:00
Markus Goetz 7da8a5e374 OS X: Create tbz in create_mac_pkg.sh 
Sparkle needs this
 2014-09-02 12:15:11 +02:00
Markus Goetz 0be4b59cff Sparkle: Keep permissions from bundle 2014-08-31 18:57:39 +02:00
Markus Goetz 7c70ada423 Exclude List: Gnucash temp files 
Fixes #2045
 2014-08-29 16:45:08 +02:00
Markus Goetz 12e2bac16b Propagator: Also parse OC-ETag header 
Client side part of https://github.com/owncloud/core/issues/9005
 2014-08-29 16:30:58 +02:00
Markus Goetz b6f42a91f4 OS X: Fix Finder bundle NVTY->OWNC 2014-08-28 15:45:07 +02:00
Markus Goetz d69049ce10 OS X: Fix Finder plugin 2014-08-28 10:21:56 +02:00
Markus Goetz 2f34b046d0 Overlay Icons: Improve OS X version, improve general feedback 
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
 2014-08-27 19:15:43 +02:00
Markus Goetz f8b1b243c1 OS X: Fix installer target name if we have a build number 2014-08-27 14:44:21 +02:00
Markus Goetz 61138b58bf OS X: Quote the installer filename 
Viel hilft viel
 2014-08-27 12:49:22 +02:00
Markus Goetz 5490063b7e OS X: Fix installer creation 
The script should know independently of the machine
 2014-08-27 12:02:57 +02:00
Markus Goetz 79b547b83b Icon Overlay OS X: Complain if icon couldnt be loaded 2014-08-26 17:21:15 +02:00
Markus Goetz d9de6e68ad OS X: Optimize Finder icon drawing code 
Don't have an intermeditate TIFF.
 2014-08-20 14:02:58 +02:00
Markus Goetz b62b87eed3 OS X: Rename LiferayNativity code for shell icons 2014-08-18 12:57:29 +02:00
Markus Goetz 88072a985a SyncEngine & UI: Move QElapsedTimer to object 
Using a function static is too dangerous when multiple threads are involved.
 2014-08-15 16:20:43 +02:00
Markus Goetz c27f151451 SyncEngine & UI: Make the function part of UpdateJob 
That way we can easily emit UploadJob's signals
 2014-08-15 16:11:51 +02:00
Markus Goetz 64a7025522 CSync: Add a 30 second connect (not read) timeout 2014-08-15 15:54:13 +02:00
Markus Goetz ce2741cebc SyncEngine & UI: Progress notifications for update phase 
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
 2014-08-15 15:28:35 +02:00
Markus Goetz 4c0891a22e Tests: Give a more random name to test directories 
Conflicts:
	csync/tests/ownCloud/ownCloud/Test.pm
 2014-08-12 16:27:03 +02:00
Markus Goetz 8e6e51f9a6 OS X: Move include to MAC define 2014-08-12 14:58:34 +02:00
Markus Goetz faa502163e OS X: Finally(?) fix stay-on-top behaviour of settings dialog 
Fixes #1795
 2014-08-12 14:48:42 +02:00
Markus Goetz 22c1629dd3 SyncEngine: Keep csync_journal with proper values for fileId and remotePerm 
Before this patch, we had a lot of empty rows because we created
the SyncFileItems with the wrong(=local) data.
 2014-08-07 10:14:14 +02:00
Markus Goetz fe3f751a8a OS X: Slightly improve pkgproj 
It is still too much bound to Klaas' machine.
 2014-08-05 17:16:17 +02:00
Markus Goetz c313cc02f2 Config: Fix loading of configuration 
There is a strange bug with Qt, we need to always set the application name, then
we can generate the proper config path.
 2014-08-05 00:41:43 +02:00
Markus Goetz f004d5085d Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
 2014-07-25 12:37:27 +02:00
Markus Goetz 0202351a27 Propagator: Fix crash when logging out during upload 
Fixes #1957
 2014-07-14 19:53:42 +02:00
Markus Goetz 71a901a24e TokenCredentials: Fix cookie behaviour 
parseCookies did not work as expected. Now we just hard-set the
token credentials into the Cookie header for QNAM jobs.
This is the same behaviour as for neon jobs.

(cherry picked from commit 855a8c0a335f76b82b8e647a8c5a4ae692065d3b)
 2014-06-19 14:41:47 +02:00
Markus Goetz a5967e4ecd CSync: Fix win32 compile 2014-06-16 16:53:10 +02:00
Markus Goetz 319cf76417 CSync: Move compiler ifdef outwards 2014-06-16 16:26:00 +02:00
Markus Goetz be7b08b50a CMake: Fix token auth compile 2014-06-16 15:34:46 +02:00
Markus Goetz 357b041bb4 CSync: Give ctx to proxy callback 
This fixes a crash.
 2014-06-13 16:46:51 +02:00
Markus Goetz 61999a67cd CSync: Give ctx to proxy callback 
This fixes a crash.
 2014-06-13 15:36:00 +02:00
Markus Goetz 8dbfcd782b CSync: Fetch permissions from server for whole tree on server update 2014-06-06 17:10:07 +02:00
Markus Goetz 70ff928381 CSync & statedb: Parse 'perm' from server 
ownCloud 6 sends this.
 2014-06-06 15:24:17 +02:00
Markus Goetz b48ab79a92 CSync & statedb: Remove uid/gid 
Columns are still in the DB as we don't want to break any compatibility.
 2014-06-06 13:41:16 +02:00
Markus Goetz 9a7fbd4f71 csync_owncloud: Parse properties in one function 2014-06-06 13:41:16 +02:00
Markus Goetz fd4642d827 Folder: Don't add ignored files on startup 
Before each sync is enough.
(We could do it at startup only, but so far it is good to have
it at each sync so we can easier see stuff in the log)
 2014-06-05 17:50:18 +02:00
Markus Goetz 34b31c0146 CSync: Fix test compile 
The previously applied pull request apparantly broke the compile
because it re-ordered entries in the CMakeLists
 2014-06-05 14:22:10 +02:00
Markus Goetz 4e28ba73bb Windows: Fix build harder. 2014-06-05 10:13:20 +02:00
Markus Goetz d4d630b2e9 Windows: Fix build 2014-06-04 12:47:17 +02:00
Markus Goetz 2ff27cdd63 Merge pull request #1844 from owncloud/csyncStdlibReduction 
Csync reduction

Reviewed offline by @dragotin
 2014-06-04 11:28:35 +02:00
Markus Goetz 2f81167164 CSync: Remove more unused things 2014-06-04 11:19:09 +02:00
Markus Goetz 6897c5d41f CSync: Always have statedb enabled 2014-06-04 11:06:41 +02:00
Markus Goetz 233450d850 CSync: Remove config dir setting 2014-06-04 10:56:56 +02:00
Markus Goetz 7428a8fa63 CSync: Remove unused std functions 2014-06-04 10:33:19 +02:00
Markus Goetz 18359d7871 StateDB: Remove _csync_win32_hide_file and use other implementation 2014-06-04 09:46:31 +02:00
Markus Goetz 06863ca9c6 Merge pull request #1839 from owncloud/directDownload 
Direct download URL support + global variable refactoring

Reviewed offline by @dragotin
 2014-06-03 16:44:05 +02:00
Markus Goetz e49b8981dd CSync: Shorten WebDAV property name 2014-06-03 16:41:57 +02:00
Markus Goetz 2e91557c28 CSync: Rename callback functions 2014-06-03 15:01:35 +02:00
Markus Goetz 4d4eab8b1c CSync & Propagator: Support a direct download URL 
This is for server file backends that support sending a
direct URL.
 2014-06-03 14:55:34 +02:00
Markus Goetz 4d4ae9374b CSync: Remove old defines 2014-06-03 11:51:12 +02:00
Markus Goetz b8e20b412c CSync: We can access the context directly 2014-06-03 11:51:12 +02:00
Markus Goetz e36f3c5b10 CSync: Remove one VIO layering 2014-06-03 11:51:12 +02:00
Markus Goetz 8a55f831f4 CSync: Use context instead of global variable 2014-06-03 11:51:12 +02:00
Markus Goetz 0dcc9be5c1 CSync: Remove owncloud_stat 
We get already all metadata with the readdir
 2014-06-03 11:51:12 +02:00
Markus Goetz 5ee00a8df7 CSync: Simplify csync_owncloud stat/resource handling 2014-06-03 11:51:12 +02:00
Markus Goetz 022a3fcd92 OS X: Fix localFileNameClash 
We need to compare the other way round and compare only the file name
because our sync directory might be symlinked and then resolve to
another canonical path (but we were only interested in the filename part
anyway)
 2014-05-30 15:47:53 +02:00
Markus Goetz c1b9d5c653 Propagator: Implement localFileNameClash for OS X 2014-05-26 17:36:52 +02:00
Markus Goetz 667c835c49 Revert "remove auth callback setting in the csync module." 
This commit broke syncing.
We need the callback to supply the password.

This reverts commit 8738128504.
 2014-05-21 20:02:22 +02:00