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,303 Commits 4 Branches 173 Tags
v1.7.0-beta3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Markus Goetz 6c44f53645 Set network timeout to 300 sec 
As per previously used values (see source and changelog)
 2014-05-02 15:35:40 +02:00
Markus Goetz 925c6485e6 Propagator: Dont show silly string for non-error 2014-04-30 11:36:57 +02:00
Markus Goetz 3bf15541c6 Add set_csync_file_locked_or_open_ext 
Without using function, there were problems with DLL import/export
 2014-04-29 18:37:34 +02:00
Markus Goetz 876de8fd69 Networkjobs: Remove stray include 2014-04-29 17:55:26 +02:00
Markus Goetz 4489a56c65 Csync: Set error at correct place 2014-04-28 17:25:18 +02:00
Markus Goetz 7f752c7e93 Csync: Plug code for csync_file_locked_or_open 2014-04-28 16:57:56 +02:00
Markus Goetz b39359c929 Csync: Add hook for checking if a file is in use already 2014-04-28 14:18:58 +02:00
Markus Goetz f6711b2842 CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
Markus Goetz 94f380c1f0 Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME 2014-04-22 17:05:59 +02:00
Markus Goetz 197d180cb9 Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME 2014-04-22 16:17:49 +02:00
Markus Goetz 4be20db670 Propagator: Add makeConflictFileName function 2014-04-22 16:07:18 +02:00
Markus Goetz 77ac092975 WiP: Attempt to compile without UI 2014-04-21 19:57:15 +02:00
Markus Goetz d35c0f3ade Propagator: Fix chunking for real 
The reset() (using seek()) didn't work.
 2014-04-05 14:26:24 +02:00
Markus Goetz 0f7d448058 Propagator: Fix chunking 2014-04-04 15:41:35 +02:00
Markus Goetz 565bb540d6 Propagator: Add debug message regarding legacy vs QNAM 2014-04-03 16:37:40 +02:00
Markus Goetz b18f1ad386 SyncEngine: Removed unused signal 2014-04-02 12:47:15 +02:00
Markus Goetz 67f4d0c85b CSync: Debug message if no exclude file defined 2014-03-27 17:11:19 +01:00
Markus Goetz 54313338cd SyncEngine: new aboutToPropagate signal 2014-03-27 17:04:31 +01:00
Markus Goetz 09e6207ce9 SyncEngine: Fix typo 2014-03-27 15:19:02 +01:00
Markus Goetz d5659442b2 SyncEngine: Sanity bail out if DB does not exist suddenly 
The update/reconcile worked for me, but the Propagate step had an invalid DB
path but still went on (and then messed things up)
 2014-03-26 16:57:50 +01:00
Markus Goetz c6e5f39f7f SyncJournalDb: Verbose log on load failure 2014-03-26 16:40:00 +01:00
Markus Goetz 7bef166d6c CSync: Debug file_id on walk 2014-03-26 15:32:45 +01:00
Markus Goetz 91f416ffc7 Fix compile after changing Account::davPath() 2014-03-22 09:41:32 +01:00
Markus Goetz 384eef4d6d csync_owncloud: Add a debug message 2014-03-21 17:19:07 +01:00
Markus Goetz ff95cbd04b Account: Don't hardcode WebDAV path 2014-03-21 17:14:04 +01:00
Markus Goetz cc5fabdab0 Engine: Introduce jobCompleted() signal 2014-03-21 17:13:02 +01:00
Markus Goetz ff95e233bc Token Credentials: Support actual tokens 2014-03-21 17:12:26 +01:00
Markus Goetz f72e1cc837 Log: Don't override level for csync 
The level shall be set from Folder or owncloudCmd only.
 2014-03-21 13:52:35 +01:00
Markus Goetz 07904e078a CSyncThread: Emit a signal for each file before propagate 
This can be used to display info before the sync is happening
 2014-03-14 14:08:32 +01:00