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

101 commits

Author SHA1 Message Date
wimh a3899d6b1f Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 92e698ec40 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
wimh 36d562ab2c Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01: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
wimh da5e79f217 Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	SparkleLib/SparkleHelpers.cs
 2011-10-27 19:12:04 +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 a0c613e0d5 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01: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 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
wimh 89ecfe2d20 Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	.gitignore
	SparkleShare/SparkleStatusIcon.cs
 2011-10-15 20:31:20 +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
Hylke Bons 58926c4715 git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +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 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 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
Thomas Vollstädt 989e647ead Merge remote-tracking branch 'upstream/master' into issue10 2011-09-08 15:40:17 +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
wimh d66656da08 Add ~* to ignored files 
Fix crash when a conflict has been resolved already
 2011-09-03 23:38:53 +02:00
wimh 1e32374e81 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 60273631f3 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 8f6083a671 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 fcca840655 Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-28 21:56:25 +02:00
Hylke Bons 38cb2499ea Fix whitespace for last commit 2011-08-27 17:53:17 +02:00
Hylke Bons 71f476e255 setup: Add progress indication when adding a new folder 2011-08-27 17:10:39 +02:00
Hylke Bons a0db35d877 Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-27 02:42:09 +02:00
Hylke Bons 6917bd0ab7 fetcher git: don't prepend ssh:// when using git:// 2011-08-27 00:49:08 +02:00
Hylke Bons 9aeb848d33 Allow initial sync to be cancelled by adding a cancel button. Closes #307 2011-08-26 22:47:46 +02:00
Hylke Bons 78c399157b Bring back descriptive commit message. Fixes #317 2011-08-26 21:00:22 +02:00
wimh 26a39cab69 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 cc7ecec014 Resolving Bug with already defined variable 'n' 2011-07-30 20:48:47 +02:00
Hylke Bons 9ef9fd4243 fetcher: add configuration option to show special characters in the git log. Fixes 288 2011-07-29 23:03:45 +01:00
Hylke Bons 5eaa557de6 setup controller: fix wrong path being created 2011-07-25 02:26:46 +01:00
Hylke Bons fd62154f6c Refactor config and merge with Paths 2011-07-24 02:00:40 +01:00
Hylke Bons 8d19596f8d ... 2011-07-23 21:34:04 +01:00
Hylke Bons 49ce54f15c cleanup log and fix some small porting bugs 2011-07-23 20:57:36 +01:00