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

665 commits

Author SHA1 Message Date
Hylke Bons ab2ee404b5 git: Resolve the ?? 'conflict' by adding. Fixes #509 2012-01-12 01:01:24 +00:00
Hylke Bons 916cd0fa3d Fix compile error 2012-01-12 00:58:19 +00:00
Hylke Bons 93ef996afb repo: Make the SparkleShare.txt more fun and helpful 2012-01-12 00:22:15 +00:00
Hylke Bons d36ef5ee48 Fix compile error 2012-01-12 00:21:34 +00:00
Eric Wong b0457580b5 Allow home path to be specified 2012-01-11 23:43:26 +00:00
Hylke Bons 98746b26c7 Write debug output to a log file. Closes #515 2012-01-11 23:02:22 +00:00
Hylke Bons 63497bbed3 git: Don't compress already compressed file formats 2012-01-11 22:15:13 +00:00
serras 78a0b5ce34 Use layout in setup windows 2012-01-09 18:36:24 +01:00
serras 0dd7605834 Make it compile with Sparkleshare 0.6 and create .msi file correctly 2012-01-08 22:31:14 +01:00
serras f4c4a94000 Merge remote-tracking branch 'hbons/master' into gettext-cs 
Conflicts:
	.gitignore
	.gitmodules
	SparkleLib/Git/SparkleFetcherGit.cs
	SparkleLib/Hg/SparkleRepoHg.cs
	SparkleLib/SparkleConfig.cs
	SparkleLib/SparkleFetcherBase.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/SparkleBubblesController.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleStatusIcon.cs
 2012-01-07 14:13:36 +01:00
Hylke Bons 5665ea831e config: don't change SSH config when email is unknown. Fixes #499 2012-01-01 14:58:53 +01:00
Hylke Bons 394cd39b57 repo: Also report progress on fetch 2011-12-30 15:00:15 +01:00
Hylke Bons f30e534bfb statusicon: add sync progress stats (one repo at a time only for now). Closes #222 2011-12-30 01:44:41 +01:00
Hylke Bons 317c7842a7 Don't exclude all dotfiles, Fixes #495 2011-12-29 12:44:18 +01:00
wimh b8667b7b8b fix potential crash at shutdown 2011-12-28 01:03:27 +01:00
Hylke Bons 45655d4395 fetcher: fix permissions on ssh config file 2011-12-25 20:33:39 +01:00
Hylke Bons b84b6ba499 Fix warning 2011-12-25 20:32:39 +01:00
Hylke Bons b391fd0a44 fetcher: uncomment code to set permissions on SSH config file 2011-12-25 19:02:14 +01:00
Hylke Bons 88700a83d6 fetcher git: Fix race condition when stopping a clone 2011-12-24 19:17:54 +01:00
Hylke Bons f1605a566f fetcher git: set the working dir to the tmp path. Fixes #488 2011-12-24 18:04:43 +01:00
Hylke Bons e9048d5180 config: don't add identity to .ssh/config twice 2011-12-20 17:47:39 +01:00
Hylke Bons c235248078 Use folders_path config option to create the tmo dir when it is set. Fixes #485 2011-12-18 17:10:06 +01:00
Hylke Bons a4d1e5d120 event log: report size and history size. Closes #379 2011-12-15 16:15:29 +01:00
Hylke Bons 3f70f08084 controller: lock when writing avatars. Fixes #476 2011-12-11 21:00:51 +01:00
Hylke Bons 20c6ac32d0 config: explicitly point to the sparkleshare private key in ssh config. Closes #396 2011-12-11 20:45:18 +01:00
wimh bb1d277cb0 avoid empty lines being added to .ssh/config file 2011-12-11 15:53:05 +01:00
wimh 613fa43f0d avoid empty lines being added to .ssh/config file 2011-12-10 22:07:55 +01:00
Hylke Bons 9a3e34381c repo: Improve handling of offline repos. Fixes #439 2011-12-03 12:40:55 +01:00
Hylke Bons 6540b19ae2 git: strip .empty from file paths in commit messages 2011-12-03 12:40:55 +01:00
Hylke Bons 23fed0359f fetcher git: always create folder for ignore file first. Fixes #460 2011-12-01 19:41:49 +01:00
Hylke Bons 6ad39da458 repo git: also check for number of dirs before creating .empty file 2011-11-30 15:04:56 +01:00
Hylke Bons 5030933abf setup: Show a warning when the user has a global gitignore. Closes #432 2011-11-28 14:40:34 +01:00
Hylke Bons 0c5b1ebae2 remove more smartirc references 2011-11-19 14:24:09 +00:00
Hylke Bons bc25f25bbb remove smartirc and related code. Closes #435 2011-11-18 21:40:42 +00:00
Hylke Bons c1a3d1ff2c Move SparkleOptions from lib to UI. Remove mercurial code. 2011-11-18 21:16:57 +00:00
Hylke Bons 444082f396 Move FormatMessage to bubbles controller 2011-11-18 20:53:53 +00:00
wimh 2fa6c72fd8 Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 8d315b7fa9 listener: point to a DNS record instead of an IP address 2011-11-13 22:03:13 +00:00
Hylke Bons 7e18e6d3cb repo: put a lock on toggling the watcher. Should fix #358 2011-11-13 18:04:13 +00:00
Hylke Bons be14c48ae9 repo base: Start initial remote check in a new thread. Prevents blocking an fixes #321 2011-11-13 00:57:00 +00:00
Hylke Bons 07b727bb72 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
Hylke Bons 1100fa205b repo: When listening, make poll interval long for every repo 2011-11-13 00:27:25 +00:00
Hylke Bons 17c8433f9a Merge branch 'enhancements' of https://github.com/travisghansen/SparkleShare into thansen 
Conflicts:
	SparkleLib/SparkleListenerBase.cs
	SparkleLib/SparkleRepoBase.cs
 2011-11-12 17:47:39 +00:00
