Commit graph

1017 commits

Author SHA1 Message Date
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
Hylke Bons f3784ddc98 lib: code cleanup 2012-07-18 14:51:09 +02:00
Hylke Bons 78e96474b2 Remove event handling boilerplate everywhere 2012-07-18 13:09:37 +02:00
Hylke Bons e0949ae082 windows: Remove SparkleShare folder migration code 2012-07-17 22:45:33 +02:00
Hylke Bons 2ca2c12475 controller: Code cleanups 2012-07-17 22:14:58 +02:00
Hylke Bons accf447456 git: Use the same Unicode form on all filesystems. Closes #478 2012-07-15 21:01:06 +02:00
Hylke Bons 7fb8cc587f mac invites: don't check certificate 2012-07-15 15:59:04 +02:00
Hylke Bons dde10d33da watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons da15d03621 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons e61e33b47f repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons f67df255d4 repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons f5b0af6e54 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons 0514d3963f config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons eaead8c87d Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons 64bb74f06e Merge branch 'master' into about 2012-07-13 14:20:10 +02:00
Hylke Bons ed190db27b 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 29eaffc6d4 config: Don't accept null values as identifiers 2012-07-11 22:31:45 +02:00
Hylke Bons 165181c009 config: Adjust coding style of last commit 2012-07-10 22:13:18 +02:00
Matthias Dittrich 63eb793abc Fixed a NullreferenceException on startup #844 2012-07-10 16:25:20 +02:00
Hylke Bons ca22672842 Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons f209602f3a Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons a7d926b6fa fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons afe0a0c5fd fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons ec2f5f36a2 Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons c769f6c7a8 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons b87b642742 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Matthias Dittrich 404ee662ac Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons 22fcca2fac lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons c03bbc2fa1 repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons 9692ca655e repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons aeafa39c0d repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons f28dfd0318 repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons a7b0e775e0 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00
Hylke Bons b3040b5276 repo git: Remove some redundant lines 2012-07-03 09:59:18 +02:00
Matthias Dittrich 288317a8bb Now filesnames with special chars will be written properly in the comments 2012-07-03 09:59:18 +02:00
Matthias Dittrich 0b7fa8a193 Tried to set stylecop to match the project code style 2012-07-03 09:59:18 +02:00
Hylke Bons aa9af2c094 lib git: Run commit with --all and deduplicate code somewhat 2012-07-03 09:59:18 +02:00
Hylke Bons ef196d00b8 repo git: Fix coding style for #823 2012-07-03 09:59:17 +02:00
Matthias Dittrich 0be8c17a05 Found another place where the Utf8-fix is required 2012-07-03 09:59:17 +02:00
Matthias Dittrich 02487a466b Sparkle can now handle files with special characters 2012-07-03 09:59:17 +02:00
Hylke Bons 91fdb44445 lib git: Clear git-bin cache after sync 2012-06-29 21:43:49 +01:00
Hylke Bons 865525dee2 lib git: only do remote_url check when needed 2012-06-29 17:08:12 +01:00
Hylke Bons 9dc0b6af5b lib git: Add detection of git-bin repos 2012-06-29 16:44:02 +01:00
Hylke Bons efccc2c1c3 fetcher git: Refactor 2012-06-29 14:00:25 +01:00
Hylke Bons 8470b06a01 fetcher git: Simplify attributes file creation 2012-06-29 13:17:59 +01:00
Hylke Bons a4718cf100 fetcher git: Simplify install of config after clone 2012-06-29 12:53:13 +01:00
Hylke Bons 799314ceee lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess 2012-06-29 00:12:37 +01:00
Hylke Bons a0b3c101d9 repo: Fix some cases where the remote timer isn't resumed 2012-06-29 00:11:25 +01:00
Hylke Bons 4bef356142 repo git: hide .sparkleshare and .empty after a rebase. Fixes #814 2012-06-28 14:21:33 +01:00
Hylke Bons 1b04fda8f7 fetcher git: don't read output on checkout and add --quiet option 2012-06-28 12:18:00 +01:00
Hylke Bons 5ee72e37f5 fetcher: Always delete the tmp host key file after getting its fingerprint 2012-06-28 12:03:04 +01:00
Hylke Bons 744d4f2ffa fetcher: put quotes around host key file path. Fixes #815 2012-06-28 11:57:10 +01:00
Hylke Bons 22698aa00b config: change debug log file name 2012-06-27 13:12:04 +01:00
Hylke Bons 349410927a repo git: don't resolve conflicts on the .sparkleshare file. See #807 2012-06-27 00:13:17 +01:00
Hylke Bons 2f847093c4 windows: bump version number 2012-06-25 22:55:43 +01:00
Hylke Bons 330e80c22b repo git: reuse git objects 2012-06-24 23:20:45 +01:00
Hylke Bons 4bee67b3d5 git: return to setting author on local repository, specifying in the command causes issues. Fixes #678 2012-06-24 19:14:52 +01:00
Hylke Bons 4c945e5611 lib: add folder name to debug info for each git call. Closes #796 2012-06-21 17:58:07 +01:00
Hylke Bons e72b3828d1 linux: fix build 2012-06-19 15:59:54 +01:00
Hylke Bons 090a34a3c7 lib git: treat merge commits like any other commit 2012-06-19 10:54:46 +01:00
Hylke Bons 142e0b46a1 Remove some unused code 2012-06-19 10:43:30 +01:00
Hylke Bons ace1fb2c40 setup: show raw (git) error message on failed add 2012-06-17 22:57:15 +01:00
Hylke Bons 6d796f35bf make 2012-06-17 21:56:27 +01:00
Hylke Bons 37b94b23bf mac eventlog: make window resizable 2012-06-17 00:24:30 +01:00
Hylke Bons 7ceb17907d Simplify command line argument parsing 2012-06-15 13:08:13 +01:00
Hylke Bons 07c4d271e3 Allow apostrophes and single quotes in folder names, but don't allow double quotes. Fixes #787 2012-06-14 13:54:59 +01:00
Hylke Bons febd993f29 Refactor adding of (empty) repos. Fixes #773 2012-06-10 23:56:39 +01:00
Hylke Bons 19b7250b61 repo: more cleanup 2012-06-10 11:57:31 +01:00
Hylke Bons fccb790a2d repo: Simplify watch toggling mechanism 2012-06-10 11:03:03 +01:00
Hylke Bons c99e57ea74 repo: Simplify local change detection code using a single thread 2012-06-10 01:16:28 +01:00
Hylke Bons fe3f28d7c4 Tweak some debug output 2012-06-09 16:27:34 +01:00
Carlos Martín Nieto a7e24dc3aa SparkleLib: Use rev-parse HEAD to determine latest commit
While `git log -1 --format=%H` does show the same data, it needs to
start up the revision walking machinery just to show the latest
commit's hash. `git rev-parse HEAD` tells us this commit's hash
without doing all the extra work.
2012-06-07 15:42:59 +02:00
Hylke Bons be1fbdc928 listener: set port 80 as the default 2012-05-28 00:51:37 +01:00
Hylke Bons 52e3e78d2f Only fetch gravatars once, fix some UI blocking 2012-05-28 00:14:45 +01:00
Hylke Bons 43703b94f8 repo git: only squash commits by the same person 2012-05-28 00:14:00 +01:00
Hylke Bons 32735aa730 Remove unneeded reference 2012-05-27 19:25:14 +01:00
Hylke Bons e1c16f0f5f eventlog: sort changes by timestamp, not type 2012-05-27 19:24:12 +01:00
Hylke Bons 9a7e1eaee1 setup: Fix page logic 2012-05-20 17:16:14 +01:00
Hylke Bons 6a0ee9ed63 listener tcp: Catch more exceptions and increase poll/ping interval. Fixes #734 2012-05-20 14:28:14 +01:00
Hylke Bons ea432c32e8 repo git: catch exceptions creating .empty files. Fixes #733 2012-05-20 12:51:09 +01:00
Hylke Bons 23a31230a4 repo: fix whitespace 2012-05-19 16:17:09 +01:00
Hylke Bons 1a97616e38 repo: Fix edge case where ID may be empty 2012-05-19 16:15:20 +01:00
Hylke Bons d149d9dce8 Fix crashes with unavailable notification service 2012-05-14 23:35:59 +01:00
Hylke Bons 07eda17fa6 fetcher base: be more specific about ignoring OS X's Icon files 2012-05-14 21:34:16 +01:00
Hylke Bons 9800bcf421 Cache changesets in the backend 2012-04-29 15:19:36 +01:00
Hylke Bons 06246c0ebf mac: Remove unused graphic from project 2012-04-28 17:19:21 +01:00
Hylke Bons 921d66baa6 Merge branch 'http' 2012-04-28 09:51:41 +01:00
Hylke Bons b2ce29f5f2 Remove some debug rules used for crypto feature 2012-04-26 18:48:18 +01:00
Hylke Bons 8ee99fa5a0 fetcher git: override global git crlf settings. prevents some sync loops 2012-04-26 18:32:57 +01:00
Hylke Bons b230d14d4a Add SparkleShare.txt and .sparkleshare in a single commit 2012-04-26 16:02:59 +02:00
Hylke Bons b087fde663 Implement encryption using OpenSSL's AES + Mac UI 2012-04-26 16:02:58 +02:00
Hylke Bons 7c502e9b20 fetcher git: accept HTTP(S) addresses 2012-04-26 14:58:05 +02:00
Luke Fitzgerald da0c7f572e Allow paths containing spaces 2012-04-26 01:34:28 +01:00
Hylke Bons d2616beba3 windows lib: Put back reference for #705 2012-04-19 14:59:04 +02:00
Hylke Bons 4089059f6d windows lib: always use latest .NET version. Fixes #705 2012-04-19 14:20:01 +02:00
Hylke Bons a7884fc1f1 config: return HomePath enum directly. #705 2012-04-18 16:33:48 +02:00
Hylke Bons 1dd617648a fetcher git: also dispose git process on dispose 2012-04-18 11:52:45 +02:00
Hylke Bons 145e8fe01d repo git: Don't follow symlinks when preparing the tree. Fixes #701 2012-04-17 19:00:05 +02:00
Hylke Bons 5829bf4622 git: write error outputs to the debug.log for easier debugging 2012-04-17 11:05:51 +02:00
Hylke Bons d542f3e75a repo git: quote urls to allow push/pull with urls that contain spaces. Fixes #703 2012-04-16 23:26:33 +02:00
Hylke Bons f67b0c8141 fetcher: Add exclude rule for *.autosave files 2012-04-16 23:26:33 +02:00
Hylke Bons 37f8e050c6 config: allow to specify a custom path for each folder. Closes #680 2012-04-15 19:03:36 +02:00
Hylke Bons 508092e0f1 config: remove old and unused methods 2012-04-15 16:58:39 +02:00
Hylke Bons 5f137ff0e3 fetcher: more friendly message about the accepted host key 2012-04-15 12:35:17 +02:00
Hylke Bons 192779a1b7 repo git: on conflicts, put timestamp before file extension. Fixes #699 2012-04-15 11:50:03 +02:00
Hylke Bons 06b821a3a3 Verify known host fingerprints and warn about new ones 2012-04-13 00:44:31 +02:00
Hylke Bons 28734203c6 fetcher: Fix some url creations errors 2012-04-11 23:10:02 +02:00
Hylke Bons 7a6d80b9dc fetcher: don't add duplicates to known_hosts 2012-04-11 21:31:18 +02:00
Hylke Bons d79408dc79 Manually add host key to know_hosts, don't mess with the user's SSH config. Closes #497 2012-04-11 20:07:34 +02:00
Hylke Bons bf45b91ddc fetcher: Close on cancel too 2012-04-11 13:04:42 +02:00
Hylke Bons 6ae0ca58b2 fetcher: Add debug info for #692 2012-04-11 12:51:53 +02:00
Hylke Bons 19aed69038 config: Remove commented out code 2012-04-11 12:03:34 +02:00
Hylke Bons 9ccc9e6a08 repo git: add debug info for #677 2012-04-10 23:19:33 +02:00
Hylke Bons 12a4aa5e1b windows: add missing source file to fix build 2012-04-05 13:57:50 +01:00
Hylke Bons 8fc30c7d0f repo: basic support for quota detection 2012-04-04 23:45:20 +01:00
Hylke Bons e1a1ab7396 Add option to add projects without full history (git: --depth=1) 2012-03-29 01:44:26 +01:00
Hylke Bons 993d3b1302 repo git: don't hang on large rebase outputs. Should fix #663 2012-03-28 23:11:41 +01:00
Hylke Bons e8903492e7 Use .sparkleshare file for the repo ID, instad of the first commit hash 2012-03-26 00:41:52 +01:00
Hylke Bons 2227d82c33 fetcher: add exclude rule for LibreOffice lock files 2012-03-22 21:10:43 +00:00
Tijl Vercaemer fd8fd378b9 Added System.Xml reference to SparkleLib 2012-03-21 12:34:48 +01:00
Hylke Bons bbcb5db1db repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:26:47 +00:00
Hylke Bons 608b4110b6 repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:20:28 +00:00
Hylke Bons 1ea243c76f windows: set version manually 2012-03-18 20:16:52 +00:00
Travis Glenn Hansen 582a6b5c1f fixing HomePath on linux 2012-03-17 17:15:35 -06:00
Hylke Bons e91de7f442 listener tcp: catch some potential exceptions 2012-03-17 19:16:53 +00:00
Hylke Bons 12b27f3eb2 windows setup: Reverse button order 2012-03-17 01:44:27 +00:00
Hylke Bons 5ca7cc147a mac: Fix build 2012-03-16 18:42:13 +00:00
Hylke Bons 301e671747 repo: Fix false 'Not everything is synced' messages after succesful conflict resolution 2012-03-16 01:53:23 +00:00
Hylke Bons daf4818cc2 remove some TODOs 2012-03-15 23:54:18 +00:00
Hylke Bons 85bec2210a windows: Add migration code to use ~/SparkleShare instead of ~/My Documents/SparkleShare 2012-03-15 03:56:10 +00:00
Hylke Bons a1d5054af4 setup controller: refactor some order logic. Fixes #627 #630 2012-03-14 03:26:42 +00:00
Hylke Bons 82a88cb504 listener tcp: don't ping anymore when we've disconnected but haven't noticed. Fixes #629 2012-03-13 18:07:03 +00:00