Commit graph

843 commits

Author SHA1 Message Date
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
Matthias Dittrich dc21e9a285 Now filesnames with special chars will be written properly in the comments 2012-07-03 09:59:18 +02:00
Matthias Dittrich 583f13c8ff Tried to set stylecop to match the project code style 2012-07-03 09:59:18 +02:00
Hylke Bons bb2a6b8662 lib git: Run commit with --all and deduplicate code somewhat 2012-07-03 09:59:18 +02:00
Hylke Bons 4ab153eb1f repo git: Fix coding style for #823 2012-07-03 09:59:17 +02:00
Matthias Dittrich b02d57d727 Found another place where the Utf8-fix is required 2012-07-03 09:59:17 +02:00
Matthias Dittrich c5c63636e2 Sparkle can now handle files with special characters 2012-07-03 09:59:17 +02:00
Hylke Bons 618b0b520c lib git: Clear git-bin cache after sync 2012-06-29 21:43:49 +01:00
Hylke Bons 8df73d9bee lib git: only do remote_url check when needed 2012-06-29 17:08:12 +01:00
Hylke Bons e320edfb7f lib git: Add detection of git-bin repos 2012-06-29 16:44:02 +01:00
Hylke Bons eb543fef5e fetcher git: Refactor 2012-06-29 14:00:25 +01:00
Hylke Bons a2353405dd fetcher git: Simplify attributes file creation 2012-06-29 13:17:59 +01:00
Hylke Bons 7ebc93f40e fetcher git: Simplify install of config after clone 2012-06-29 12:53:13 +01:00
Hylke Bons a3d60412ee lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess 2012-06-29 00:12:37 +01:00
Hylke Bons 7896abfcdf repo: Fix some cases where the remote timer isn't resumed 2012-06-29 00:11:25 +01:00
Hylke Bons 063b38ff28 repo git: hide .sparkleshare and .empty after a rebase. Fixes #814 2012-06-28 14:21:33 +01:00
Hylke Bons 8f95a38e26 fetcher git: don't read output on checkout and add --quiet option 2012-06-28 12:18:00 +01:00
Hylke Bons 3bf2cf56e9 fetcher: Always delete the tmp host key file after getting its fingerprint 2012-06-28 12:03:04 +01:00
Hylke Bons 9a5373fe42 fetcher: put quotes around host key file path. Fixes #815 2012-06-28 11:57:10 +01:00
Hylke Bons 0725729f7f config: change debug log file name 2012-06-27 13:12:04 +01:00
Hylke Bons c957a97296 repo git: don't resolve conflicts on the .sparkleshare file. See #807 2012-06-27 00:13:17 +01:00
Hylke Bons 4daf76f85e windows: bump version number 2012-06-25 22:55:43 +01:00
Hylke Bons 9538781dd3 repo git: reuse git objects 2012-06-24 23:20:45 +01:00
Hylke Bons 15bd9d77a4 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 4a6a0c5dbb lib: add folder name to debug info for each git call. Closes #796 2012-06-21 17:58:07 +01:00
Hylke Bons 4e0ee26e35 linux: fix build 2012-06-19 15:59:54 +01:00
Hylke Bons 6569ae6200 lib git: treat merge commits like any other commit 2012-06-19 10:54:46 +01:00
Hylke Bons f28fd55fdc Remove some unused code 2012-06-19 10:43:30 +01:00
Hylke Bons c17ad92a73 setup: show raw (git) error message on failed add 2012-06-17 22:57:15 +01:00
Hylke Bons 10c6e2f5b3 make 2012-06-17 21:56:27 +01:00
Hylke Bons 3cd210d44c mac eventlog: make window resizable 2012-06-17 00:24:30 +01:00
Hylke Bons a7ab23da72 Simplify command line argument parsing 2012-06-15 13:08:13 +01:00
Hylke Bons febc13d4f4 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 1720984e5a Refactor adding of (empty) repos. Fixes #773 2012-06-10 23:56:39 +01:00
Hylke Bons 92fdcbec17 repo: more cleanup 2012-06-10 11:57:31 +01:00
Hylke Bons e0ee50d392 repo: Simplify watch toggling mechanism 2012-06-10 11:03:03 +01:00
Hylke Bons 0a01b90a32 repo: Simplify local change detection code using a single thread 2012-06-10 01:16:28 +01:00
Hylke Bons a51e30e486 Tweak some debug output 2012-06-09 16:27:34 +01:00
Carlos Martín Nieto 896abe97da 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 e42344256f listener: set port 80 as the default 2012-05-28 00:51:37 +01:00
Hylke Bons 3a30a62654 Only fetch gravatars once, fix some UI blocking 2012-05-28 00:14:45 +01:00
Hylke Bons b8743236cd repo git: only squash commits by the same person 2012-05-28 00:14:00 +01:00
Hylke Bons 5388621033 Remove unneeded reference 2012-05-27 19:25:14 +01:00
Hylke Bons 0280f7481e eventlog: sort changes by timestamp, not type 2012-05-27 19:24:12 +01:00
Hylke Bons 47b7c4fcd7 setup: Fix page logic 2012-05-20 17:16:14 +01:00
Hylke Bons 9068b02ee7 listener tcp: Catch more exceptions and increase poll/ping interval. Fixes #734 2012-05-20 14:28:14 +01:00
Hylke Bons 900130bf8b repo git: catch exceptions creating .empty files. Fixes #733 2012-05-20 12:51:09 +01:00
Hylke Bons 106dc4ece3 repo: fix whitespace 2012-05-19 16:17:09 +01:00
Hylke Bons 6dd657a086 repo: Fix edge case where ID may be empty 2012-05-19 16:15:20 +01:00
Hylke Bons ca0ffda638 Fix crashes with unavailable notification service 2012-05-14 23:35:59 +01:00
Hylke Bons b236806a83 fetcher base: be more specific about ignoring OS X's Icon files 2012-05-14 21:34:16 +01:00
Hylke Bons 2302b31f6f Cache changesets in the backend 2012-04-29 15:19:36 +01:00
Hylke Bons 5ad0168717 mac: Remove unused graphic from project 2012-04-28 17:19:21 +01:00
Hylke Bons aa5092f672 Merge branch 'http' 2012-04-28 09:51:41 +01:00
Hylke Bons 31efab0974 Remove some debug rules used for crypto feature 2012-04-26 18:48:18 +01:00
Hylke Bons 2f6431f193 fetcher git: override global git crlf settings. prevents some sync loops 2012-04-26 18:32:57 +01:00
Hylke Bons ede2f02274 Add SparkleShare.txt and .sparkleshare in a single commit 2012-04-26 16:02:59 +02:00
Hylke Bons 0c7cc6d4e2 Implement encryption using OpenSSL's AES + Mac UI 2012-04-26 16:02:58 +02:00
Hylke Bons a85954d15e fetcher git: accept HTTP(S) addresses 2012-04-26 14:58:05 +02:00
Luke Fitzgerald 802bf0b615 Allow paths containing spaces 2012-04-26 01:34:28 +01:00
Hylke Bons 34dfbdc16e windows lib: Put back reference for #705 2012-04-19 14:59:04 +02:00
Hylke Bons 53cb859cd8 windows lib: always use latest .NET version. Fixes #705 2012-04-19 14:20:01 +02:00
Hylke Bons 7340558a78 config: return HomePath enum directly. #705 2012-04-18 16:33:48 +02:00
Hylke Bons bd8c9a3dbb fetcher git: also dispose git process on dispose 2012-04-18 11:52:45 +02:00
Hylke Bons 9ec482b3d3 repo git: Don't follow symlinks when preparing the tree. Fixes #701 2012-04-17 19:00:05 +02:00
Hylke Bons 1981705100 git: write error outputs to the debug.log for easier debugging 2012-04-17 11:05:51 +02:00
Hylke Bons 54bc9cbe6c 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 d24cec58c2 fetcher: Add exclude rule for *.autosave files 2012-04-16 23:26:33 +02:00
Hylke Bons 3255f1b818 config: allow to specify a custom path for each folder. Closes #680 2012-04-15 19:03:36 +02:00
Hylke Bons a3f67b39e1 config: remove old and unused methods 2012-04-15 16:58:39 +02:00
Hylke Bons bf5f542a11 fetcher: more friendly message about the accepted host key 2012-04-15 12:35:17 +02:00
Hylke Bons 6acf096735 repo git: on conflicts, put timestamp before file extension. Fixes #699 2012-04-15 11:50:03 +02:00
Hylke Bons 7017bbcf01 Verify known host fingerprints and warn about new ones 2012-04-13 00:44:31 +02:00