mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-19 20:32:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
709 commits 488 branches 258 tags 463 MiB
Commit graph

709 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andreas Schneider
511635c119 wurst 2010-01-30 00:05:01 +01:00
Andreas Schneider
3ff5ad5f7a Added more cache entries to the default config. 2010-01-17 08:32:55 +01:00
Andreas Schneider
96822d7f99 Fixed generate_findpackage_file. 2010-01-12 15:43:45 +01:00
Andreas Schneider
a46d5101d7 Fixed build warning. 2009-09-12 14:21:44 +02:00
Andreas Schneider
6c2c86aa50 Fixed build warning. 2009-09-12 12:27:03 +02:00
Andreas Schneider
3a265152d8 Set compiler to c99. 2009-09-12 12:26:09 +02:00
Andreas Schneider
16c76166bd Improve detection of system libraries. 2009-09-01 12:25:10 +02:00
Andreas Schneider
93acacfa62 Improve FindCheck module. 2009-09-01 12:16:51 +02:00
Andreas Schneider
f33a01216a Fix FindLog4C.cmake. 2009-09-01 12:16:31 +02:00
Andreas Schneider
14c1366c86 Fix generate_findpackage_file. 2009-09-01 12:16:10 +02:00
Andreas Schneider
b608f782c3 Improve the Log4C module. 2009-09-01 12:08:52 +02:00
Andreas Schneider
6ca27cd6c1 Improve generate_findpackage_file. 2009-09-01 12:01:04 +02:00
Andreas Schneider
d082c8479e Require at least version 0.3.3 of libssh. 2009-08-25 10:53:58 +02:00
Andreas Schneider
5e282c1fc3 Add an improved FindLibSSH module. 2009-08-25 10:53:33 +02:00
Andreas Schneider
44e9f4fea8 Fix name conflicts with newer libssh versions. 2009-08-25 10:47:12 +02:00
Andreas Schneider
c0671371ce Don't leak memory using sftp attributes. 2009-08-25 10:44:34 +02:00
Andreas Schneider
200e3e7123 Add missing requirements. 2009-07-09 09:50:37 +02:00
Andreas Schneider
fbf2491406 Ignore all cscope files. 2009-07-09 09:44:50 +02:00
Andreas Schneider
312c40d16f Improve c_list_find functions. 2009-06-05 11:22:06 +02:00
Andreas Schneider
f98265b30e Some code cleanups. 2009-06-05 10:51:22 +02:00
Andreas Schneider
92abcf243b Update to version 0.43.0. 2009-05-25 18:20:06 +02:00
Andreas Schneider
460aa67dca Document the propagation functions. 2009-05-25 12:58:34 +02:00
Andreas Schneider
778640f1e1 Fix the documentation of the reconciliation. 2009-05-25 12:58:00 +02:00
Andreas Schneider
62b33fbf2d Fix textwidth. 2009-05-25 11:59:30 +02:00
Andreas Schneider
7c88ed8454 Document Reconcilation. 2009-05-25 11:58:51 +02:00
Andreas Schneider
022731b241 Add a group for update detection functions. 2009-05-25 11:58:31 +02:00
Andreas Schneider
7ab802a3b2 Document update detection functions. 2009-05-25 11:42:46 +02:00
Andreas Schneider
3c05e000f8 Reformat some code in update detection functions. 2009-05-25 11:33:18 +02:00
Andreas Schneider
f57576f08a Cleanup c_list_insert_sorted(). 2009-05-23 11:57:15 +02:00
Andreas Schneider
5dda8fdfa5 Some code reformating. 2009-05-22 20:23:54 +02:00
Andreas Schneider
1d7ce7d5fe Improve the documentation of csync_excluded(). 2009-05-22 20:21:20 +02:00