Commit graph

3349 commits

Author SHA1 Message Date
Hylke Bons 9fa9beb389 watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons cc12efe9fa mac: Fix setting of custom folder icon 2012-07-15 12:04:59 +02:00
Hylke Bons 8232877438 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons 0839657282 repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons c6347b4d78 windows: fix build 2012-07-14 15:53:47 +02:00
Hylke Bons 6b25803a38 controller: don't just try/catch everything 2012-07-14 14:37:12 +02:00
Hylke Bons 2d8a02692a repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons e7cea2bff6 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons 495f1e4797 controller: Use HTTPS to fetch gravatars 2012-07-14 13:24:51 +02:00
Hylke Bons 0a6caa7ef8 config: fetch_gravatars -> fetch_avatars 2012-07-14 13:23:46 +02:00
Hylke Bons da38caef60 keys: fix build 2012-07-14 13:21:11 +02:00
Hylke Bons 2fca926b8d config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons d7f5a1cbf8 keys: return both private and public key when generating 2012-07-14 13:04:07 +02:00
Hylke Bons 3496bfba75 Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons 71a31c318b controller: Move public key related stuff to its own class 2012-07-13 23:48:28 +02:00
Hylke Bons 13fef13ca9 linux statusicon: Fix statusicon animation. Closes #849 2012-07-13 15:24:06 +02:00
Hylke Bons ce3ddd919e Merge branch 'master' into about 2012-07-13 14:20:10 +02:00
Hylke Bons 0a9061f6fb 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 17951d6536 config: Don't accept null values as identifiers 2012-07-11 22:31:45 +02:00
Hylke Bons aafb6ec1f3 config: Adjust coding style of last commit 2012-07-10 22:13:18 +02:00
Matthias Dittrich 089430589e Fixed a NullreferenceException on startup #844 2012-07-10 16:25:20 +02:00
Hylke Bons 5d82a14065 Merge pull request #842 from matthid/fixbuild_838
Fix for not building #838
2012-07-09 10:46:36 -07:00
Matthias Dittrich c4a70b93da Fix for not building #838 2012-07-09 19:00:33 +02:00
Hylke Bons de32393a9f Rename README again... 2012-07-09 17:14:06 +02:00
Hylke Bons ac1dd73043 Rename README 2012-07-09 17:09:16 +02:00
Hylke Bons 2d6078f5dc mac about: Add various links to about dialog 2012-07-09 17:07:32 +02:00
Hylke Bons d146f697c8 Add .txt extensions to info files ofr easy opening 2012-07-09 17:07:05 +02:00
Hylke Bons ed3c86e067 Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons fd660670f1 Merge branch 'git-bin'
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2012-07-08 12:51:28 +02:00
Hylke Bons e58bd78148 Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons 430b7f7a4b fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons 77a15ab64c fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons b77ab788db controller: Fix repo loading 2012-07-08 10:38:14 +02:00
Hylke Bons 2122b79ab5 Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons d244f12459 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons 201a753c41 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Hylke Bons c796652813 windows: some more Dispatcher.Invoke replacments 2012-07-05 13:37:18 +02:00
Matthias Dittrich b8680aa070 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-05 13:37:18 +02:00
Matthias Dittrich 49fd14ebdb Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons 78b0069a99 listener tcp: Remove lock 2012-07-03 20:27:42 +02:00
Hylke Bons 119df4f0eb windows: some more Dispatcher.Invoke replacments 2012-07-03 10:13:40 +02:00
Matthias Dittrich 92cd4171e7 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-03 10:09:29 +02:00
Hylke Bons aa87519cc6 lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons 99f0889d18 Revert previous commit 2012-07-03 09:59:19 +02:00
Hylke Bons 68d70ba080 Fix README table 2012-07-03 09:59:19 +02:00
Hylke Bons 08649a9aae repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons 34376dacf8 repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons cf84864911 repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons e439d53a7b repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons 1c8cffd178 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00