Commit graph

794 commits

Author SHA1 Message Date
Hylke Bons accf447456 git: Use the same Unicode form on all filesystems. Closes #478 2012-07-15 21:01:06 +02:00
Hylke Bons 7fb8cc587f mac invites: don't check certificate 2012-07-15 15:59:04 +02:00
Hylke Bons dde10d33da watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons da15d03621 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons e61e33b47f repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons f67df255d4 repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons f5b0af6e54 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons 0514d3963f config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons eaead8c87d Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons 64bb74f06e Merge branch 'master' into about 2012-07-13 14:20:10 +02:00
Hylke Bons ed190db27b repo: send Idle event when there are no changes after activities have settled. Fixes #850 2012-07-13 14:19:46 +02:00
Hylke Bons 29eaffc6d4 config: Don't accept null values as identifiers 2012-07-11 22:31:45 +02:00
Hylke Bons 165181c009 config: Adjust coding style of last commit 2012-07-10 22:13:18 +02:00
Matthias Dittrich 63eb793abc Fixed a NullreferenceException on startup #844 2012-07-10 16:25:20 +02:00
Hylke Bons ca22672842 Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons f209602f3a Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons a7d926b6fa fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons afe0a0c5fd fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons ec2f5f36a2 Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons c769f6c7a8 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons b87b642742 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Matthias Dittrich 404ee662ac Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons 22fcca2fac lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons c03bbc2fa1 repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons 9692ca655e repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons aeafa39c0d repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons f28dfd0318 repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons a7b0e775e0 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00
Hylke Bons b3040b5276 repo git: Remove some redundant lines 2012-07-03 09:59:18 +02:00
Matthias Dittrich 288317a8bb Now filesnames with special chars will be written properly in the comments 2012-07-03 09:59:18 +02:00
Matthias Dittrich 0b7fa8a193 Tried to set stylecop to match the project code style 2012-07-03 09:59:18 +02:00
Hylke Bons aa9af2c094 lib git: Run commit with --all and deduplicate code somewhat 2012-07-03 09:59:18 +02:00
Hylke Bons ef196d00b8 repo git: Fix coding style for #823 2012-07-03 09:59:17 +02:00
Matthias Dittrich 0be8c17a05 Found another place where the Utf8-fix is required 2012-07-03 09:59:17 +02:00
Matthias Dittrich 02487a466b Sparkle can now handle files with special characters 2012-07-03 09:59:17 +02:00
Hylke Bons 91fdb44445 lib git: Clear git-bin cache after sync 2012-06-29 21:43:49 +01:00
Hylke Bons 865525dee2 lib git: only do remote_url check when needed 2012-06-29 17:08:12 +01:00
Hylke Bons 9dc0b6af5b lib git: Add detection of git-bin repos 2012-06-29 16:44:02 +01:00
Hylke Bons efccc2c1c3 fetcher git: Refactor 2012-06-29 14:00:25 +01:00
Hylke Bons 8470b06a01 fetcher git: Simplify attributes file creation 2012-06-29 13:17:59 +01:00
Hylke Bons a4718cf100 fetcher git: Simplify install of config after clone 2012-06-29 12:53:13 +01:00
Hylke Bons 799314ceee lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess 2012-06-29 00:12:37 +01:00
Hylke Bons a0b3c101d9 repo: Fix some cases where the remote timer isn't resumed 2012-06-29 00:11:25 +01:00
Hylke Bons 4bef356142 repo git: hide .sparkleshare and .empty after a rebase. Fixes #814 2012-06-28 14:21:33 +01:00
Hylke Bons 1b04fda8f7 fetcher git: don't read output on checkout and add --quiet option 2012-06-28 12:18:00 +01:00
Hylke Bons 5ee72e37f5 fetcher: Always delete the tmp host key file after getting its fingerprint 2012-06-28 12:03:04 +01:00
Hylke Bons 744d4f2ffa fetcher: put quotes around host key file path. Fixes #815 2012-06-28 11:57:10 +01:00
Hylke Bons 22698aa00b config: change debug log file name 2012-06-27 13:12:04 +01:00
Hylke Bons 349410927a repo git: don't resolve conflicts on the .sparkleshare file. See #807 2012-06-27 00:13:17 +01:00
Hylke Bons 2f847093c4 windows: bump version number 2012-06-25 22:55:43 +01:00