Commit graph

2193 commits

Author SHA1 Message Date
wimh ac53979104 refactor killing ssh-agent 2011-11-04 23:43:29 +01:00
wimh d4f01aa590 Merge commit 'd4c708bdc60a631ece071ab11ed59c10207b31aa' into windows
Conflicts:
	SparkleShare/SparkleControllerBase.cs
2011-11-04 23:05:45 +01:00
wimh 9607a3801d fix compiler errors caused by merge 2011-11-04 22:44:39 +01:00
wimh 7d226076a3 Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons 73d5619615 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
Hylke Bons 25877948ad repo: add better check for duplicate messages 2011-11-04 00:05:25 +00:00
Hylke Bons 26df391130 Fix compile error. Closes #402 2011-11-03 23:28:25 +00:00
Hylke Bons 439d26f803 listener: don't add duplicate messages to queue. attempt #2 2011-11-03 16:54:01 +00:00
Hylke Bons 1696712c21 listener: don't add duplicate messages to queue 2011-11-03 16:22:12 +00:00
Konstantinos Vaggelakos 639a777bfe Added exceptionhandling for the ssh-agent killing 2011-11-02 21:48:43 +01:00
Hylke Bons c56f8ff20f bubbles: get avatar if it doesn't exist yet 2011-11-02 20:47:43 +00:00
Hylke Bons dcb63fad1b bubbles: set summary and body texts 2011-11-02 19:50:05 +00:00
Hylke Bons b8646a8423 mac statusicon: preload all images in memory so we don't get exceptions trying to find them 2011-11-01 02:14:26 +00:00
Hylke Bons 46d8eecb51 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
Łukasz Jernaś 2f7227e799 Update translations from Transifex
Only sync with updated pot file.
2011-10-30 15:52:47 +01:00
Hylke Bons a0e2c14f1c setup: Make terminology consistent on Mac too 2011-10-30 14:48:20 +00:00
Łukasz Jernaś 41ca908c34 Synchronize string wording between tutorial and status icon 2011-10-30 15:09:33 +01:00
freefd b1c1e9210d Update Russian translation 2011-10-30 14:33:11 +01:00
mmans d9ccea5c8b update Dutch translation 2011-10-30 14:32:37 +01:00
syunji 57549f66c5 Update Japanese translation 2011-10-30 14:31:57 +01:00
Håkan Sahlström 4a966df119 Update Swedish translation 2011-10-30 14:30:48 +01:00
Thomas Menga 9c6622709a Update French translation 2011-10-30 14:21:43 +01:00
Francisco Javier Melendo Román ea835fc2fa Update Spanish (Castilian) translation 2011-10-30 14:21:07 +01:00
Petr Tvarůžek 3a7660d349 Update Czech translation 2011-10-30 14:20:01 +01:00
Łukasz Jernaś e83277014f Update translations from Transifex 2011-10-30 14:18:49 +01:00
Matej Moško e186aea21e Add Slovak translation 2011-10-30 14:09:40 +01:00
Konstantinos Vaggelakos ce2f8b99f5 Adjusted the code regarding to wimh's comment. Now the SSH_AGENT is killed on application exit 2011-10-29 19:26:42 +02:00
Konstantinos Vaggelakos 3658bbb3aa Merged with upstream 2011-10-29 17:42:29 +02:00
Hylke Bons 92fe955910 config: fix error 2011-10-29 15:47:14 +01:00
Hylke Bons 337194538d config: catch FileNotFoundException and create config 2011-10-29 14:27:53 +01:00
Hylke Bons 14be68fef8 Check whether avatar image path exists before passing it to Bubbles class. Fixes #388 #377 2011-10-29 14:17:31 +01:00
Hylke Bons 0dba4745d3 Add some SSH access limiting options to the generated public keys. Closes #392. 2011-10-29 14:07:50 +01:00
wimh 61bd9af894 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	SparkleLib/SparkleHelpers.cs
2011-10-27 19:12:04 +02:00
wimh a10dc3b3fb Revert "refs #18 fix handling of allow_passwordless_join setting"
This reverts commit 475c4b479e.
2011-10-27 19:07:43 +02:00
wimh b1d460cd40 Merge remote-tracking branch 'PierreAronnax/windows' into windows 2011-10-27 19:07:35 +02:00
wimh 0e6bf3bb08 Merge remote-tracking branch 'PierreAronnax/patch-2' into windows 2011-10-27 18:55:05 +02:00
PierreAronnax a6deb99720 OpenSparkleShareFolder support for <folders_path>
Fixing https://github.com/wimh/SparkleShare/issues/16
2011-10-26 19:45:46 +03:00
PierreAronnax 1b0e504a0e OpenSparkleShareFolder support for <folders_path>
Fixing https://github.com/wimh/SparkleShare/issues/16
2011-10-26 18:43:07 +02:00
Hylke Bons d73a89c553 Merge pull request #382 from PierreAronnax/patch-1
SparkleListenerBase: Fixing delivering of queued messages.
2011-10-25 11:28:56 -07:00
PierreAronnax 6017e86665 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
Hylke Bons 6c8c8bf2bd Update README 2011-10-25 20:21:33 +02:00
PierreAronnax 9204fef03d 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
Hylke Bons 3cf38597a6 Merge pull request #378 from PierreAronnax/patch-1
SparkleListenerTCP: Fixing Reconnect
2011-10-25 09:38:44 -07:00
PierreAronnax 15a827acd6 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
Hylke Bons 0ff7560e16 Remove missing file from makefile 2011-10-25 17:06:10 +01:00
PierreAronnax d97e8a8826 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 80cf3cf26a git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons a018a6181b git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons 2fba6f4bb7 Fix compile error. Closes #375 2011-10-24 16:44:42 +01:00
Hylke Bons b2f02ae8fe Update README 2011-10-24 12:26:49 +02:00