serras
|
ab6765868d
|
Merge branch 'master' into gettext-cs
Conflicts:
SparkleLib/SparkleListenerTcp.cs
|
2012-02-27 10:04:28 +01:00 |
|
Hylke Bons
|
c1d54929a4
|
invites: upload the user's pubkey on invite accept
|
2012-02-17 21:26:13 +01:00 |
|
Hylke Bons
|
ef3f15ebcf
|
repo git: adjust commit message for notes
|
2012-02-16 22:43:41 +01:00 |
|
Hylke Bons
|
7080a115e6
|
repo: don't recurse into first .git folder
|
2012-02-14 20:34:03 +01:00 |
|
serras
|
8c26969335
|
Merge branch 'master' into gettext-cs
Conflicts:
SparkleLib/Git/SparkleFetcherGit.cs
|
2012-02-12 16:24:12 +01:00 |
|
Hylke Bons
|
93f9b7f777
|
event log: remove '.empty' files from rename entries of folders
|
2012-02-11 14:29:23 +01:00 |
|
Hylke Bons
|
06f70c5f2e
|
More cleanup of SparkleLib API
|
2012-02-09 02:46:25 +01:00 |
|
Hylke Bons
|
a4678941f4
|
Clean up SparkleLib API
|
2012-02-08 20:42:29 +01:00 |
|
Hylke Bons
|
40127b849a
|
repo: change CheckForRemoteChanges method to HasRemoteChanges property
|
2012-02-06 15:02:41 +01:00 |
|
Hylke Bons
|
aa9b67ffa5
|
Clean up and remove unneeded references
|
2012-02-06 14:11:08 +01:00 |
|
serras
|
22d40fd3ea
|
Merge branch 'master' into gettext-cs
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
|
2012-02-05 18:54:32 +01:00 |
|
Hylke Bons
|
2fdad29e0e
|
controller: fix repo loading
|
2012-01-29 20:33:12 +00:00 |
|
Hylke Bons
|
4d89897267
|
event log: show repo url upon hovering of the folder name. Closes #544
|
2012-01-27 00:52:56 +00:00 |
|
Hylke Bons
|
f892fd9c11
|
git: always get the url to use from the config.xml. Closes #556
|
2012-01-25 18:30:57 +00:00 |
|
praktikant
|
154a4e65bf
|
adapted coding style
|
2012-01-24 14:46:57 +01:00 |
|
praktikant
|
12f18f34b8
|
Fixing #298 again first try
|
2012-01-24 10:47:46 +01:00 |
|
serras
|
bd43afc13c
|
Make it compile again in Windows
|
2012-01-19 20:21:48 +01:00 |
|
serras
|
69c5c1dfde
|
Merge branch 'master' into gettext-cs
|
2012-01-19 20:04:49 +01:00 |
|
Hylke Bons
|
2a98aec8c7
|
repo: Cache folder sizes and update them after a sync. Closes #535
|
2012-01-18 23:21:09 +00:00 |
|
Hylke Bons
|
e367614390
|
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
|
f9a5e6911a
|
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
|
16280826f5
|
repo: Move progress interval logic to base class
|
2012-01-15 23:45:17 +00:00 |
|
serras
|
6148cfc8b2
|
Merge branch 'master' into gettext-cs
|
2012-01-14 11:21:53 +01:00 |
|
Hylke Bons
|
a908fde11e
|
git: Resolve the ?? 'conflict' by adding. Fixes #509
|
2012-01-12 01:01:24 +00:00 |
|
serras
|
1dd3bdeaf9
|
Use layout in setup windows
|
2012-01-09 18:36:24 +01:00 |
|
serras
|
b98c4ee5fb
|
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
|
84e3fff6df
|
repo: Also report progress on fetch
|
2011-12-30 15:00:15 +01:00 |
|
Hylke Bons
|
eb65f5e125
|
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
|
aaf540a3ff
|
Don't exclude all dotfiles, Fixes #495
|
2011-12-29 12:44:18 +01:00 |
|
Hylke Bons
|
883e0acc1c
|
Fix warning
|
2011-12-25 20:32:39 +01:00 |
|
Hylke Bons
|
89c75c0746
|
event log: report size and history size. Closes #379
|
2011-12-15 16:15:29 +01:00 |
|
Hylke Bons
|
c01c8525ef
|
repo: Improve handling of offline repos. Fixes #439
|
2011-12-03 12:40:55 +01:00 |
|
Hylke Bons
|
d83df10953
|
git: strip .empty from file paths in commit messages
|
2011-12-03 12:40:55 +01:00 |
|
Hylke Bons
|
1856a9e922
|
repo git: also check for number of dirs before creating .empty file
|
2011-11-30 15:04:56 +01:00 |
|
wimh
|
a3899d6b1f
|
Merge remote-tracking branch 'upstream/master' into windows
|
2011-11-14 20:50:27 +01:00 |
|
Hylke Bons
|
92e698ec40
|
repo git: we only need to determine CurrentRevision once per session.
|
2011-11-13 00:39:29 +00:00 |
|
wimh
|
36d562ab2c
|
Merge remote-tracking branch 'upstream/master' into windows
|
2011-11-04 21:49:47 +01:00 |
|
Hylke Bons
|
1c801b1e94
|
Fix host key check disabling/enabling by surrounding config with comments. Closes #390.
|
2011-10-30 21:24:19 +00:00 |
|
wimh
|
1bbc3fb396
|
Merge remote-tracking branch 'upstream/master' into windows
|
2011-10-17 21:24:41 +02:00 |
|
Hylke Bons
|
4268c12dcb
|
git: Always use user info from global config to commit. Fixes #367
|
2011-10-17 19:34:46 +02:00 |
|
wimh
|
89ecfe2d20
|
Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
.gitignore
SparkleShare/SparkleStatusIcon.cs
|
2011-10-15 20:31:20 +02:00 |
|
wimh
|
1fcee3a69a
|
Merge remote-tracking branch 'tvollstaedt/issue10' into windows
|
2011-10-02 02:53:31 +02:00 |
|
wimh
|
636efe9011
|
Merge with upstream (11a932b73e )
|
2011-10-02 00:52:21 +02:00 |
|
Hylke Bons
|
d7adcf6d1f
|
new Add Project dialog, powered by plugins
|
2011-10-01 23:16:25 +02:00 |
|
Hylke Bons
|
58926c4715
|
git: fix FillEmptyDirectories (somewhat)
|
2011-09-26 00:45:58 +02:00 |
|
Hylke Bons
|
54302d8d8f
|
git: filling empty dirs: don't bother removing the .empty
|
2011-09-22 20:11:08 +01:00 |
|
Hylke Bons
|
7b81c37691
|
Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare
|
2011-09-22 13:05:14 +01:00 |
|
Hylke Bons
|
f2e3776be2
|
Close some streams immediately. Remove broken scp backend
|
2011-09-15 00:58:19 +02:00 |
|
Hylke Bons
|
068f1dd26c
|
Fix memory leak
|
2011-09-14 20:18:15 +02:00 |
|
Hylke Bons
|
2f492c00f8
|
Remove .empty files when they are no longer needed
|
2011-09-14 20:12:56 +02:00 |
|