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
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
Hylke Bons
b84b6ba499
Fix warning
2011-12-25 20:32:39 +01:00
Hylke Bons
a4d1e5d120
event log: report size and history size. Closes #379
2011-12-15 16:15:29 +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
6ad39da458
repo git: also check for number of dirs before creating .empty file
2011-11-30 15:04:56 +01:00
wimh
2fa6c72fd8
Merge remote-tracking branch 'upstream/master' into windows
2011-11-14 20:50:27 +01:00
Hylke Bons
07b727bb72
repo git: we only need to determine CurrentRevision once per session.
2011-11-13 00:39:29 +00:00
wimh
7d226076a3
Merge remote-tracking branch 'upstream/master' into windows
2011-11-04 21:49:47 +01: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
wimh
0453083424
Merge remote-tracking branch 'upstream/master' into windows
2011-10-17 21:24:41 +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
wimh
75eb8c7f32
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
.gitignore
SparkleShare/SparkleStatusIcon.cs
2011-10-15 20:31:20 +02:00
wimh
86c84e4120
Merge remote-tracking branch 'tvollstaedt/issue10' into windows
2011-10-02 02:53:31 +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
Hylke Bons
e7c83ca06b
git: fix FillEmptyDirectories (somewhat)
2011-09-26 00:45:58 +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
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
Thomas Vollstädt
c74ed37c4e
Merge remote-tracking branch 'upstream/master' into issue10
2011-09-08 15:40:17 +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
wimh
04b3b43f88
Add ~* to ignored files
...
Fix crash when a conflict has been resolved already
2011-09-03 23:38:53 +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
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
57a6d8dbf0
Bring back descriptive commit message. Fixes #317
2011-08-26 21:00:22 +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
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
5afd3dc59f
Refactor config and merge with Paths
2011-07-24 02:00:40 +01:00
Hylke Bons
2d7b78df72
...
2011-07-23 21:34:04 +01:00
Hylke Bons
1ed107e6e9
cleanup log and fix some small porting bugs
2011-07-23 20:57:36 +01:00
wimh
5c8039e906
Merge remote-tracking branch 'upstream/master' into windows
2011-07-21 11:26:09 +02:00
Hylke Bons
55b75f84a8
Fix bug where large amounts of files aren't being added/commited/pushed (process class hung on the large outputs)
2011-07-21 00:02:21 +01:00
wimh
e11ba04bfb
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
.gitignore
SparkleShare/SparkleIntro.cs
SparkleShare/SparkleShare.cs
SparkleShare/SparkleUI.cs
2011-07-19 23:20:21 +02:00
Hylke Bons
9e48917e03
ignore note adds in the log
2011-07-17 01:37:36 +01:00
Hylke Bons
6cf8eca2b7
fix notes
2011-07-17 01:22:39 +01:00
Hylke Bons
f496a3b854
notes: stop using git-notes, use files instead
2011-07-16 23:30:46 +01:00
Alex Hudson
c385fe21ea
Fix bpbb on git callout
2011-06-29 22:40:34 +01:00
Hylke Bons
cfbdf98150
repo git: don't hang on huge command outputs
2011-06-29 20:45:37 +01:00