Hylke Bons 76a24f9af3 config: skip badly formatted uris. Fixes #410 2011-11-12 01:54:08 +00:00
Hylke Bons 11609bccf2 Update README to build on OSX. Closes #383 2011-11-11 22:01:51 +00:00
Hylke Bons 05dd261789 config: Fix error 2011-11-07 18:35:00 +00:00
Hylke Bons b29c60bf14 config: use File.WriteAllText to write initial config 2011-11-07 18:03:19 +00:00
Travis Glenn Hansen 448e39924d bit more sync/listener logic 2011-11-07 08:39:33 -07:00
Hylke Bons 9855c1b154 Fix build. Closes #403 2011-11-06 14:37:56 +00:00
Travis Glenn Hansen 3d4a8b5f9d making announcements more robust and intelligent 2011-11-05 15:09:09 -06:00
wimh 9607a3801d fix compiler errors caused by merge 2011-11-04 22:44:39 +01:00
Travis Glenn Hansen 9ead45dc1c Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-04 14:55:16 -06: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
Travis Glenn Hansen 74fc03f354 Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-03 18:21:48 -06: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
Travis Glenn Hansen d0a4d126fc attempting to prevent the same announcement from being processed twice 2011-11-03 17:15:59 -06: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
Hylke Bons 46d8eecb51 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00: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
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
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
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
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
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 6d1d58ff9a Add helper method DiffPaths 2011-10-23 13:48:13 +01:00
Hylke Bons 877aff9548 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
Hylke Bons fff5c8c2b2 irc listener: fix bugs in channel password feature 2011-10-22 15:02:22 +01:00
wimh f75ce66443 refs #18 fix handling of allow_passwordless_join setting 2011-10-21 22:08:30 +02:00
wimh ef28cb4a14 Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00
wimh 0453083424 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons 363209cd15 Fix compile error and fix some style changes for merge request 368# 2011-10-17 19:54:41 +02:00
Hylke Bons 59d4a7367f Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass 2011-10-17 19:43:05 +02:00
Hylke Bons 39ec42d167 git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons 537218b46e git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
Nícolas Lazarte Kaqui a3426e5ca5 accepting the suggestions made ​​by hbons 2011-10-16 16:46:37 -02:00
wimh 75eb8c7f32 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 9a1a7f4626 included setting to allow or disallow access to key channels without 2011-10-11 12:11:12 -03:00
Hylke Bons 4021ef40c5 Merge branch 'master' of https://github.com/funkey/SparkleShare 2011-10-05 23:26:06 +02:00
Jan Funke 73d11e0f9d tcp-listener: fallback to polling instead of crashing on socket errors 2011-10-03 14:39:26 +02:00
wimh 86c84e4120 Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00
wimh cad52d7072 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 9f729e5e3e Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
Hylke Bons 5a9b7d4ba6 new Add Project dialog, powered by plugins 2011-10-01 23:16:25 +02:00
Jan Funke 1a91c6d9c2 do not attempt to change file attributes of symlinks 2011-10-01 20:08:05 +02:00
Hylke Bons e7c83ca06b git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +02:00
Hylke Bons 2a0ef501a2 listener: default to the plain TCP protocol 2011-09-25 22:52:03 +02:00
Hylke Bons d661c184e2 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 62b0bc2524 git: filling empty dirs: don't bother removing the .empty 2011-09-22 20:11:08 +01:00
Hylke Bons 0bdaa01099 Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare 2011-09-22 13:05:14 +01:00
Hylke Bons 87e6fc56a0 config: catch IOException, FileException does not exist 2011-09-22 12:55:35 +01:00
Nícolas Lazarte Kaqui c869a07bd6 When not set the key user try to join no key 2011-09-20 15:11:38 -03:00
Hylke Bons 8ba23a6d11 config: create initial config when exception happens 2011-09-20 19:09:43 +01:00
Nícolas Lazarte Kaqui 876c331d84 Fixing wrong commit 2011-09-20 13:20:05 -03:00
Nícolas Lazarte Kaqui 920a58fbb3 Use password to access channel on IRC 2011-09-20 09:13:42 -03:00
Hylke Bons 1479662538 Close some streams immediately. Remove broken scp backend 2011-09-15 00:58:19 +02:00
Beau Gunderson 9ee12f31ad Added the GIT_SSH environment variable and set it to "ssh" so that git will use ssh-agent; fixed a bug where SparkleShare creates an exclude file within the "info" directory without checking if the "info" directory exists. 2011-09-14 12:19:53 -07:00
Hylke Bons cc17d00d00 Fix memory leak 2011-09-14 20:18:15 +02:00
Hylke Bons bcc12f4a1c Remove .empty files when they are no longer needed 2011-09-14 20:12:56 +02:00
Hylke Bons d0244e0da6 Allow empty folders to be added by putting a hidden file in each of them before committing 2011-09-14 19:30:17 +02:00
Hylke Bons ac3abe5b8c git log: trim .empty off folder paths 2011-09-14 17:57:40 +02:00
Hylke Bons 9144a6f52b setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Hylke Bons e675f27f7a Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 18:05:10 +03:00
Hylke Bons 497a323a0f Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 17:13:41 +03:00
Mirco Bauer c9d158a26c Added http_proxy support to SparkleListenerIrc 2011-09-12 15:59:17 +02:00
Hylke Bons d29aea417d Fix ignore Firefox and Chromium temp download files 2011-09-11 23:58:19 +02:00
Hylke Bons 7d5185a49b Ignore Firefox and Chromium temp download files 2011-09-11 23:47:36 +02:00
Hylke Bons d129b215c0 fetcher git: default protocol is ssh:// 2011-09-11 22:15:23 +02:00
Mirco Bauer 9739debd02 Enhance user's privacy of the IRC channels 
Set the channel mode to +s so other users cannot "spy" watched channels using
the WHOIS or LIST IRC command.
 2011-09-11 20:29:25 +02:00
