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
|
994ccbb07b
|
fetcher git: Add some memory limiting settings to the config. Closes #519
|
2012-01-18 01:50:47 +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
|
6136730fab
|
git config: Add a tab before options
|
2012-01-17 01:08:26 +00:00 |
|
Hylke Bons
|
38e8db9e70
|
git put SparkleGit class in its own file
|
2012-01-16 20:23:12 +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
|
7440445104
|
fetcher git: ignore Mercurial and Bazaar databases
|
2012-01-16 19:57:11 +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
|
a7ac3b0097
|
fetcher git: make url parsing more readable by using the Uri object
|
2012-01-13 23:47:19 +00:00 |
|
Hylke Bons
|
649fab3826
|
fetcher git: Cleanup
|
2012-01-13 20:18:16 +00:00 |
|
Hylke Bons
|
ab2ee404b5
|
git: Resolve the ?? 'conflict' by adding. Fixes #509
|
2012-01-12 01:01:24 +00:00 |
|
Hylke Bons
|
63497bbed3
|
git: Don't compress already compressed file formats
|
2012-01-11 22:15:13 +00:00 |
|
serras
|
78a0b5ce34
|
Use layout in setup windows
|
2012-01-09 18:36:24 +01:00 |
|
serras
|
0dd7605834
|
Make it compile with Sparkleshare 0.6 and create .msi file correctly
|
2012-01-08 22:31:14 +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
|
88700a83d6
|
fetcher git: Fix race condition when stopping a clone
|
2011-12-24 19:17:54 +01:00 |
|
Hylke Bons
|
f1605a566f
|
fetcher git: set the working dir to the tmp path. Fixes #488
|
2011-12-24 18:04:43 +01:00 |
|
Hylke Bons
|
c235248078
|
Use folders_path config option to create the tmo dir when it is set. Fixes #485
|
2011-12-18 17:10:06 +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
|
23fed0359f
|
fetcher git: always create folder for ignore file first. Fixes #460
|
2011-12-01 19:41:49 +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 |
|
Hylke Bons
|
5030933abf
|
setup: Show a warning when the user has a global gitignore. Closes #432
|
2011-11-28 14:40:34 +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
|
61bd9af894
|
Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
SparkleLib/SparkleHelpers.cs
|
2011-10-27 19:12:04 +02:00 |
|
Hylke Bons
|
80cf3cf26a
|
git: add some more MS Office exclude rules
|
2011-10-24 19:43:55 +01:00 |
|
Hylke Bons
|
a018a6181b
|
git: add some more MS Office exclude rules
|
2011-10-24 19:42:18 +01:00 |
|
Hylke Bons
|
877aff9548
|
fetcher git: add exclude rules for temporary MS Office files
|
2011-10-23 13:39:00 +01:00 |
|
wimh
|
ef28cb4a14
|
Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs)
|
2011-10-17 22:20:37 +02:00 |
|
wimh
|
0453083424
|
Merge remote-tracking branch 'upstream/master' into windows
|
2011-10-17 21:24:41 +02:00 |
|
Hylke Bons
|
39ec42d167
|
git fetcher: System.Xml no longer needed here
|
2011-10-17 19:37:35 +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
|
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
|
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 |
|