chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 07:27:15 +02:00
Code Activity
5,967 Commits 4 Branches 173 Tags
v1.7.0-alpha1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Markus Goetz d5fd6309ed CMake: Fix target_link_libraries parameters 2014-03-12 15:03:11 +01:00
Markus Goetz a2467b5dea CMake: Do options one directory above 
This fixes linking when keychain was not desired.
 2014-03-12 14:20:38 +01:00
Markus Goetz 0bbcee7354 CMake: Fix else 2014-03-11 17:56:29 +01:00
Markus Goetz 8a18cf811e CMake: Fix warning 2014-03-11 17:33:45 +01:00
Markus Goetz 4e7e25c569 Improve libowncloudsync 
* Introduce TokenCredentials
* Introduce static compiling
* Have compile flags for smaller compile
 2014-03-11 17:05:44 +01:00
Markus Goetz c24c97703a CMake: Ignore failure when working as submodule 2014-03-11 17:05:44 +01:00
Markus Goetz 630f61142a Proxy: Try to fix issue 
See https://github.com/owncloud/mirall/commit/eb7074e9f088214648183a45c2ce806f65a8bf3c for discussion
 2014-03-06 17:48:18 +01:00
Markus Goetz eb7074e9f0 csync: Don't free proxy settings on commit 
Should fix #1502 and #1524
and #1459 and #1521
 2014-03-04 18:44:52 +01:00
Markus Goetz 6906b8d30c csync: Remove outdated tests 2014-02-28 16:43:15 +01:00
Markus Goetz 1c8f279214 csync: Remove more vio abstraction 2014-02-28 09:13:40 +01:00
Markus Goetz 5d58a8164c csync: Remove get_etag 2014-02-27 14:03:17 +01:00
Markus Goetz 71cc74a0d6 csync: Remove csync_get_local_username 2014-02-27 13:55:34 +01:00
Markus Goetz 77d9256e03 csync: Remove more unneeded code 2014-02-27 13:52:30 +01:00
Markus Goetz e7fb84a491 csync: Remove capabilities 2014-02-27 13:42:20 +01:00
Markus Goetz a652fec5a0 csync: Remove more unused stuff 2014-02-27 13:33:22 +01:00
Markus Goetz 0d34a2bca5 csync: Remove unused vio stuff 2014-02-27 13:25:31 +01:00
Markus Goetz a2e8bfd962 csync: Remove unix_extensions 2014-02-27 13:23:35 +01:00
Markus Goetz eff2427a03 csync: Remove time_sync_required 2014-02-27 13:12:21 +01:00
Markus Goetz c7e70533a0 Shibboleth: Detect also QNAM redirects 
If a QNAM job (e.g. Quota or ETag job) gets redirected,
we'll invalidate and then prompt to re-fetch the credentials
from the user.
(The keychain credentials will be wrong so they get deleted)
 2014-02-25 14:22:55 +01:00
Markus Goetz 065690c2ce Shibboleth: Have proper invalidation if timeout during sync 2014-02-25 09:33:28 +01:00
Markus Goetz b56843ead2 Account: Fix Metatype registratition 2014-02-24 15:31:11 +01:00
Markus Goetz 51b5f3c9b2 Propfind Job: Print redirect URL in log 2014-02-24 15:20:49 +01:00
Markus Goetz 4630244b51 Windows: Special case csync_vio_local_stat 
By not calling tstat _and_ GetFileInformationByHandle, but only
GetFileInformationByHandle, we can save some precious msec in the local
update phase.
 2014-02-21 14:15:34 +01:00
Markus Goetz 6a55324261 OwncloudCmd: Struct needs to be zeroed 
Else the --silent was always true on Windows where memory did not get
zeroed.
 2014-02-19 17:50:15 +01:00
Markus Goetz f1fa1f125d Fix previous commit 2014-02-19 17:39:11 +01:00
Markus Goetz 141f005c34 Ignore conflict files all the time 
The OwncloudCmd currently does not load the exclude files.
It is safer to just always ignore conflict files.
 2014-02-19 17:16:10 +01:00
Markus Goetz 65ffe53c20 Register metatype at better place 2014-02-19 14:53:31 +01:00
Markus Goetz 06f2989ac8 Fix build on Qt4 
Unfortunately I had to remove the 'static'
 2014-02-19 13:29:00 +01:00
Markus Goetz 399b08ad40 OwncloudCmd: Register a meta type 2014-02-19 12:00:38 +01:00
Markus Goetz b7c7c9f3eb Accountsettings: Fix warning 2014-02-19 10:59:57 +01:00
Markus Goetz 9237293cc0 OwncloudCmd: Fixup URL 
Allow users to specify owncloud(s) or http(s)
 2014-02-19 10:57:29 +01:00
Markus Goetz 63083a558b OwncloudCmd: Print update phase duration values 2014-02-19 10:51:04 +01:00
Markus Goetz fcc0e89044 Update phase: Allow benchmarking / progress update 2014-02-18 21:41:20 +01:00