0ct0pu5/SparkleShare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4104 commits 31 branches 6 tags 52 MiB
Commit graph

1064 commits

Author SHA1 Message Date
Travis Glenn Hansen
9e2cfe105a Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-04 14:55:16 -06:00
wimh
d0efe9c37e Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons
1c83e0a252 repo: cover case where we're in a poll triggered syncdown and a message comes in half way through 2011-11-04 16:24:50 +00:00
Travis Glenn Hansen
8ddff16569 Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-03 18:21:48 -06:00
Hylke Bons
2db42953af repo: add better check for duplicate messages 2011-11-04 00:05:25 +00:00
Hylke Bons
38f1b782f2 Fix compile error. Closes #402 2011-11-03 23:28:25 +00:00
Travis Glenn Hansen
904d7e21f1 attempting to prevent the same announcement from being processed twice 2011-11-03 17:15:59 -06:00
Hylke Bons
667f3fe6c9 listener: don't add duplicate messages to queue. attempt #2 2011-11-03 16:54:01 +00:00
Hylke Bons
06d4ceafb2 listener: don't add duplicate messages to queue 2011-11-03 16:22:12 +00:00
Hylke Bons
fff08b45a7 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
Hylke Bons
d170a76e44 config: fix error 2011-10-29 15:47:14 +01:00
Hylke Bons
6d78349b91 config: catch FileNotFoundException and create config 2011-10-29 14:27:53 +01:00
wimh
1136d383bb Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	SparkleLib/SparkleHelpers.cs
 2011-10-27 19:12:04 +02:00
wimh
e4c8145af5 Revert "refs #18 fix handling of allow_passwordless_join setting" 
This reverts commit 475c4b479e.
 2011-10-27 19:07:43 +02:00
PierreAronnax
49c6722ac1 SparkleListenerBase: Fixing delivering of queued messages. 
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
 2011-10-25 21:24:30 +03:00
PierreAronnax
ab72860f13 SparkleListenerBase: Fixing delivering of queued messages. 
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
 2011-10-25 20:16:20 +02:00
PierreAronnax
1ebea8a7a2 SparkleListenerTCP: Fixing Reconnect 
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
 2011-10-25 19:16:29 +03:00
PierreAronnax
b00a33f6aa SparkleListenerTCP: Fixing Reconnect 
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
 2011-10-25 17:28:32 +02:00
Hylke Bons
d4aef615e4 git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons
641c1746be git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons
ae522207b9 Fix compile error. Closes #375 2011-10-24 16:44:42 +01:00
Hylke Bons
042af95c2c Add helper method DiffPaths 2011-10-23 13:48:13 +01:00
Hylke Bons
d115792633 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
Hylke Bons
f8176d2f56 irc listener: fix bugs in channel password feature 2011-10-22 15:02:22 +01:00
wimh
32d5da825f refs #18 fix handling of allow_passwordless_join setting 2011-10-21 22:08:30 +02:00
wimh
f982fc95aa Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00
wimh
ad08902e14 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons
778f7d74f3 Fix compile error and fix some style changes for merge request 368# 2011-10-17 19:54:41 +02:00
Hylke Bons
a874a50bcb Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass 2011-10-17 19:43:05 +02:00
Hylke Bons
3f775fc524 git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons
71fd6fc70b git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
Nícolas Lazarte Kaqui
f175ce3d68 accepting the suggestions made ​​by hbons 2011-10-16 16:46:37 -02:00
wimh
1cdfefb93f Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	.gitignore
	SparkleShare/SparkleStatusIcon.cs
 2011-10-15 20:31:20 +02:00
Nícolas Lazarte Kaqui
506ba0ef28 included setting to allow or disallow access to key channels without 2011-10-11 12:11:12 -03:00
Hylke Bons
c016b727a7 Merge branch 'master' of https://github.com/funkey/SparkleShare 2011-10-05 23:26:06 +02:00
Jan Funke
67d807d059 tcp-listener: fallback to polling instead of crashing on socket errors 2011-10-03 14:39:26 +02:00
wimh
744a00dc5a Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00
wimh
fe8e10d6ef Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/Program.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleExtensions.cs
	SparkleShare/SparkleLinController.cs
	SparkleShare/SparkleStatusIcon.cs
	SparkleShare/SparkleUI.cs
 2011-10-02 01:57:14 +02:00
wimh
22595a4464 Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
Hylke Bons
213a0e1fff new Add Project dialog, powered by plugins 2011-10-01 23:16:25 +02:00
Jan Funke
4b79612b8c do not attempt to change file attributes of symlinks 2011-10-01 20:08:05 +02:00
Hylke Bons
5146b9dbc6 git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +02:00
Hylke Bons
792520015f listener: default to the plain TCP protocol 2011-09-25 22:52:03 +02:00
Hylke Bons
de569caf47 Remove OS detection code, rely on an abstract base controller with similarly named custom controller subclasses for each OS instead. 2011-09-25 22:52:03 +02:00
Hylke Bons
6f7437d56a git: filling empty dirs: don't bother removing the .empty 2011-09-22 20:11:08 +01:00
Hylke Bons
f0025d6256 Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare 2011-09-22 13:05:14 +01:00
Hylke Bons
5f2cdf2502 config: catch IOException, FileException does not exist 2011-09-22 12:55:35 +01:00
Nícolas Lazarte Kaqui
de52e31500 When not set the key user try to join no key 2011-09-20 15:11:38 -03:00
Hylke Bons
95a94a79b4 config: create initial config when exception happens 2011-09-20 19:09:43 +01:00
Nícolas Lazarte Kaqui
4b375651b7 Fixing wrong commit 2011-09-20 13:20:05 -03:00