Mirco Bauer ffbb5bce7b Enhance user's privacy of the IRC connection 
Use the invisible IRC usermode and random username instead of his
real username.
 2011-09-11 20:24:17 +02:00
Thomas Vollstädt 839c3ed835 Added support for Hg Backend 2011-09-08 15:52:56 +02:00
Thomas Vollstädt c74ed37c4e Merge remote-tracking branch 'upstream/master' into issue10 2011-09-08 15:40:17 +02:00
Thomas Vollstädt 48e3beb9c2 RegEx not needed anymore 2011-09-05 17:40:53 +02:00
Thomas Vollstädt c1481d51a0 Fixed code intendation 2011-09-05 17:39:20 +02:00
Thomas Vollstädt 0298e8c795 Implemented Exclusion Rule methods for handling non-readable files. See issue #10 2011-09-05 17:36:03 +02:00
Thomas Vollstädt 73f58892e8 Check readabilty only for existing files; Remove Exclusions when file is readable again 2011-09-05 17:34:07 +02:00
Thomas Vollstädt 85abd6bbb7 Skipping files which are unreadable by sparkleshare and added some methods for git's exclude file manipulation, see #10 2011-09-05 03:28:25 +02:00
Thomas Vollstädt c767dbc302 Added a new helper function for getting a relative-to-repostory path 2011-09-05 03:02:15 +02:00
wimh 04b3b43f88 Add ~* to ignored files 
Fix crash when a conflict has been resolved already
 2011-09-03 23:38:53 +02:00
