Commit graph

3451 commits

Author SHA1 Message Date
Hylke Bons bab9f57aa0 Code cleanup 2012-07-15 15:15:33 +02:00
Hylke Bons 5b59734047 build: Add missing file 2012-07-15 15:12:26 +02:00
Hylke Bons dde10d33da watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons 112ba2aa6e mac: Fix setting of custom folder icon 2012-07-15 12:04:59 +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 87e6397ee2 windows: fix build 2012-07-14 15:53:47 +02:00
Hylke Bons cefdd462ed controller: don't just try/catch everything 2012-07-14 14:37:12 +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 0a24fdcaf5 controller: Use HTTPS to fetch gravatars 2012-07-14 13:24:51 +02:00
Hylke Bons 12d8b274b6 config: fetch_gravatars -> fetch_avatars 2012-07-14 13:23:46 +02:00
Hylke Bons 4a4a87c800 keys: fix build 2012-07-14 13:21:11 +02:00
Hylke Bons 0514d3963f config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons 74f89b1780 keys: return both private and public key when generating 2012-07-14 13:04:07 +02:00
Hylke Bons eaead8c87d Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons 2114a7dd3d controller: Move public key related stuff to its own class 2012-07-13 23:48:28 +02:00
Hylke Bons 90f1c12f3d linux statusicon: Fix statusicon animation. Closes #849 2012-07-13 15:24:06 +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 33ddc1fed5 Merge pull request #842 from matthid/fixbuild_838
Fix for not building #838
2012-07-09 10:46:36 -07:00
Matthias Dittrich 045499d627 Fix for not building #838 2012-07-09 19:00:33 +02:00
Hylke Bons 91b846343b Rename README again... 2012-07-09 17:14:06 +02:00
Hylke Bons ff6b97bd02 Rename README 2012-07-09 17:09:16 +02:00
Hylke Bons 6bd596e846 mac about: Add various links to about dialog 2012-07-09 17:07:32 +02:00
Hylke Bons 8184ad244c Add .txt extensions to info files ofr easy opening 2012-07-09 17:07:05 +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 e20dcd55ea Merge branch 'git-bin'
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2012-07-08 12:51:28 +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 015ad00a25 controller: Fix repo loading 2012-07-08 10:38:14 +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
Hylke Bons 1ca4c9eecd windows: some more Dispatcher.Invoke replacments 2012-07-05 13:37:18 +02:00
Matthias Dittrich f6acb16cd3 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
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 ffaa23a733 listener tcp: Remove lock 2012-07-03 20:27:42 +02:00
Hylke Bons ea1e0ce4e7 windows: some more Dispatcher.Invoke replacments 2012-07-03 10:13:40 +02:00
Matthias Dittrich bf5ae0f689 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-03 10:09:29 +02:00
Hylke Bons 22fcca2fac lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons e1b1075f2d Revert previous commit 2012-07-03 09:59:19 +02:00
Hylke Bons a10851339d Fix README table 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