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

688 commits

Author SHA1 Message Date
Hylke Bons 602ffa2280 Allow ports to be specified once again. Fixes #555 2012-01-23 23:50:54 +00:00
serras d1b21a2c6a Specify icon for SparkleShare executable 
Remove dependency on SmartIrc lib
Fix bug with Icon.resx file
 2012-01-22 19:44:30 +01:00
serras d9c072669a Merge branch 'master' into gettext-cs 2012-01-22 19:19:19 +01:00
Hylke Bons c5bbd382a8 git: remove unneeded reference 2012-01-22 17:29:14 +00:00
Hylke Bons 43f2129236 mac: set the --exec-path when calling the bundled git 2012-01-22 17:17:36 +00:00
serras bd43afc13c Make it compile again in Windows 2012-01-19 20:21:48 +01:00
serras 69c5c1dfde Merge branch 'master' into gettext-cs 2012-01-19 20:04:49 +01:00
Hylke Bons 2a98aec8c7 repo: Cache folder sizes and update them after a sync. Closes #535 2012-01-18 23:21:09 +00:00
Hylke Bons f6847263fb repo: Add Initialize method for lengthy ctor operations 2012-01-18 16:59:44 +00:00
Hylke Bons 02b7565568 config: remove more DebugInfo calls 2012-01-18 13:33:31 +00:00
Hylke Bons 6c3ef62577 config: don't write any debug output, as DebugInfo method requires a working config 2012-01-18 13:03:23 +00:00
Hylke Bons ecb19db9b7 fetcher git: Add some memory limiting settings to the config. Closes #519 2012-01-18 01:50:47 +00:00
Hylke Bons e367614390 git: Only parse the first 250 files per commit, prevents huge resource consumption. Fixes #500 2012-01-18 00:44:15 +00:00
Hylke Bons e50cbc69bb git config: Add a tab before options 2012-01-17 01:08:26 +00:00
Hylke Bons f6637233be git put SparkleGit class in its own file 2012-01-16 20:23:12 +00:00
Hylke Bons f9a5e6911a git: Don't turn git repos into submodules, add only the checkout, not the database. Closes #335 2012-01-16 19:58:25 +00:00
Hylke Bons 669d1d9f5a fetcher git: ignore Mercurial and Bazaar databases 2012-01-16 19:57:11 +00:00
Hylke Bons 16280826f5 repo: Move progress interval logic to base class 2012-01-15 23:45:17 +00:00
serras 6148cfc8b2 Merge branch 'master' into gettext-cs 2012-01-14 11:21:53 +01:00
Hylke Bons a58342a798 fetcher git: make url parsing more readable by using the Uri object 2012-01-13 23:47:19 +00:00
Hylke Bons 4c7ef791fe helpers: only allow one thread to write to the log at a time. Fixes some crashes 2012-01-13 23:46:32 +00:00
Hylke Bons 807dd55d90 fetcher git: Cleanup 2012-01-13 20:18:16 +00:00
Hylke Bons bbe097cdf4 config: Revert adding Identityfile to SSH config for Arch Linux 2012-01-13 18:07:41 +00:00
Hylke Bons a908fde11e git: Resolve the ?? 'conflict' by adding. Fixes #509 2012-01-12 01:01:24 +00:00
Hylke Bons b861549759 Fix compile error 2012-01-12 00:58:19 +00:00
Hylke Bons 96ce71e7be repo: Make the SparkleShare.txt more fun and helpful 2012-01-12 00:22:15 +00:00
Hylke Bons c3f0995d8c Fix compile error 2012-01-12 00:21:34 +00:00
Eric Wong 0ba293b706 Allow home path to be specified 2012-01-11 23:43:26 +00:00
Hylke Bons 9129c65805 Write debug output to a log file. Closes #515 2012-01-11 23:02:22 +00:00
Hylke Bons aa5aae1922 git: Don't compress already compressed file formats 2012-01-11 22:15:13 +00:00
serras 1dd3bdeaf9 Use layout in setup windows 2012-01-09 18:36:24 +01:00
serras d91220f04e Make it compile with Sparkleshare 0.6 and create .msi file correctly 2012-01-08 22:31:14 +01:00
serras b98c4ee5fb 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 db1dbf8178 config: don't change SSH config when email is unknown. Fixes #499 2012-01-01 14:58:53 +01:00
Hylke Bons 84e3fff6df repo: Also report progress on fetch 2011-12-30 15:00:15 +01:00
Hylke Bons eb65f5e125 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 aaf540a3ff Don't exclude all dotfiles, Fixes #495 2011-12-29 12:44:18 +01:00
wimh 4d7eb48ed7 fix potential crash at shutdown 2011-12-28 01:03:27 +01:00
Hylke Bons 85d78a3a80 fetcher: fix permissions on ssh config file 2011-12-25 20:33:39 +01:00
Hylke Bons 883e0acc1c Fix warning 2011-12-25 20:32:39 +01:00
Hylke Bons 3c4bb135fb fetcher: uncomment code to set permissions on SSH config file 2011-12-25 19:02:14 +01:00
Hylke Bons 2b71c01f09 fetcher git: Fix race condition when stopping a clone 2011-12-24 19:17:54 +01:00
Hylke Bons fa1f52ad68 fetcher git: set the working dir to the tmp path. Fixes #488 2011-12-24 18:04:43 +01:00
Hylke Bons 4af4acaf37 config: don't add identity to .ssh/config twice 2011-12-20 17:47:39 +01:00
Hylke Bons 53db52610f 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 89c75c0746 event log: report size and history size. Closes #379 2011-12-15 16:15:29 +01:00
Hylke Bons 2ab22886af controller: lock when writing avatars. Fixes #476 2011-12-11 21:00:51 +01:00
Hylke Bons b901975920 config: explicitly point to the sparkleshare private key in ssh config. Closes #396 2011-12-11 20:45:18 +01:00
wimh 5d9071b3fc avoid empty lines being added to .ssh/config file 2011-12-11 15:53:05 +01:00
wimh a4496cbae2 avoid empty lines being added to .ssh/config file 2011-12-10 22:07:55 +01:00
Hylke Bons c01c8525ef repo: Improve handling of offline repos. Fixes #439 2011-12-03 12:40:55 +01:00
Hylke Bons d83df10953 git: strip .empty from file paths in commit messages 2011-12-03 12:40:55 +01:00
Hylke Bons 6cb6eebca4 fetcher git: always create folder for ignore file first. Fixes #460 2011-12-01 19:41:49 +01:00
Hylke Bons 1856a9e922 repo git: also check for number of dirs before creating .empty file 2011-11-30 15:04:56 +01:00
Hylke Bons e4317fc412 setup: Show a warning when the user has a global gitignore. Closes #432 2011-11-28 14:40:34 +01:00
Hylke Bons 48486b3c77 remove more smartirc references 2011-11-19 14:24:09 +00:00
Hylke Bons 95e4eae30a remove smartirc and related code. Closes #435 2011-11-18 21:40:42 +00:00
Hylke Bons 2fedaa375c Move SparkleOptions from lib to UI. Remove mercurial code. 2011-11-18 21:16:57 +00:00
Hylke Bons ad66966008 Move FormatMessage to bubbles controller 2011-11-18 20:53:53 +00:00
wimh a3899d6b1f Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 74afc7a8d3 listener: point to a DNS record instead of an IP address 2011-11-13 22:03:13 +00:00
Hylke Bons 72a5ef1dad repo: put a lock on toggling the watcher. Should fix #358 2011-11-13 18:04:13 +00:00
Hylke Bons de7971e214 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 92e698ec40 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
Hylke Bons acd149df21 repo: When listening, make poll interval long for every repo 2011-11-13 00:27:25 +00:00
Hylke Bons a785c78522 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 b5ac68735c config: skip badly formatted uris. Fixes #410 2011-11-12 01:54:08 +00:00
Hylke Bons 3a47ec752c Update README to build on OSX. Closes #383 2011-11-11 22:01:51 +00:00
Hylke Bons 93c777f195 config: Fix error 2011-11-07 18:35:00 +00:00
Hylke Bons 6d0b37a46a config: use File.WriteAllText to write initial config 2011-11-07 18:03:19 +00:00
Travis Glenn Hansen 44ff41976c bit more sync/listener logic 2011-11-07 08:39:33 -07:00
Hylke Bons edf64d1181 Fix build. Closes #403 2011-11-06 14:37:56 +00:00
Travis Glenn Hansen a4fa7988af making announcements more robust and intelligent 2011-11-05 15:09:09 -06:00
wimh a8b66ba545 fix compiler errors caused by merge 2011-11-04 22:44:39 +01:00
Travis Glenn Hansen 466d6a5359 Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-04 14:55:16 -06:00
wimh 36d562ab2c Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons c37435db52 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 9098a98cfb Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-03 18:21:48 -06:00
Hylke Bons f922ccf7fb repo: add better check for duplicate messages 2011-11-04 00:05:25 +00:00
Hylke Bons cd4a97ee7c Fix compile error. Closes #402 2011-11-03 23:28:25 +00:00
Travis Glenn Hansen 554b9b4c16 attempting to prevent the same announcement from being processed twice 2011-11-03 17:15:59 -06:00
Hylke Bons 3124b2e950 listener: don't add duplicate messages to queue. attempt #2 2011-11-03 16:54:01 +00:00
Hylke Bons 2059fbb579 listener: don't add duplicate messages to queue 2011-11-03 16:22:12 +00:00
Hylke Bons 1c801b1e94 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
Hylke Bons 4473e7e9c7 config: fix error 2011-10-29 15:47:14 +01:00
Hylke Bons ef70861533 config: catch FileNotFoundException and create config 2011-10-29 14:27:53 +01:00
wimh da5e79f217 Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	SparkleLib/SparkleHelpers.cs
 2011-10-27 19:12:04 +02:00
