Hylke Bons
1e6cba4baa
save work on windows
2012-03-06 01:18:45 +00:00
Hylke Bons
5313ffc47d
sparklelib: use a nice SparkleLib.Git namespace
2012-03-01 17:02:52 +00:00
Shish
554a6e1354
get the backend to load the shared library
2012-02-28 13:34:15 +00:00
serras
87ef4ed013
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons
8bed56d707
invites: upload the user's pubkey on invite accept
2012-02-17 21:26:13 +01:00
Hylke Bons
4d3f1a6e85
repo git: adjust commit message for notes
2012-02-16 22:43:41 +01:00
Hylke Bons
41ea97c927
repo: don't recurse into first .git folder
2012-02-14 20:34:03 +01:00
serras
e2e706dc6a
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons
fc5a0427ec
event log: remove '.empty' files from rename entries of folders
2012-02-11 14:29:23 +01:00
Hylke Bons
f2b9e7bce7
More cleanup of SparkleLib API
2012-02-09 02:46:25 +01:00
Hylke Bons
3370a283ea
Clean up SparkleLib API
2012-02-08 20:42:29 +01:00
Hylke Bons
7a0527b7a7
repo: change CheckForRemoteChanges method to HasRemoteChanges property
2012-02-06 15:02:41 +01:00
Hylke Bons
121bb3e320
Clean up and remove unneeded references
2012-02-06 14:11:08 +01:00
serras
d096c39e5d
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons
8cc50596e9
controller: fix repo loading
2012-01-29 20:33:12 +00:00
Hylke Bons
716f5b1f27
event log: show repo url upon hovering of the folder name. Closes #544
2012-01-27 00:52:56 +00:00
Hylke Bons
8695c6c0b7
git: always get the url to use from the config.xml. Closes #556
2012-01-25 18:30:57 +00:00
praktikant
76360b1819
adapted coding style
2012-01-24 14:46:57 +01:00
praktikant
a37a041018
Fixing #298 again first try
2012-01-24 10:47:46 +01:00
serras
69829cb547
Make it compile again in Windows
2012-01-19 20:21:48 +01:00
serras
8eedf5b148
Merge branch 'master' into gettext-cs
2012-01-19 20:04:49 +01:00
Hylke Bons
1bf440872e
repo: Cache folder sizes and update them after a sync. Closes #535
2012-01-18 23:21:09 +00:00
Hylke Bons
5267138693
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
be9f264492
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
03db2a2f09
repo: Move progress interval logic to base class
2012-01-15 23:45:17 +00:00
serras
81a7c81750
Merge branch 'master' into gettext-cs
2012-01-14 11:21:53 +01:00
Hylke Bons
ab2ee404b5
git: Resolve the ?? 'conflict' by adding. Fixes #509
2012-01-12 01:01:24 +00:00
serras
78a0b5ce34
Use layout in setup windows
2012-01-09 18:36:24 +01:00
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
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
Hylke Bons
6926638822
repo: normalise timezones for the log
2011-05-29 16:48:47 +01:00
Hylke Bons
9549ae3816
repo: remove obsolete static IsRepo method
2011-05-28 20:23:33 +01:00
Hylke Bons
10ac5cbe5c
config: add url as part of the folder config xml
2011-05-26 23:41:55 +01:00
Hylke Bons
109f75aee9
Fix configuration issues
2011-05-26 20:46:49 +01:00
Hylke Bons
0167aef16a
repo git: turn off garbage collection by default
2011-05-22 18:54:47 +01:00
Hylke Bons
00327a1eb0
repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later
2011-05-22 18:49:04 +01:00
Hylke Bons
b18db88b61
repo: do a full SyncUpBase after a git rebase
2011-05-22 17:51:58 +01:00
Hylke Bons
442dc62980
repo git: fix compile error
2011-05-22 16:29:23 +01:00
Hylke Bons
0a91597291
repo git: push changes after conflict resolution
2011-05-22 16:27:06 +01:00
Hylke Bons
7be63b07c9
repo: tweak algorithm
2011-05-22 15:46:24 +01:00
Hylke Bons
3e65a4fc94
build: move backend classes into subfolders
2011-05-22 12:28:14 +01:00