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
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
Hylke Bons
de564d89ff
repo: add a property that shows the currenly unsynced paths (to hook up with the badger)
2011-06-29 20:28:49 +01:00
Hylke
ca762a9220
repo git: sync up initial commit
2011-06-28 20:03:10 +01:00
Hylke Bons
4018f82728
remove some TODOs
2011-06-26 02:41:00 +01:00
Hylke Bons
a9c52ea738
note: don't push notes to read only repos
2011-06-25 22:39:53 +01:00
Hylke
cd0b76bba8
fetch notes periodically
2011-08-25 16:02:34 +01:00
Hylke
7b87b1f6b9
avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs
2011-08-25 15:36:26 +01:00
Hylke
b9eab774dc
git fetch all branches
2011-06-24 23:43:11 +01:00
Hylke
ef292b34cc
Merge branch 'master' into notes
...
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
2011-06-24 19:13:02 +01:00
wimh
0fb2bc840e
Merge remote branch 'upstream/master' into merge
2011-06-23 20:39:41 +02:00
wimh
a97b7d9647
Merge commit '4f59a03a6f395b1db7d6' into merge
2011-06-23 20:38:21 +02:00
Hylke
c5a092c8a4
repo: don't show warning statusicon upon initial commit
2011-06-23 13:56:25 +01:00
Hylke Bons
25e08545d2
continue implementing notes
2011-06-23 01:44:43 +01:00
Hylke Bons
b7c9fe4431
save progress on notes
2011-06-23 01:44:43 +01:00
Hylke Bons
de98e29f70
Add each note to its own namespace to avoid conflicts
2011-06-23 01:44:43 +01:00
Hylke Bons
a801f68340
fix AddNote, add Note object
2011-06-23 01:44:43 +01:00
Hylke Bons
1d5dd2a8b0
make adding a note work
2011-06-23 01:44:43 +01:00
Hylke Bons
f1ff61950c
add AddNote method
2011-06-23 01:44:43 +01:00
Hylke Bons
06683678b2
Fix timzones in timestamps, again...
2011-06-15 00:34:29 +01:00
wimh
5501a448b5
reset to upstream/master, add windows files and fixes
2011-06-11 21:52:41 +02:00
Hylke Bons
72f4052526
repo git: strip quotes from git commit message
2011-06-11 18:51:39 +01:00
Hylke Bons
f3aca9da0a
repo git: strip quotes from git commit message
2011-06-10 21:40:13 +01:00
Hylke Bons
c16b2cb420
Save work
2011-06-10 00:01:45 +01:00
Hylke Bons
911a1f941a
changeset: Add a Folder property
2011-06-09 21:25:36 +01:00
Hylke Bons
04d63c0a27
Update out of date SparkleShare tagline
2011-06-02 00:08:05 +01:00
Hylke Bons
a941bd3b80
repo git: only disable emable watching once
2011-05-30 16:20:25 +01:00
Hylke Bons
6298c86a36
repo git: convert commit timestamps by converting them to utc, then converting them to our timezone
2011-05-29 17:47:40 +01:00