wimh 608ad96155 Revert "refs #18 fix handling of allow_passwordless_join setting" 
This reverts commit 475c4b479e.
 2011-10-27 19:07:43 +02:00
PierreAronnax 0c445111de 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 7c958c98bd 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 3996d84f3a 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 5c68b3242b 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 c9d5c2c8c2 git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons a7c130295f git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons db7025a420 Fix compile error. Closes #375 2011-10-24 16:44:42 +01:00
Hylke Bons e650148149 Add helper method DiffPaths 2011-10-23 13:48:13 +01:00
Hylke Bons a0c613e0d5 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
Hylke Bons 09aa8e2d56 irc listener: fix bugs in channel password feature 2011-10-22 15:02:22 +01:00
wimh 475c4b479e refs #18 fix handling of allow_passwordless_join setting 2011-10-21 22:08:30 +02:00
wimh 9202ed1117 Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00
wimh 1bbc3fb396 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons c1723899ea Fix compile error and fix some style changes for merge request 368# 2011-10-17 19:54:41 +02:00
Hylke Bons 4785daf702 Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass 2011-10-17 19:43:05 +02:00
Hylke Bons 3fd59b76fe git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons 4268c12dcb git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
Nícolas Lazarte Kaqui 91d457332b accepting the suggestions made ​​by hbons 2011-10-16 16:46:37 -02:00
wimh 89ecfe2d20 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 a88aea266e included setting to allow or disallow access to key channels without 2011-10-11 12:11:12 -03:00
Hylke Bons 9f936503c2 Merge branch 'master' of https://github.com/funkey/SparkleShare 2011-10-05 23:26:06 +02:00
Jan Funke ebedce52e6 tcp-listener: fallback to polling instead of crashing on socket errors 2011-10-03 14:39:26 +02:00
wimh 1fcee3a69a Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00
wimh 5aece32778 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 636efe9011 Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
Hylke Bons d7adcf6d1f new Add Project dialog, powered by plugins 2011-10-01 23:16:25 +02:00
Jan Funke 9d97902e63 do not attempt to change file attributes of symlinks 2011-10-01 20:08:05 +02:00
Hylke Bons 58926c4715 git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +02:00
Hylke Bons 04ac66ab78 listener: default to the plain TCP protocol 2011-09-25 22:52:03 +02:00
Hylke Bons c708fb4e90 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 54302d8d8f git: filling empty dirs: don't bother removing the .empty 2011-09-22 20:11:08 +01:00
Hylke Bons 7b81c37691 Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare 2011-09-22 13:05:14 +01:00
Hylke Bons a7a65a4fde config: catch IOException, FileException does not exist 2011-09-22 12:55:35 +01:00
Nícolas Lazarte Kaqui 8a7a71004b When not set the key user try to join no key 2011-09-20 15:11:38 -03:00
Hylke Bons 7a914a1d83 config: create initial config when exception happens 2011-09-20 19:09:43 +01:00
Nícolas Lazarte Kaqui 7a250888ce Fixing wrong commit 2011-09-20 13:20:05 -03:00
Nícolas Lazarte Kaqui bedab0f4aa Use password to access channel on IRC 2011-09-20 09:13:42 -03:00
Hylke Bons f2e3776be2 Close some streams immediately. Remove broken scp backend 2011-09-15 00:58:19 +02:00
Beau Gunderson 1e9d6b752c 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 068f1dd26c Fix memory leak 2011-09-14 20:18:15 +02:00
Hylke Bons 2f492c00f8 Remove .empty files when they are no longer needed 2011-09-14 20:12:56 +02:00
Hylke Bons 1c404cc82d 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 ec42dce430 git log: trim .empty off folder paths 2011-09-14 17:57:40 +02:00
Hylke Bons 360dc1ab40 setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Hylke Bons 325744e655 Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 18:05:10 +03:00
Hylke Bons b6c8c3869a Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 17:13:41 +03:00
Mirco Bauer fd7be0a314 Added http_proxy support to SparkleListenerIrc 2011-09-12 15:59:17 +02:00
Hylke Bons 7c9c64a095 Fix ignore Firefox and Chromium temp download files 2011-09-11 23:58:19 +02:00
Hylke Bons c1b684dc2a Ignore Firefox and Chromium temp download files 2011-09-11 23:47:36 +02:00
Hylke Bons 19645f2182 fetcher git: default protocol is ssh:// 2011-09-11 22:15:23 +02:00
Mirco Bauer 5f31d5f43d 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 70d8b35cd9 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 10cde04af4 Added support for Hg Backend 2011-09-08 15:52:56 +02:00
Thomas Vollstädt 989e647ead Merge remote-tracking branch 'upstream/master' into issue10 2011-09-08 15:40:17 +02:00
Thomas Vollstädt 3de082085b RegEx not needed anymore 2011-09-05 17:40:53 +02:00
Thomas Vollstädt 76f4a70f1f Fixed code intendation 2011-09-05 17:39:20 +02:00
Thomas Vollstädt fb03cd0940 Implemented Exclusion Rule methods for handling non-readable files. See issue #10 2011-09-05 17:36:03 +02:00
Thomas Vollstädt c80376a4b9 Check readabilty only for existing files; Remove Exclusions when file is readable again 2011-09-05 17:34:07 +02:00
Thomas Vollstädt feaef086f3 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 23e59615c9 Added a new helper function for getting a relative-to-repostory path 2011-09-05 03:02:15 +02:00
wimh d66656da08 Add ~* to ignored files 
Fix crash when a conflict has been resolved already
 2011-09-03 23:38:53 +02:00
wimh 79e96b3bf0 default path to git 
avoid it stays null when not found in paths[]
 2011-09-03 22:11:49 +02:00