Hylke Bons
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
b230d14d4a
Add SparkleShare.txt and .sparkleshare in a single commit
2012-04-26 16:02:59 +02:00
Hylke Bons
b087fde663
Implement encryption using OpenSSL's AES + Mac UI
2012-04-26 16:02:58 +02:00
Hylke Bons
145e8fe01d
repo git: Don't follow symlinks when preparing the tree. Fixes #701
2012-04-17 19:00:05 +02:00
Hylke Bons
5829bf4622
git: write error outputs to the debug.log for easier debugging
2012-04-17 11:05:51 +02:00
Hylke Bons
d542f3e75a
repo git: quote urls to allow push/pull with urls that contain spaces. Fixes #703
2012-04-16 23:26:33 +02:00
Hylke Bons
37f8e050c6
config: allow to specify a custom path for each folder. Closes #680
2012-04-15 19:03:36 +02:00
Hylke Bons
192779a1b7
repo git: on conflicts, put timestamp before file extension. Fixes #699
2012-04-15 11:50:03 +02:00
Hylke Bons
9ccc9e6a08
repo git: add debug info for #677
2012-04-10 23:19:33 +02:00
Hylke Bons
8fc30c7d0f
repo: basic support for quota detection
2012-04-04 23:45:20 +01:00
Hylke Bons
993d3b1302
repo git: don't hang on large rebase outputs. Should fix #663
2012-03-28 23:11:41 +01:00
Hylke Bons
e8903492e7
Use .sparkleshare file for the repo ID, instad of the first commit hash
2012-03-26 00:41:52 +01:00
Hylke Bons
bbcb5db1db
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:26:47 +00:00
Hylke Bons
608b4110b6
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:20:28 +00:00
Hylke Bons
12b27f3eb2
windows setup: Reverse button order
2012-03-17 01:44:27 +00:00
Hylke Bons
301e671747
repo: Fix false 'Not everything is synced' messages after succesful conflict resolution
2012-03-16 01:53:23 +00:00
Hylke Bons
fb497c234b
repo git: add catch block to PrepareDirectories method
2012-03-12 19:56:06 +00:00
Hylke Bons
4fed581829
Remove the notes feature
2012-03-10 20:51:37 +00:00
Hylke Bons
17affe8b63
windows: some small fixes
2012-03-08 14:55:44 +00:00
Hylke Bons
98695afbf4
xplicitly hide supposed to be hidden files. Closes #605
2012-03-08 03:34:45 +00:00
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