Commit graph

983 commits

Author SHA1 Message Date
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
Hylke Bons 45e724a13a fix compile error 2012-09-29 12:35:36 +02:00
Hylke Bons 70bff949e3 tagged 0.9.3 2012-09-29 12:16:27 +02:00
Hylke Bons 67980bd0c1 repo: when there was an error syncing up, shorten the poll interval 2012-09-29 12:15:38 +02:00
Hylke Bons 4cf5c78c2e tagged 1.0 2012-09-29 10:59:48 +02:00
Hylke Bons 1aaa18d49b build: change default install path 2012-09-26 17:06:34 +02:00
Hylke Bons 0cd3a3edf3 bump version 2012-09-26 16:54:04 +02:00
Hylke Bons c6bd415a80 logger: Don't let the debug log get too big 2012-09-23 12:58:33 +01:00
Hylke Bons 34df1996cf repo git: Fix endless loop when adding empty folders. Closes #967 2012-09-23 12:10:51 +01:00
Hylke Bons f5bf5f4183 repo: Make sure there is always only one buffer/sync thread on file activity. Closes #982 2012-09-22 23:09:36 +01:00
Hylke Bons 4118f1949c repo: don't allow multiple syncs at the same time on startup. Fixes #985 2012-09-22 22:43:40 +01:00
Hylke Bons 05101acf28 Merge pull request #984 from brandondahler/master
Too large commit log causes git to hang
2012-09-22 05:37:34 -07:00
Brandon Dahler efd642253a Fix bug from too large of commit log (introduced 1c8cffd178). 2012-09-21 19:27:26 -05:00
Hylke Bons f5b7920e09 config: Remove duplicate folders in the rare case they happen. Closes #978 2012-09-21 18:04:55 +01:00
Hylke Bons 76d4b269c0 config: add back folders_path option. Closes #975 2012-09-20 10:33:49 +01:00
Hylke Bons ed4ece4fec statusicon: don't show 0% progress and change error message 2012-09-19 19:57:57 +01:00
Hylke Bons bb67a05e56 statusicon: On sync fail, add error descriptions as submenus. Closes #874 2012-09-18 19:40:06 +01:00
Hylke Bons 7c6e4c4980 repo git: set remote.origin.url from config.xml on startup. #972 2012-09-17 11:22:42 +01:00
Hylke Bons 21fd8f255b build: fix warning 2012-09-15 11:22:26 +01:00
Brandon Dahler 1f3ed24629 Fix duplicate unconditional calls to AlsoListenToInternal for all channels 2012-09-10 16:18:04 -05:00
Hylke Bons 8793b9205a listener: remove some unused code 2012-09-08 10:48:01 +01:00
Hylke Bons d790d1b003 fetcher git: Add .iso to do not compress list 2012-09-08 10:41:08 +01:00
ckoinig 504119af84 notofications: Announcements in a folder where always considered 'already processed' as long as any announcement for that folder existed 2012-09-08 11:05:54 +02:00
Hylke Bons 416b23bd5b fetcher: Fix some edge cases on host key check 2012-09-05 14:14:15 +01:00
= 70e88288f0 Check for empty string, not null 2012-09-05 14:49:34 +02:00
= 3c3378f007 Fix formatting 2012-09-05 14:41:30 +02:00
= e58a72f377 Take port into account when retrieving SSH host keys 2012-09-05 14:37:31 +02:00
Hylke Bons a101a6191e listener: Use port 443. See #947 2012-09-03 19:44:36 +01:00
Hylke Bons fa1a38687b Update NEWS and bump version 2012-08-29 13:06:46 +01:00
Hylke Bons caa79a9dca fetcher git: check if git info directory exists before writing to it. Fixes #934 2012-08-27 13:54:22 +01:00
Hylke Bons 7c7df904bc fetcher: Fix freeze on cancel 2012-08-27 13:25:03 +01:00
Hylke Bons 2ab6bbf672 Remove some unused references 2012-08-20 10:56:21 +01:00
Hylke Bons a990b5a466 repo: Use custom watcher on root folders and don't use FileSystemWatcher when it is active. #472 2012-08-19 11:43:41 +01:00