Commit graph

1015 commits

Author SHA1 Message Date
Hylke Bons f9c92ff766 fetcher: look for other host keys, not just RSA 2013-01-23 12:07:52 +00:00
Hylke Bons 51d5735f28 repo: don't show notifications for changes that you made yourself elsewhere 2013-01-20 12:40:24 +00:00
Hylke Bons e1813d9d5d lib: change default install location in defines 2013-01-15 19:35:19 +00:00
Hylke Bons aa9e56b60a repo: refactor size calculation, ignore symlinks. fixes #1149 2013-01-11 19:58:14 +01:00
Hylke Bons d093894b2c repo git: empty logs make me sad. always show something when no changes this month 2013-01-11 19:38:49 +01:00
Hylke Bons a2b2750c9f repo: make Identifier virtual so it can be overriden if needed. closes #1142 2013-01-08 21:35:01 +01:00
Hylke Bons e5d29ed969 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 09878191d5 fix coding style 2013-01-06 15:58:11 +01:00
Hylke Bons 194e26500b repo git: reduce the number of status commands being called on activity 2013-01-06 12:21:54 +01:00
Hylke Bons b5ca8007cc repo: refactor startup sync loop 2013-01-05 14:15:22 +01:00
Hylke Bons 0b8416dd1b Merge branch 'PathFix' of https://github.com/brandondahler/SparkleShare
Conflicts:
	SparkleShare/SparkleControllerBase.cs
2013-01-05 10:56:19 +01:00
Brandon Dahler b2b49012c1 Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining. 2013-01-05 02:38:01 -06:00
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
Hylke Bons aabf323860 remove GNOME plugin as it isn't actually used by anyone 2012-11-10 22:00:03 +00:00
Hylke Bons f4c6e50a15 fetcher git: add back warning about global gitignore 2012-11-10 12:26:47 +00:00
Hylke Bons ac2066f7f4 fetcher git: explicitly convert to native line endings for .txt files (for Notepad) 2012-11-10 10:43:30 +00:00
Hylke Bons ef6df58f5c bump version to 0.9.7 2012-11-09 19:25:09 +00:00
Hylke Bons 51d4b6a28c fetcher git: typo in config setting 2012-11-08 16:02:55 +00:00
Hylke Bons 821d93d672 fix repos with '.git' in their name not syncing sometimes 2012-11-04 18:37:38 +00:00
Hylke Bons cdfda1256f fetcher: use different way to determine repo backend to fix a crash on windows 2012-11-04 18:20:01 +00:00
Hylke Bons 285b8082bc fetcher: make Snet repos use client side crypto by default 2012-11-04 17:43:29 +00:00
Hylke Bons bd746ba2c0 Allow using periods '.' and underscores '_' (will be replaced by spaces locally) in project names. fixes #1046 2012-11-04 16:27:39 +00:00
Hylke Bons 4a570d50d0 fetcher: create a different SparkleShare.txt message for encrypted projects 2012-11-02 16:09:05 +00:00
Hylke Bons 2bcf22cd0d bump version 2012-10-26 23:54:53 +01:00
Hylke Bons af626eb1e8 setup mac: change the last tutorial page. present link code with copy button 2012-10-26 23:26:15 +01:00
Hylke Bons abe94a0bfc fetcher git: explicitly set the push strategy. fixes #1035 2012-10-26 13:43:54 +01:00
Hylke Bons 164c420989 repo: when adding files during a sync, don't trigger a new sync but wait when idle 2012-10-25 16:23:59 +01:00
Hylke Bons acab0e1c85 repo git: cleanups 2012-10-22 21:41:00 +01:00
Hylke Bons cb7872778b logger: add exception type to crash dump 2012-10-22 10:03:59 +01:00
Hylke Bons 49a30a823b windows: fix for the .sparkleshare file sometimes not being hidden 2012-10-21 21:16:38 +01:00
Hylke Bons 9571043aba bump version 2012-10-20 23:51:50 +01:00
Hylke Bons e5f967dcbc convert tabs to space 2012-10-20 23:25:36 +01:00
Hylke Bons a4a48865dc fetcher git: fixes for crypto setup 2012-10-20 23:22:41 +01:00
Hylke Bons d8cb07763f windows: fix version number in about dialog. closes #1021 2012-10-20 18:53:31 +01:00
Hylke Bons 6ffda9388b fetcher git: fix crypto salt lookup 2012-10-19 23:42:27 +01:00
Hylke Bons 1009227aff controller: small fix for status icon text not updating sometimes 2012-10-16 22:00:35 +01:00
Hylke Bons 96bf4efc7a fetcher: hide the .sparkleshare file when done 2012-10-16 22:00:35 +01:00
Hylke Bons faf5ff12c1 don't block the event log on initial startup syncs 2012-10-16 22:00:35 +01:00
Hylke Bons 2d3f351523 event log: show the last month worth of changes 2012-10-16 22:00:35 +01:00
Hylke Bons 8857634e64 eventlog: change default size 2012-10-16 22:00:35 +01:00
Hylke Bons 69e79d1ca6 bump development version 2012-10-16 22:00:34 +01:00
Hylke Bons 73d0f496d2 history: implement back button 2012-10-16 22:00:34 +01:00
Hylke Bons 3c74466898 history: fix some edge cases and general improvements 2012-10-16 22:00:34 +01:00
Hylke Bons 651033b9b8 make restoring of files work 2012-10-16 22:00:34 +01:00
Hylke Bons d4ac1fe93e early working version of history recycle logic + mac Save As dialog 2012-10-16 22:00:34 +01:00
Hylke Bons f20561598d update Bitbucket logo to their new brand. add sources for other default host icons 2012-10-09 23:12:35 +02:00
Hylke Bons 713950c37e eventlog: take user to gravatar.com when clicking on avatars 2012-10-06 13:17:39 +02:00
Hylke Bons a02bd278b0 fetcher: fix support for http(s) repos. closes #1000 2012-10-05 21:55:57 +02:00
Hylke Bons 570c0eb17f fetcher: simplify some methods 2012-10-04 18:54:16 +02:00
Hylke Bons 1a3e7da738 eventlog: fix first commit on encrypted repos 2012-09-30 13:07:36 +02:00
Hylke Bons a7c39b3a35 crypto: use a random salt per repo, store it as a remote branch name 2012-09-29 23:57:35 +02:00