Commit graph

1048 commits

Author SHA1 Message Date
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
Hylke Bons 6e35c81422 fix repos with '.git' in their name not syncing sometimes 2012-11-04 18:37:38 +00:00
Hylke Bons 126aba422f fetcher: use different way to determine repo backend to fix a crash on windows 2012-11-04 18:20:01 +00:00
Hylke Bons e404d4cf88 fetcher: make Snet repos use client side crypto by default 2012-11-04 17:43:29 +00:00
Hylke Bons 66b37c2270 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 9a916ff267 fetcher: create a different SparkleShare.txt message for encrypted projects 2012-11-02 16:09:05 +00:00
Hylke Bons 85f3e780ac bump version 2012-10-26 23:54:53 +01:00
Hylke Bons c88a0a5a4b setup mac: change the last tutorial page. present link code with copy button 2012-10-26 23:26:15 +01:00
Hylke Bons d79f093996 fetcher git: explicitly set the push strategy. fixes #1035 2012-10-26 13:43:54 +01:00
Hylke Bons 53a42fa3cf 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 e4d8e88deb repo git: cleanups 2012-10-22 21:41:00 +01:00
Hylke Bons 1530c9a9af logger: add exception type to crash dump 2012-10-22 10:03:59 +01:00
Hylke Bons 9601506d31 windows: fix for the .sparkleshare file sometimes not being hidden 2012-10-21 21:16:38 +01:00
Hylke Bons e7a348624c bump version 2012-10-20 23:51:50 +01:00
Hylke Bons c0996c6569 convert tabs to space 2012-10-20 23:25:36 +01:00
Hylke Bons c274e87019 fetcher git: fixes for crypto setup 2012-10-20 23:22:41 +01:00
Hylke Bons 7e1cb40038 windows: fix version number in about dialog. closes #1021 2012-10-20 18:53:31 +01:00
Hylke Bons d80abc3070 fetcher git: fix crypto salt lookup 2012-10-19 23:42:27 +01:00
Hylke Bons 3a8d7bec4f controller: small fix for status icon text not updating sometimes 2012-10-16 22:00:35 +01:00
Hylke Bons 75fe370077 fetcher: hide the .sparkleshare file when done 2012-10-16 22:00:35 +01:00
Hylke Bons 8c7108e83f don't block the event log on initial startup syncs 2012-10-16 22:00:35 +01:00
Hylke Bons 2c94a9938d event log: show the last month worth of changes 2012-10-16 22:00:35 +01:00
Hylke Bons 423717bd1d eventlog: change default size 2012-10-16 22:00:35 +01:00
Hylke Bons f9d867aa58 bump development version 2012-10-16 22:00:34 +01:00
Hylke Bons a20d377192 history: implement back button 2012-10-16 22:00:34 +01:00
Hylke Bons 6f22466eac history: fix some edge cases and general improvements 2012-10-16 22:00:34 +01:00
Hylke Bons ef44b2ccfb make restoring of files work 2012-10-16 22:00:34 +01:00
Hylke Bons da0f3d53a5 early working version of history recycle logic + mac Save As dialog 2012-10-16 22:00:34 +01:00
Hylke Bons 3fb3ad2b31 update Bitbucket logo to their new brand. add sources for other default host icons 2012-10-09 23:12:35 +02:00
Hylke Bons 2d04277a77 eventlog: take user to gravatar.com when clicking on avatars 2012-10-06 13:17:39 +02:00
Hylke Bons a406a0964d fetcher: fix support for http(s) repos. closes #1000 2012-10-05 21:55:57 +02:00
Hylke Bons 786deb4f05 fetcher: simplify some methods 2012-10-04 18:54:16 +02:00
Hylke Bons af740b90a0 eventlog: fix first commit on encrypted repos 2012-09-30 13:07:36 +02:00
Hylke Bons 475b82f43a crypto: use a random salt per repo, store it as a remote branch name 2012-09-29 23:57:35 +02:00
Hylke Bons 8084d07774 fix compile error 2012-09-29 12:35:36 +02:00
Hylke Bons 2696fe6904 tagged 0.9.3 2012-09-29 12:16:27 +02:00
Hylke Bons 4ddb888039 repo: when there was an error syncing up, shorten the poll interval 2012-09-29 12:15:38 +02:00
Hylke Bons 63e5d14258 tagged 1.0 2012-09-29 10:59:48 +02:00
Hylke Bons 2c3bfff432 build: change default install path 2012-09-26 17:06:34 +02:00
Hylke Bons 1933927c76 bump version 2012-09-26 16:54:04 +02:00
Hylke Bons c3b5cbab7c logger: Don't let the debug log get too big 2012-09-23 12:58:33 +01:00
Hylke Bons 9a7b5b8827 repo git: Fix endless loop when adding empty folders. Closes #967 2012-09-23 12:10:51 +01:00
Hylke Bons 1c156b5e5d 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 0286060d9a repo: don't allow multiple syncs at the same time on startup. Fixes #985 2012-09-22 22:43:40 +01:00
Hylke Bons 321efb4384 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 c440b70fa2 Fix bug from too large of commit log (introduced 1c8cffd178). 2012-09-21 19:27:26 -05:00
Hylke Bons 83f08666f2 config: Remove duplicate folders in the rare case they happen. Closes #978 2012-09-21 18:04:55 +01:00
Hylke Bons 8b24b88d60 config: add back folders_path option. Closes #975 2012-09-20 10:33:49 +01:00
Hylke Bons d543c1db4b statusicon: don't show 0% progress and change error message 2012-09-19 19:57:57 +01:00
Hylke Bons cb5617c300 statusicon: On sync fail, add error descriptions as submenus. Closes #874 2012-09-18 19:40:06 +01:00
Hylke Bons 284234514f repo git: set remote.origin.url from config.xml on startup. #972 2012-09-17 11:22:42 +01:00
Hylke Bons 80a5b63595 build: fix warning 2012-09-15 11:22:26 +01:00
Brandon Dahler 2f50b4e2e0 Fix duplicate unconditional calls to AlsoListenToInternal for all channels 2012-09-10 16:18:04 -05:00
Hylke Bons 34ab7d9450 listener: remove some unused code 2012-09-08 10:48:01 +01:00
Hylke Bons 16446ff566 fetcher git: Add .iso to do not compress list 2012-09-08 10:41:08 +01:00
ckoinig 88379f8b87 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 6cbba96963 fetcher: Fix some edge cases on host key check 2012-09-05 14:14:15 +01:00
= 4c9baddc2c Check for empty string, not null 2012-09-05 14:49:34 +02:00
= 616a8e9671 Fix formatting 2012-09-05 14:41:30 +02:00
= 63ab6918ec Take port into account when retrieving SSH host keys 2012-09-05 14:37:31 +02:00
Hylke Bons b8921975f8 listener: Use port 443. See #947 2012-09-03 19:44:36 +01:00
Hylke Bons 3bcd1ed05b Update NEWS and bump version 2012-08-29 13:06:46 +01:00
Hylke Bons f6dc8fb3bb fetcher git: check if git info directory exists before writing to it. Fixes #934 2012-08-27 13:54:22 +01:00
Hylke Bons 65f02bba90 fetcher: Fix freeze on cancel 2012-08-27 13:25:03 +01:00
Hylke Bons 2a24e293d7 Remove some unused references 2012-08-20 10:56:21 +01:00
Hylke Bons 632e9b7e12 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
Hylke Bons de67786f71 Don't include the 'username:password' portion of the URL when generating SparkleShare.txt. Closes #907 2012-08-16 09:51:22 +01:00
Leszek Krupinski 00971c8ddd missing references 2012-08-13 11:22:12 +02:00
Leszek Krupinski d443b1c6a0 Removed unnecessary entries causing warnings 2012-08-13 09:27:42 +02:00
Hylke Bons 18a98dc69b linux ui: change AssetsPath back to static 2012-08-11 23:01:07 +01:00
Hylke Bons 4cac379a2f listener: Fix race condition in channel subscriptions 2012-08-10 20:18:41 +01:00
Hylke Bons ed5074aae0 mac: fix solution file 2012-08-10 19:41:40 +01:00
Hylke Bons ae3495d388 windows: Fix build. Closes #894 2012-08-10 19:04:11 +01:00
Hylke Bons 448599e661 windows: Fix Windows build. Closes #882 2012-08-05 14:23:51 +02:00
Hylke Bons 242ac7819d fetcher: Do fingerprint check in managed code 2012-08-04 20:55:29 +02:00
Hylke Bons e18c72c099 docs: Add howto to repo and use 'storage' as default user 2012-08-04 17:22:34 +02:00
Hylke Bons f9e57dba0a Add backend support for listing history of a file and reverting 2012-08-04 00:32:44 +02:00
Hylke Bons 66e7a67d14 logger: Create crash report in ~/SparkleShare on crashes. 2012-08-01 15:48:07 +02:00
Hylke Bons 4b9e1f5c34 config: remove undocumented 'home_path' option 2012-08-01 15:48:07 +02:00
Hylke Bons 4075967199 Cleanups 2012-07-28 18:13:50 +02:00
Hylke Bons 161bfea8b4 Remove Helpers class, add Logger class 2012-07-28 15:58:09 +02:00
Hylke Bons cf4d6a7811 invites: don't crash on wrong accept urls. Fixes #860 2012-07-27 20:34:43 +02:00
Hylke Bons e2c1bc1a0f config: no need to create 'icons' folder 2012-07-27 13:56:38 +02:00
Hylke Bons 1efff92862 listener factory: Remove protocol type check 2012-07-27 11:55:11 +02:00
Hylke Bons 5e9d260409 Fix log parse logic 2012-07-26 20:17:01 +02:00
Hylke Bons 5290414866 build: cleanup and remove translations 2012-07-26 16:49:03 +02:00
Hylke Bons 2b4843ad24 build: move version number definition to central place, clean up build tools 2012-07-26 15:17:35 +02:00
Hylke Bons 744dcc4483 repo git: Simplify 2012-07-26 12:43:16 +02:00
Hylke Bons 942752f2e9 lib git: simplify process starting 2012-07-26 12:30:00 +02:00
Hylke Bons 351ad0df92 Fix build. Closes #876 2012-07-25 13:28:50 +02:00
Hylke Bons 687cbd4b60 lib: Check if we're in the middle on a rebase on startup, if so: abort 2012-07-25 11:41:51 +02:00
Hylke Bons afd894ac50 Revert master watcher 2012-07-25 11:25:52 +02:00
Hylke Bons 63eaf5daa5 Code cleanup 2012-07-25 10:01:31 +02:00
Hylke Bons 0b500c3ef4 fetcher: code cleanup 2012-07-22 22:54:59 +02:00
Hylke Bons ce844af1ee Disable git-bin by default 2012-07-22 20:59:51 +02:00
Hylke Bons 7d9e963c73 lib: Code cleanup 2012-07-22 11:51:56 +02:00
Hylke Bons 471be2cd9f repo git: code cleanup 2012-07-22 11:40:49 +02:00
Hylke Bons 126d696d5a repo: move changeset list creation logic to base class 2012-07-19 22:21:38 +02:00
Hylke Bons 32848f8772 repo: simplify remote timer check 2012-07-19 22:05:29 +02:00
Hylke Bons 437cfbe1e1 eventlog: Fix some occasions where the spinner doesn't appear. 2012-07-18 23:31:50 +02:00
Matthias Dittrich 0887aff38d fixes windows build 2012-07-18 15:40:29 +02:00