Commit graph

953 commits

Author SHA1 Message Date
Hylke Bons 9e9e556c70 git: fix typo. closes #1134 2013-01-03 22:13:18 +01:00
Hylke Bons a05050a71f 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 bb8dda00f8 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 d3a04ed753 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 8239d940ca Manually set locale to en-US for parsing numbers out of git output 2012-12-31 04:06:07 -06:00
Brandon Dahler 2a0588568c Do not include /.git file in calculating subdirectory size 2012-12-25 00:32:39 -06:00
Hylke Bons db20ada40e 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 dd17c20373 git: adjust git-bin configuration to use sftp 2012-12-20 18:40:55 +01:00
Hylke Bons 506f07d74a fix build 2012-12-19 21:58:22 +01:00
Hylke Bons 097ea6f9ba repo git: when things are utterly wrong, abandon rebase 2012-12-19 21:57:55 +01:00
Hylke Bons af768393bb fetcher: let the backend handle the parsing of the url. #1118 2012-12-19 21:02:00 +01:00
Hylke Bons bbd322a7d0 fix build 2012-12-18 18:05:06 +01:00
Hylke Bons c98ff81dac repo git: add more git-bin configuration on startup 2012-12-18 13:36:36 +01:00
Hylke Bons 07ced1bfa3 fetcher git: increase big file threshold 2012-12-14 19:13:30 +01:00
Hylke Bons 490cf6fc54 config: include both private and public keys for use in the app 2012-12-14 17:10:00 +01:00
Hylke Bons c6a952233e repo git: add private key info when using git-bin 2012-12-14 17:03:00 +01:00
Hylke Bons a211521e79 repo git: when setting the url from config, also set the git-bin.sshUrl 2012-12-14 13:40:49 +01:00
Hylke Bons f3e3153d91 fetcher: compression exclude rules: tar is not compressed, add truecrypt volumes 2012-12-11 20:56:07 +01:00
Aaron Bockover 0ab783d60d [SparkleLib] fix debug build 2012-12-10 12:55:02 -05:00
Hylke Bons ee66b0fb47 bump version 2012-12-07 17:19:51 +00:00
Hylke Bons 5a257d8255 bump version 2012-12-07 10:34:45 +00:00
Hylke Bons b81fa4f0c6 fetcher: add some more debug rules for fetching the host key 2012-12-06 21:35:53 +00:00
Hylke Bons 6ec11ceb1c clean up a bit 2012-12-06 19:33:39 +00:00
Hylke Bons b20bd558d7 mac: fix occasional crash when updating the menu whilst it's open 2012-12-04 23:51:32 +00:00
Hylke Bons 8d0022c787 windows: fix version number 2012-12-02 22:20:06 +00:00
Hylke Bons f61cef926b various rearrangements and tweaks 2012-11-28 20:17:39 +00:00
Hylke Bons 5bc5186c2e fetcher git: fix crypto. 'git branch -a' doesn't always show all branches 2012-11-27 21:57:05 +00:00
Hylke Bons 0f9ae4b514 windows statusicon: clean up 2012-11-25 13:33:12 +00:00
Hylke Bons 60f5ec1208 repo: don't allow force retry when already syncing 2012-11-23 11:37:56 +00:00
Hylke Bons 5fbbf973ed repo: fix typo 2012-11-23 10:08:50 +00:00
Hylke Bons 1add1e2e84 repo statusicon: add error type: 'project not found' 2012-11-23 00:20:43 +00:00
Hylke Bons 09165e21c0 bump version to 0.9.9 2012-11-22 22:53:25 +00:00
Hylke Bons 269d0918a4 Merge branch 'master' of https://github.com/hbons/SparkleShare 2012-11-22 12:33:54 +00:00
Hylke Bons fc33af3378 fetcher: log exceptions more cleanly 2012-11-22 12:32:04 +00:00
Hylke Bons 187f4d3ad5 fetcher git: simplify 2012-11-22 09:46:49 +00:00
Hylke Bons e947745fa1 repo git: fix parsing of changed host key error. #1078 2012-11-21 23:08:32 +00:00
Hylke Bons 1cce6f9b00 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 965278e189 repo git: fix getting stuck in conflict resolution loop when there are no conflicts 2012-11-20 20:33:02 +00:00
Hylke Bons 3774f3cde6 clean up 2012-11-19 15:06:56 +00:00
Hylke Bons 0494908972 repo git: reuse regex objects 2012-11-18 18:49:57 +00:00
Hylke Bons 51eee1a82f linux: fix compile error 2012-11-18 15:28:14 +00:00
Hylke Bons d193f52af5 statusicon: start on a new thread when forcing a retry 2012-11-18 15:00:34 +00:00
Hylke Bons 1c36101212 statusicon: fix progress not appearing sometimes 2012-11-18 14:29:10 +00:00
Hylke Bons 90f161174f repo git: catch any exceptions trying to parse transfer speeds 2012-11-18 11:36:09 +00:00
Hylke Bons 69cf6f690f pass transfer speeds in bytes, not strings. report both directions when needed. 2012-11-17 23:05:29 +00:00
Hylke Bons 4bb41bf9f6 repo git: show error when we can't rebase due to locked files 2012-11-17 19:03:37 +00:00
Hylke Bons aa71874b5a repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058 2012-11-16 10:05:57 +00:00
Hylke Bons 7c12a2f14f repo git: always use the default repo branch, even if it's not master 2012-11-12 22:47:40 +00:00
Hylke Bons f303f938c4 bump version to 0.9.8 2012-11-11 21:33:57 +00:00
Hylke Bons 9bcbec8d84 repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721 2012-11-11 19:15:42 +00:00