wimh 3d9d7bb246 default path to git 
avoid it stays null when not found in paths[]
 2011-09-03 22:11:49 +02:00
wimh 6f27b23719 fix crash if file was renamed remote 
see #8 (https://github.com/wimh/SparkleShare/issues/8)
 2011-09-03 22:11:28 +02:00
wimh b6d17da8ef avoid crash if remote folder is deleted by user. 
When all files including the .git folder are removed from a remote folder, but that folder is not removed from the SparkleShare config, SparkleShare crashes at startup, and when showing the log for that folder. This commit should avoid a crash.
 2011-09-03 22:09:55 +02:00
wimh 0a9aaff4b8 fix crash if file was renamed remote 
see #8 (https://github.com/wimh/SparkleShare/issues/8)
 2011-08-28 22:02:01 +02:00
Hylke Bons 77caf67a8d Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-28 21:56:25 +02:00
wimh 51cb04d363 set PlatformTarget from AnyCPU to x86 
CefSharp is win32 only:
https://github.com/chillitom/CefSharp/blob/master/CefSharp/CefSharp.vcproj#L11
 2011-08-28 21:49:04 +02:00
Hylke Bons 8d062a059f Add nicer error reporting 2011-08-27 20:57:34 +02:00
Hylke Bons f3b53db8ab Fix whitespace for last commit 2011-08-27 17:53:17 +02:00
Hylke Bons f3cb3e6e0f setup: Add progress indication when adding a new folder 2011-08-27 17:10:39 +02:00
Hylke Bons 824fd3392b Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-27 02:42:09 +02:00
Hylke Bons 36d7269974 config: fix some whitespace 2011-08-27 01:11:53 +02:00
Hylke Bons 4d42639fcb fetcher git: don't prepend ssh:// when using git:// 2011-08-27 00:49:08 +02:00
Hylke Bons 3a571c7baf Create a new config.xml if it exists but is empty. Throw an error if the format is invalid. Fixes #315 2011-08-26 23:53:04 +02:00
Hylke Bons 79f3473467 Allow initial sync to be cancelled by adding a cancel button. Closes #307 2011-08-26 22:47:46 +02:00
Hylke Bons 57a6d8dbf0 Bring back descriptive commit message. Fixes #317 2011-08-26 21:00:22 +02:00
wimh deafe9c5c4 set PlatformTarget from x86 to AnyCPU 2011-08-13 22:33:48 +02:00
wimh 9ebf8c8f98 add and integrate submodule TextTemplating (TextTransform.exe) in build 2011-08-13 01:33:15 +02:00
wimh 580ec563b9 remove references to gtksharp and mono when compiled under .net 2011-08-07 00:26:23 +02:00
wimh a99e5b0288 convert SparkleSetup to winforms 
fixed some exceptions during debugging
renamed class SparkleShare to Program because of namespace problems (see http://blogs.msdn.com/b/ericlippert/archive/2010/03/09/do-not-name-a-class-the-same-as-its-namespace-part-one.aspx)
 2011-08-06 23:44:37 +02:00
Wizard_85 33826c0735 Resolving Bug with already defined variable 'n' 2011-07-30 20:48:47 +02:00
Hylke Bons bf015d32f0 fetcher: add configuration option to show special characters in the git log. Fixes 288 2011-07-29 23:03:45 +01:00
Hylke Bons b326c85638 setup controller: fix wrong path being created 2011-07-25 02:26:46 +01:00
Hylke Bons dbce0e14e9 Add events to tcp listener 2011-07-24 19:22:17 +01:00
Hylke Bons 5afd3dc59f Refactor config and merge with Paths 2011-07-24 02:00:40 +01:00