Commit graph

1015 commits

Author SHA1 Message Date
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
Hylke Bons 02f23e39a3 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 1f0635caf0 missing references 2012-08-13 11:22:12 +02:00
Leszek Krupinski c592fb9016 Removed unnecessary entries causing warnings 2012-08-13 09:27:42 +02:00
Hylke Bons 0b4c4851c8 linux ui: change AssetsPath back to static 2012-08-11 23:01:07 +01:00
Hylke Bons ab063024d9 listener: Fix race condition in channel subscriptions 2012-08-10 20:18:41 +01:00
Hylke Bons 1f00cdceae mac: fix solution file 2012-08-10 19:41:40 +01:00
Hylke Bons e7e3b8603f windows: Fix build. Closes #894 2012-08-10 19:04:11 +01:00
Hylke Bons ded0595335 windows: Fix Windows build. Closes #882 2012-08-05 14:23:51 +02:00
Hylke Bons ef4808d21c fetcher: Do fingerprint check in managed code 2012-08-04 20:55:29 +02:00
Hylke Bons e8f645147e docs: Add howto to repo and use 'storage' as default user 2012-08-04 17:22:34 +02:00
Hylke Bons c65e800d2e Add backend support for listing history of a file and reverting 2012-08-04 00:32:44 +02:00
Hylke Bons 1b8b4dd130 logger: Create crash report in ~/SparkleShare on crashes. 2012-08-01 15:48:07 +02:00
Hylke Bons af1bad7db6 config: remove undocumented 'home_path' option 2012-08-01 15:48:07 +02:00
Hylke Bons 0109856700 Cleanups 2012-07-28 18:13:50 +02:00
Hylke Bons c9e4218358 Remove Helpers class, add Logger class 2012-07-28 15:58:09 +02:00
Hylke Bons 9fdcb49bb0 invites: don't crash on wrong accept urls. Fixes #860 2012-07-27 20:34:43 +02:00
Hylke Bons f79dcfaea6 config: no need to create 'icons' folder 2012-07-27 13:56:38 +02:00
Hylke Bons 4c6ffeac87 listener factory: Remove protocol type check 2012-07-27 11:55:11 +02:00
Hylke Bons b4126d11b1 Fix log parse logic 2012-07-26 20:17:01 +02:00
Hylke Bons 5fddddbe21 build: cleanup and remove translations 2012-07-26 16:49:03 +02:00
Hylke Bons e17cda8a38 build: move version number definition to central place, clean up build tools 2012-07-26 15:17:35 +02:00
Hylke Bons ff89044289 repo git: Simplify 2012-07-26 12:43:16 +02:00
Hylke Bons a90390b22f lib git: simplify process starting 2012-07-26 12:30:00 +02:00
Hylke Bons 6ced798b3f Fix build. Closes #876 2012-07-25 13:28:50 +02:00
Hylke Bons 34edbbb99e 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 25e8da9308 Revert master watcher 2012-07-25 11:25:52 +02:00
Hylke Bons a2fb7e163c Code cleanup 2012-07-25 10:01:31 +02:00
Hylke Bons 5bef8dd3cc fetcher: code cleanup 2012-07-22 22:54:59 +02:00
Hylke Bons 1d8e8eb810 Disable git-bin by default 2012-07-22 20:59:51 +02:00
Hylke Bons c53e46ef3e lib: Code cleanup 2012-07-22 11:51:56 +02:00
Hylke Bons d1eba721ca repo git: code cleanup 2012-07-22 11:40:49 +02:00
Hylke Bons d812c4c146 repo: move changeset list creation logic to base class 2012-07-19 22:21:38 +02:00
Hylke Bons 36e5658783 repo: simplify remote timer check 2012-07-19 22:05:29 +02:00
Hylke Bons 40733499c0 eventlog: Fix some occasions where the spinner doesn't appear. 2012-07-18 23:31:50 +02:00
Matthias Dittrich 2427ebf395 fixes windows build 2012-07-18 15:40:29 +02:00
Hylke Bons e8af571c2b lib: code cleanup 2012-07-18 14:51:09 +02:00
Hylke Bons 570fe54927 Remove event handling boilerplate everywhere 2012-07-18 13:09:37 +02:00
Hylke Bons 1f63703dc1 windows: Remove SparkleShare folder migration code 2012-07-17 22:45:33 +02:00
Hylke Bons 6072f3177c controller: Code cleanups 2012-07-17 22:14:58 +02:00
Hylke Bons 3bd2630a13 git: Use the same Unicode form on all filesystems. Closes #478 2012-07-15 21:01:06 +02:00
Hylke Bons 68ac16e831 mac invites: don't check certificate 2012-07-15 15:59:04 +02:00
Hylke Bons 9fa9beb389 watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons 8232877438 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons 0839657282 repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons 2d8a02692a repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons e7cea2bff6 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons 2fca926b8d config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons 3496bfba75 Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons ce3ddd919e Merge branch 'master' into about 2012-07-13 14:20:10 +02:00
Hylke Bons 0a9061f6fb repo: send Idle event when there are no changes after activities have settled. Fixes #850 2012-07-13 14:19:46 +02:00
Hylke Bons 17951d6536 config: Don't accept null values as identifiers 2012-07-11 22:31:45 +02:00
Hylke Bons aafb6ec1f3 config: Adjust coding style of last commit 2012-07-10 22:13:18 +02:00
Matthias Dittrich 089430589e Fixed a NullreferenceException on startup #844 2012-07-10 16:25:20 +02:00
Hylke Bons ed3c86e067 Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons e58bd78148 Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons 430b7f7a4b fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons 77a15ab64c fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons 2122b79ab5 Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons d244f12459 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons 201a753c41 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Matthias Dittrich 49fd14ebdb Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons aa87519cc6 lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons 08649a9aae repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons 34376dacf8 repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons cf84864911 repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons e439d53a7b repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons 1c8cffd178 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00
Hylke Bons 62c7a797f9 repo git: Remove some redundant lines 2012-07-03 09:59:18 +02:00