Commit graph

463 commits

Author SHA1 Message Date
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 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
Hylke Bons 8ba23a6d11 config: create initial config when exception happens 2011-09-20 19:09:43 +01:00
Hylke Bons 1479662538 Close some streams immediately. Remove broken scp backend 2011-09-15 00:58:19 +02: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
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
Hylke Bons 253111e901 lib: add a User object 2011-07-23 22:33:15 +01:00
Hylke Bons 1eece7806e Add notifications for new notes 2011-07-23 22:23:14 +01:00