Commit graph

959 commits

Author SHA1 Message Date
Hylke Bons 8fd5974cad Revert "Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining."
This reverts commit b2b49012c1.

Conflicts:

	SparkleShare/SparkleControllerBase.cs
2013-01-06 19:33:55 +01:00
Hylke Bons b2400bb5bc fix coding style 2013-01-06 15:58:11 +01:00
Hylke Bons c1d6289507 repo git: reduce the number of status commands being called on activity 2013-01-06 12:21:54 +01:00
Hylke Bons 34b0334418 repo: refactor startup sync loop 2013-01-05 14:15:22 +01:00
Hylke Bons 3381e5a517 Merge branch 'PathFix' of https://github.com/brandondahler/SparkleShare
Conflicts:
	SparkleShare/SparkleControllerBase.cs
2013-01-05 10:56:19 +01:00
Brandon Dahler 4ee5187c84 Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining. 2013-01-05 02:38:01 -06:00
Hylke Bons 6d2852622f git: fix typo. closes #1134 2013-01-03 22:13:18 +01:00
Hylke Bons 345b399b24 Search for git in the install dir, so people can add their custom copy of git. closes #1126 2013-01-03 13:34:47 +01:00
Hylke Bons 06840064b5 Merge pull request #1131 from brandondahler/CultureFix
Manually set locale to en-US for parsing numbers out of git output
2013-01-02 10:19:53 -08:00
Hylke Bons 8eed12ff30 Merge pull request #1122 from brandondahler/HistoryFix
Do not include /.git file in calculating subdirectory size
2013-01-02 06:09:24 -08:00
Brandon Dahler 75021f7444 Manually set locale to en-US for parsing numbers out of git output 2012-12-31 04:06:07 -06:00
Brandon Dahler e01143389e Do not include /.git file in calculating subdirectory size 2012-12-25 00:32:39 -06:00
Hylke Bons 829ce766f7 fetcher: ssh+backend strip should be in the derived class, not the base class. #1118 2012-12-21 22:02:35 +01:00
Hylke Bons c7089c884e git: adjust git-bin configuration to use sftp 2012-12-20 18:40:55 +01:00
Hylke Bons 8f4ee1ec91 fix build 2012-12-19 21:58:22 +01:00
Hylke Bons 268507d4d0 repo git: when things are utterly wrong, abandon rebase 2012-12-19 21:57:55 +01:00
Hylke Bons d71a91efcd fetcher: let the backend handle the parsing of the url. #1118 2012-12-19 21:02:00 +01:00
Hylke Bons 93125e9e23 fix build 2012-12-18 18:05:06 +01:00
Hylke Bons 6daf9fd31c repo git: add more git-bin configuration on startup 2012-12-18 13:36:36 +01:00
Hylke Bons 95ed386e05 fetcher git: increase big file threshold 2012-12-14 19:13:30 +01:00
Hylke Bons 27da1ba870 config: include both private and public keys for use in the app 2012-12-14 17:10:00 +01:00
Hylke Bons 7cf1e375e9 repo git: add private key info when using git-bin 2012-12-14 17:03:00 +01:00
Hylke Bons cfc0011386 repo git: when setting the url from config, also set the git-bin.sshUrl 2012-12-14 13:40:49 +01:00
Hylke Bons bc1c5d21b2 fetcher: compression exclude rules: tar is not compressed, add truecrypt volumes 2012-12-11 20:56:07 +01:00
Aaron Bockover 6e5c9521e3 [SparkleLib] fix debug build 2012-12-10 12:55:02 -05:00
Hylke Bons 4b9b35c7d1 bump version 2012-12-07 17:19:51 +00:00
Hylke Bons cbb9553009 bump version 2012-12-07 10:34:45 +00:00
Hylke Bons 39bd51bc48 fetcher: add some more debug rules for fetching the host key 2012-12-06 21:35:53 +00:00
Hylke Bons 9c21474c49 clean up a bit 2012-12-06 19:33:39 +00:00
Hylke Bons 3450354f12 mac: fix occasional crash when updating the menu whilst it's open 2012-12-04 23:51:32 +00:00
Hylke Bons 1f7235177f windows: fix version number 2012-12-02 22:20:06 +00:00
Hylke Bons aea3176846 various rearrangements and tweaks 2012-11-28 20:17:39 +00:00
Hylke Bons c45d883728 fetcher git: fix crypto. 'git branch -a' doesn't always show all branches 2012-11-27 21:57:05 +00:00
Hylke Bons 2b1fa6a57c windows statusicon: clean up 2012-11-25 13:33:12 +00:00
Hylke Bons 3be9fb80ba repo: don't allow force retry when already syncing 2012-11-23 11:37:56 +00:00
Hylke Bons f5463f98ba repo: fix typo 2012-11-23 10:08:50 +00:00
Hylke Bons 63fde5a7d9 repo statusicon: add error type: 'project not found' 2012-11-23 00:20:43 +00:00
Hylke Bons cf5587c76b bump version to 0.9.9 2012-11-22 22:53:25 +00:00
Hylke Bons 6296a78b26 Merge branch 'master' of https://github.com/hbons/SparkleShare 2012-11-22 12:33:54 +00:00
Hylke Bons 0c3905e58a fetcher: log exceptions more cleanly 2012-11-22 12:32:04 +00:00
Hylke Bons a5ea281c04 fetcher git: simplify 2012-11-22 09:46:49 +00:00
Hylke Bons 804b390eba repo git: fix parsing of changed host key error. #1078 2012-11-21 23:08:32 +00:00
Hylke Bons cd6f69ef43 repo git: don't try to resolve conflicts when a rebase failed due to locked files 2012-11-21 09:22:55 +00:00
Hylke Bons 8948837a59 repo git: fix getting stuck in conflict resolution loop when there are no conflicts 2012-11-20 20:33:02 +00:00
Hylke Bons c865e71d12 clean up 2012-11-19 15:06:56 +00:00
Hylke Bons cdf28e8d20 repo git: reuse regex objects 2012-11-18 18:49:57 +00:00
Hylke Bons 743084bb0b linux: fix compile error 2012-11-18 15:28:14 +00:00
Hylke Bons 278a1df06d statusicon: start on a new thread when forcing a retry 2012-11-18 15:00:34 +00:00
Hylke Bons 8e1c79226e statusicon: fix progress not appearing sometimes 2012-11-18 14:29:10 +00:00
Hylke Bons 2e73338337 repo git: catch any exceptions trying to parse transfer speeds 2012-11-18 11:36:09 +00:00