beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4003 commits 31 branches 6 tags 52 MiB
Commit graph

1048 commits

Author SHA1 Message Date
Hylke Bons f858572ee1 Fix coding style 2013-06-26 10:11:03 +01:00
Julien Villers 8b87d48f6e Removed pretty quotes that get rendered as ? in notification bubbles. 
Quick fix for the 1316 issue.
 2013-06-25 16:11:59 +02:00
Hylke Bons fd163a0c93 Merge branch 'tortoise' 
Conflicts:
	SparkleLib/Git/SparkleGit.cs
	SparkleLib/SparkleFetcherSSH.cs
	SparkleShare/SparkleControllerBase.cs
 2013-06-23 10:03:09 +01:00
Hylke Bons 711811f13d fetcher git: Catch stream errors when process has been killed by user. Fixes #1187 2013-06-20 21:44:34 +01:00
Hylke Bons ff06b617a4 Bump version and update news 2013-06-13 23:32:29 +01:00
Hylke Bons b74273f8c0 Fix build 2013-06-13 18:17:04 +01:00
Hylke Bons 3e8b5ed802 Fix build 2013-06-13 18:11:10 +01:00
Hylke Bons 714ac3ea83 repo: Fix a few race conditions updating the status icon 2013-06-13 17:51:38 +01:00
Hylke Bons 65aa964e76 windows: Don't crash and show a warning when FIPS is enabled. Closes #1298 2013-06-01 20:54:01 +01:00
Hylke Bons 02e6567fdc repo: Fix race condition causing the statusicon to report an error where there isn't one 2013-05-30 13:05:50 +01:00
Hylke Bons 8703b82fbe repo: Fix a possible race condition that can cause a double upload 2013-05-29 12:09:39 +01:00
Hans-Christoph Steiner 584b540116 when using tor .onion addresses, skip ssh-keyscan (no proxying support) 
Tor has special domain names called ".onion addresses".  They can only be
resolved by using a proxy via tor. While the rest of the openssh suite
fully supports proxying. ssh-keyscan does not, so it can't be used for
.onion addresses because it just barfs saying unknown host
 2013-05-17 23:08:53 -04:00
Hylke Bons e93e868a45 repo git: show first file revision in history if unedited file has been deleted. fixes #1272 2013-05-14 22:40:20 +01:00
Hylke Bons 982cb7d898 git: don't crash on parsing progress info. fixes #1237 2013-05-04 17:47:43 -04:00
Hylke Bons e16dea81dc git: fix crash when committing renames with spaces. closes #1267 2013-05-04 17:07:52 -04:00
Hylke Bons 4b1e07cb19 fetcher: fix host key check. closes #1249 2013-04-27 13:02:54 +01:00
Hylke Bons 0fba958e49 fetcher: create separate Base, SSH, and Git classes. cleaner abstraction. 2013-03-24 23:55:54 +01:00
Hylke Bons ac879068e5 fetcher: create separate Base, SSH, and Git classes. cleaner abstraction. 2013-03-24 23:52:05 +01:00
Hylke Bons fee24420c7 plugins: respect the Backend element. closes #1224 2013-03-23 18:48:47 +01:00
Hylke Bons 75e8a17d8a git: only add GIT_SSH env var if it doesn't exist already 2013-03-11 21:01:41 +00:00
Hylke Bons f8087d7b90 fetcher: ignore files with chars that aren't allowed on Windows. #1213 2013-03-11 20:10:13 +00:00
Hylke Bons f302f34c9b repo git: error out when files can't be added to the database. closes #1212 2013-03-11 17:10:03 +00:00
Hylke Bons cfbb23b452 fetcher: configure to ignore the global gitignore file. closes #1194 2013-02-27 17:45:41 +00:00
Hylke Bons 89120dc377 git: only add new language env var if it doesn't exist yet. fixes #1191 2013-02-21 13:53:23 +00:00
Hylke Bons 85cea028ef git: force language to be en_US for output 2013-02-18 21:19:31 +00:00
Hylke Bons bf1e87fde0 repo git: fix formatting of commit message 2013-02-18 19:59:09 +00:00
Hylke Bons 0116fef1be repo: ignore ASCII DEL characters when compiling the log. fixes #1185 2013-02-14 20:21:23 +00:00
Hylke Bons 46a6caff92 fetcher: add .dmg to list of files not to compress 2013-02-14 11:04:31 +00:00
Hylke Bons 1c02a4f7e8 windows: explicitly point GIT_SSH to ssh.exe 2013-02-13 22:45:12 +00:00
Hylke Bons 2fc62e783c repo: update sync algorithm. fewer threads, less complexity 2013-02-09 23:42:32 +00:00
Hylke Bons a2dff5785e fetcher: use FetcherInfo object to wrap parameters and respect AnouncementsUrl 2013-01-27 19:24:36 +00:00
Hylke Bons 857d34d939 repo git: catch exceptions when parsing sync speed. fixes #1163 2013-01-27 11:47:48 +00:00
Hylke Bons 1c8ffe407f repo git: check if remote rev is in local history when determining state. closes #1155 2013-01-24 20:10:42 +00:00
Hylke Bons 5efc5d07d3 fetcher: look for other host keys, not just RSA 2013-01-23 12:07:52 +00:00
Hylke Bons b5bf4a21b5 repo: don't show notifications for changes that you made yourself elsewhere 2013-01-20 12:40:24 +00:00
Hylke Bons aed8c86a38 lib: change default install location in defines 2013-01-15 19:35:19 +00:00
Hylke Bons 7d7cddc680 repo: refactor size calculation, ignore symlinks. fixes #1149 2013-01-11 19:58:14 +01:00
Hylke Bons afd7b76866 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 e96af63817 repo: make Identifier virtual so it can be overriden if needed. closes #1142 2013-01-08 21:35:01 +01:00
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
Hylke Bons 6015950fc5 pass transfer speeds in bytes, not strings. report both directions when needed. 2012-11-17 23:05:29 +00:00
Hylke Bons 7c71c3d67f repo git: show error when we can't rebase due to locked files 2012-11-17 19:03:37 +00:00
Hylke Bons 7165cc7cae repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058 2012-11-16 10:05:57 +00:00
Hylke Bons 94c1354a70 repo git: always use the default repo branch, even if it's not master 2012-11-12 22:47:40 +00:00
Hylke Bons a804a7139a bump version to 0.9.8 2012-11-11 21:33:57 +00:00
Hylke Bons c60153b90c repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721 2012-11-11 19:15:42 +00:00
Hylke Bons 9e89a92ba7 remove GNOME plugin as it isn't actually used by anyone 2012-11-10 22:00:03 +00:00
Hylke Bons b73f422a99 fetcher git: add back warning about global gitignore 2012-11-10 12:26:47 +00:00
Hylke Bons 3a13cad422 fetcher git: explicitly convert to native line endings for .txt files (for Notepad) 2012-11-10 10:43:30 +00:00
Hylke Bons 790345f6df bump version to 0.9.7 2012-11-09 19:25:09 +00:00
Hylke Bons ae90c616b2 fetcher git: typo in config setting 2012-11-08 16:02:55 +00:00