mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-16 10:41:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
2140 commits 481 branches 257 tags 451 MiB
Commit graph

2140 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Schneider
f1647b3338 module: Add a webdav module skeleton. 2012-02-22 18:23:17 +01:00
Andreas Schneider
2b05dc33b7 client: Disable conflict copies by default. 2012-02-22 17:52:19 +01:00
Andreas Schneider
f753a3db0a util: Rename temp file of the unix extension test. 2012-02-22 16:18:07 +01:00
Andreas Schneider
9a12d219d3 vio: Add support for SSL scheme names. 
If the scheme is https try to load the module without the s at the end
if there is no module.
 2012-02-13 14:33:23 +01:00
Andreas Schneider
f4f22373ed Remove TODO. 2012-02-04 14:27:48 +01:00
Andreas Schneider
63565b0f26 time: Fix clock_gettime(). 2012-02-04 14:24:22 +01:00
Andreas Schneider
aa6bef0d77 config: Add missing config values. 2012-02-04 14:11:37 +01:00
Andreas Schneider
ca52cb0545 Update ChangeLog. 2012-02-04 13:57:55 +01:00
Andreas Schneider
c2bad8004d smb: Require newer samba version. 2012-02-04 13:47:00 +01:00
Andreas Schneider
59d1432c4a Update README. 2012-02-04 13:41:17 +01:00
Andreas Schneider
2ec6c98101 tests: Fix the csync util test. 2012-02-04 13:30:10 +01:00
Andreas Schneider
e8b0b34fe5 tests: Fix time test. 2012-02-04 13:24:56 +01:00
Andreas Schneider
19abbc04ff csync: Use csync_gettime(). 2012-02-04 13:24:53 +01:00
Andreas Schneider
1d609e5985 time: Add csync_gettime() function. 2012-02-04 13:09:07 +01:00
Andreas Schneider
331783baef propagate: Remove dead and wrong assignments. 2012-02-04 12:54:15 +01:00
Andreas Schneider
8e89bfec2b propagate: Fix dead assignment. 2012-02-04 12:47:39 +01:00
Andreas Schneider
82c2017a04 path: Fix dead assignment. 2012-02-04 12:44:15 +01:00
Andreas Schneider
eb2b3438ba lock: Fix unlink in error path. 2012-02-04 12:41:55 +01:00
Andreas Schneider
9f802a83f3 propagate: Fix some blank lines. 2012-02-04 12:37:33 +01:00
Andreas Schneider
b99fd213b6 vio: Fix build errors. 2012-02-04 12:34:46 +01:00
Andreas Schneider
de2cb55f0e propagate: Remove unused variables. 2012-02-04 12:28:51 +01:00
Andreas Schneider
6dca82a4a1 reconcile: Fix return value. 2012-02-04 12:26:27 +01:00
Andreas Schneider
4e5b29257e include: Fix packed attribute for file structure. 2012-02-04 12:23:54 +01:00
Andreas Schneider
5a28200e8b cmake: Increase minimun requried cmake version. 2012-02-04 12:23:30 +01:00
Andreas Schneider
1c52b90fa4 Pack the csync_file_stat structure. 2012-02-04 12:15:48 +01:00
Andreas Schneider
d0888ffba8 cmake: Fix build on OSX. 2012-01-20 15:23:18 +01:00
Christian Jann
ffd7d5b247 better idea to align the INSTRUCTIONs printf(%-20s,...) 2011-04-12 19:42:08 +02:00
Christian Jann
9c40ecafc4 csync.reconciler: show the correct type: "file" or "dir" 2011-04-12 17:59:25 +02:00
Christian Jann
deb620b5be align everything correctly (easier to read) 
prefix "CSYNC_": no extra information -> removed
we could even remove "INSTRUCTION_" or change it to "INST_"
 2011-04-12 17:09:39 +02:00
Christian Jann
a8071bfd14 csync.propagator/csync.reconciler first print instruction type, 
than print the path and align everything correctly (easier to read)
 2011-04-12 17:06:18 +02:00
Christian Jann
f65612ff2e hide instruction NONE messages when log level is set to debug, 
only show these messages on log level trace
 2011-04-12 13:20:50 +02:00
Christian Jann
aad3e146fc set instruction after conflict backup for the statedb merger to NONE 2011-04-12 10:09:41 +02:00
Christian Jann
1fbe6b6c96 Better way to fix bug "Found a bug but no bugtracker" 2011-04-06 17:09:05 +02:00
Christian Jann
92dc16a59e Increase version numbers. 2011-04-06 17:08:52 +02:00
Christian Jann
c848d8ffd7 added conflict-copy option to csync client 2011-04-06 17:08:30 +02:00
Christian Jann
2627275da5 updated .gitignore 2011-04-06 17:08:14 +02:00
Christian Jann
9864baa0c8 fixed small error: 
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
 2011-04-06 17:08:01 +02:00
Christian Jann
d842119065 improved logging 2011-04-06 17:07:20 +02:00
Christian Jann
e4d8e793f6 added new conflict resolution to libcsync 
- use the latest version of the two files under its original filename
  in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
  using the same file extension with appended marker (e.g. "conflict")
  and timestamp in both destinations
  (e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
  on the side where the conflict has occurred and gets synced to the other side
  on the second sync.
 2011-04-06 16:57:24 +02:00
Christian Jann
29616c0b2e ignore kdevelop project files 2011-04-06 16:56:27 +02:00
Christian Jann
09980fcf5a fix hundreds of these warnings: 
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
 2011-04-06 16:56:05 +02:00
Christian Jann
f76d9fbcc3 added kate's suffix for backupfiles to .gitignore 2011-04-06 16:55:14 +02:00
Andreas Schneider
d9da6b6e91 Updated ChangeLog. 2010-02-15 12:31:15 +01:00
Andreas Schneider
f46817b2c1 Improved the interactive keyboard auth function. 2010-02-15 12:30:38 +01:00
Andreas Schneider
94b7fdc8ca Improved the ssh auth functions. 2010-02-15 12:20:57 +01:00
Andreas Schneider
84c77a2d5a Improve the server is known messages. 2010-02-15 12:10:17 +01:00
Andreas Schneider
3a9bfdb489 Increase version numbers. 2010-02-15 11:56:35 +01:00
Andreas Schneider
3df0eb527f Require at least libssh 0.4.0. 2010-02-15 11:55:48 +01:00
Andreas Schneider
7394c19ea1 Update FindLibSSH module to the lastest version. 2010-02-15 11:55:15 +01:00
Andreas Schneider
fdd8236aeb Migrated sftp module to libssh 0.4. 2010-02-05 12:28:12 +01:00