Commit graph

738 commits

Author SHA1 Message Date
Hylke Bons 758bfe62a9 Point to the right location for the avatars on Linux 2012-02-23 01:30:28 +01:00
Hylke Bons 135e2fe73f Fix Linux build 2012-02-19 21:33:25 +01:00
Hylke Bons 19797fdc5f fetcher: always finish the progress reporting animation smoothly to 100% 2012-02-18 23:16:25 +01:00
Hylke Bons 8bed56d707 invites: upload the user's pubkey on invite accept 2012-02-17 21:26:13 +01:00
Hylke Bons 5de4491892 fetcher git: add FIXME 2012-02-17 02:48:41 +01:00
Hylke Bons b854161542 Merge branch 'invites' 2012-02-17 00:52:24 +01:00
Hylke Bons 4d3f1a6e85 repo git: adjust commit message for notes 2012-02-16 22:43:41 +01:00
Hylke Bons 41ea97c927 repo: don't recurse into first .git folder 2012-02-14 20:34:03 +01:00
Hylke Bons 77add3df11 Refactor the invite system, warn if cloning's taking place already 2012-02-12 22:25:20 +01:00
serras 8ed2523812 Update projects to use new files 2012-02-12 16:51:28 +01:00
serras e2e706dc6a Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons 3991e25fcc listener: rename some methods 2012-02-11 20:23:38 +01:00
Hylke Bons fc5a0427ec event log: remove '.empty' files from rename entries of folders 2012-02-11 14:29:23 +01:00
Hylke Bons f38950d91c listener tcp: fix some small issues 2012-02-10 14:26:33 +01:00
Hylke Bons 2c98cf1acd listener tcp: Improve reconnect logic to work in after system sleeps and handle more errors 2012-02-09 23:43:47 +01:00
Hylke Bons f2a89c29df repo: Fix compile error. Closes #571 2012-02-09 12:54:23 +01:00
Hylke Bons f2b9e7bce7 More cleanup of SparkleLib API 2012-02-09 02:46:25 +01:00
Hylke Bons 3370a283ea Clean up SparkleLib API 2012-02-08 20:42:29 +01:00
Hylke Bons 6844d320fd Remove outdated help/ and man/ 2012-02-08 13:30:46 +01:00
Hylke Bons 9f55680a6a Merge branch 'disconnect'. Fixes #508
Conflicts:
	SparkleLib/SparkleListenerBase.cs
	SparkleLib/SparkleListenerTcp.cs
2012-02-08 02:24:02 +01:00
Hylke Bons bed669fd77 listener: detect when system has woken up from sleep. disconnect when that happens 2012-02-08 02:17:34 +01:00
Hylke Bons e9373b87d5 Fix ping on timeout. Fixes broken reconnect 2012-02-08 01:44:56 +01:00
Hylke Bons 7a0527b7a7 repo: change CheckForRemoteChanges method to HasRemoteChanges property 2012-02-06 15:02:41 +01:00
Hylke Bons e706079ed1 repo: set stricter access rights for members 2012-02-06 14:58:43 +01:00
Hylke Bons e50ad79f92 Remove SparkleBackend crap 2012-02-06 14:43:31 +01:00
Hylke Bons 121bb3e320 Clean up and remove unneeded references 2012-02-06 14:11:08 +01:00
Hylke Bons f02e5e9e97 remove unneeded file SparkleOptions.cs 2012-02-06 13:48:16 +01:00
Hylke Bons fc09a1e6da listener: move classes to separate files 2012-02-06 13:45:20 +01:00
Hylke Bons c43abafdab listener factory: allow setting of a global notification service for all the folders 2012-02-06 13:33:00 +01:00
Hylke Bons aa82b3441f listener: update comments 2012-02-06 12:54:04 +01:00
Hylke Bons 873f2deee8 listener: add some comments and cleanups 2012-02-05 23:05:47 +01:00
Hylke Bons d437b1a5a1 tcp listener: remove some unneeded references 2012-02-05 23:00:28 +01:00
Hylke Bons 19ba407129 Add some debug output 2012-02-05 22:28:06 +01:00
serras ba7049c818 Solved issues when compiling in Windows latest version
Change executable output to Windows so no command line is shown
Remove version from SparkleShare setup name
2012-02-05 19:50:38 +01:00
serras d096c39e5d Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons d8bc1c5163 windows: don't show terminal window when running commands 2012-02-05 12:05:47 +01:00
Hylke Bons 2097daee79 listener: fix potential endless loop 2012-02-01 22:17:48 +00:00
Hylke Bons 68934067a9 listener: Use ping mechanism through te socked, instead of an external one 2012-02-01 22:04:58 +00:00
Hylke Bons 17fc8fa920 listener: Rework disconnect algorithm 2012-02-01 16:28:57 +00:00
Hylke Bons 31545c5f12 listener: more code cleanup 2012-01-31 23:27:13 +00:00
Hylke Bons c50f5c62a9 listener: more code cleanup 2012-01-31 23:23:52 +00:00
Hylke Bons 343fdba74b listener: more code cleanup 2012-01-31 23:08:23 +00:00
Hylke Bons 93f0bf3ee6 listener: code cleanup 2012-01-31 22:39:09 +00:00
Hylke Bons 5c32eb370f fetcher: move exclude rules to base class. Closes #564 2012-01-31 21:30:23 +00:00
Hylke Bons 8cc50596e9 controller: fix repo loading 2012-01-29 20:33:12 +00:00
Hylke Bons 5fad84ed8e fetcher git: fix type. Closes #565 2012-01-29 18:12:43 +00:00
Hylke Bons 716f5b1f27 event log: show repo url upon hovering of the folder name. Closes #544 2012-01-27 00:52:56 +00:00
Hylke Bons 8695c6c0b7 git: always get the url to use from the config.xml. Closes #556 2012-01-25 18:30:57 +00:00
praktikant 76360b1819 adapted coding style 2012-01-24 14:46:57 +01:00
praktikant a37a041018 Fixing #298 again first try 2012-01-24 10:47:46 +01:00
Hylke Bons 5ef5107b62 Allow ports to be specified once again. Fixes #555 2012-01-23 23:50:54 +00:00
serras b0242d94d1 Specify icon for SparkleShare executable
Remove dependency on SmartIrc lib
Fix bug with Icon.resx file
2012-01-22 19:44:30 +01:00
serras a06e58b582 Merge branch 'master' into gettext-cs 2012-01-22 19:19:19 +01:00
Hylke Bons 03596ed073 git: remove unneeded reference 2012-01-22 17:29:14 +00:00
Hylke Bons 01a465d724 mac: set the --exec-path when calling the bundled git 2012-01-22 17:17:36 +00:00
serras 69829cb547 Make it compile again in Windows 2012-01-19 20:21:48 +01:00
serras 8eedf5b148 Merge branch 'master' into gettext-cs 2012-01-19 20:04:49 +01:00
Hylke Bons 1bf440872e repo: Cache folder sizes and update them after a sync. Closes #535 2012-01-18 23:21:09 +00:00
Hylke Bons b734569abe repo: Add Initialize method for lengthy ctor operations 2012-01-18 16:59:44 +00:00
Hylke Bons fb82977b97 config: remove more DebugInfo calls 2012-01-18 13:33:31 +00:00
Hylke Bons c0d5e4f6ea config: don't write any debug output, as DebugInfo method requires a working config 2012-01-18 13:03:23 +00:00
Hylke Bons 994ccbb07b fetcher git: Add some memory limiting settings to the config. Closes #519 2012-01-18 01:50:47 +00:00
Hylke Bons 5267138693 git: Only parse the first 250 files per commit, prevents huge resource consumption. Fixes #500 2012-01-18 00:44:15 +00:00
Hylke Bons 6136730fab git config: Add a tab before options 2012-01-17 01:08:26 +00:00
Hylke Bons 38e8db9e70 git put SparkleGit class in its own file 2012-01-16 20:23:12 +00:00
Hylke Bons be9f264492 git: Don't turn git repos into submodules, add only the checkout, not the database. Closes #335 2012-01-16 19:58:25 +00:00
Hylke Bons 7440445104 fetcher git: ignore Mercurial and Bazaar databases 2012-01-16 19:57:11 +00:00
Hylke Bons 03db2a2f09 repo: Move progress interval logic to base class 2012-01-15 23:45:17 +00:00
serras 81a7c81750 Merge branch 'master' into gettext-cs 2012-01-14 11:21:53 +01:00
Hylke Bons a7ac3b0097 fetcher git: make url parsing more readable by using the Uri object 2012-01-13 23:47:19 +00:00
Hylke Bons dc0167a300 helpers: only allow one thread to write to the log at a time. Fixes some crashes 2012-01-13 23:46:32 +00:00
Hylke Bons 649fab3826 fetcher git: Cleanup 2012-01-13 20:18:16 +00:00
Hylke Bons 793a74268c config: Revert adding Identityfile to SSH config for Arch Linux 2012-01-13 18:07:41 +00:00
Hylke Bons ab2ee404b5 git: Resolve the ?? 'conflict' by adding. Fixes #509 2012-01-12 01:01:24 +00:00
Hylke Bons 916cd0fa3d Fix compile error 2012-01-12 00:58:19 +00:00
Hylke Bons 93ef996afb repo: Make the SparkleShare.txt more fun and helpful 2012-01-12 00:22:15 +00:00
Hylke Bons d36ef5ee48 Fix compile error 2012-01-12 00:21:34 +00:00
Eric Wong b0457580b5 Allow home path to be specified 2012-01-11 23:43:26 +00:00
Hylke Bons 98746b26c7 Write debug output to a log file. Closes #515 2012-01-11 23:02:22 +00:00
Hylke Bons 63497bbed3 git: Don't compress already compressed file formats 2012-01-11 22:15:13 +00:00
serras 78a0b5ce34 Use layout in setup windows 2012-01-09 18:36:24 +01:00
serras 0dd7605834 Make it compile with Sparkleshare 0.6 and create .msi file correctly 2012-01-08 22:31:14 +01:00
serras f4c4a94000 Merge remote-tracking branch 'hbons/master' into gettext-cs
Conflicts:
	.gitignore
	.gitmodules
	SparkleLib/Git/SparkleFetcherGit.cs
	SparkleLib/Hg/SparkleRepoHg.cs
	SparkleLib/SparkleConfig.cs
	SparkleLib/SparkleFetcherBase.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/SparkleBubblesController.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleStatusIcon.cs
2012-01-07 14:13:36 +01:00
Hylke Bons 5665ea831e config: don't change SSH config when email is unknown. Fixes #499 2012-01-01 14:58:53 +01:00
Hylke Bons 394cd39b57 repo: Also report progress on fetch 2011-12-30 15:00:15 +01:00
Hylke Bons f30e534bfb statusicon: add sync progress stats (one repo at a time only for now). Closes #222 2011-12-30 01:44:41 +01:00
Hylke Bons 317c7842a7 Don't exclude all dotfiles, Fixes #495 2011-12-29 12:44:18 +01:00
wimh b8667b7b8b fix potential crash at shutdown 2011-12-28 01:03:27 +01:00
Hylke Bons 45655d4395 fetcher: fix permissions on ssh config file 2011-12-25 20:33:39 +01:00
Hylke Bons b84b6ba499 Fix warning 2011-12-25 20:32:39 +01:00
Hylke Bons b391fd0a44 fetcher: uncomment code to set permissions on SSH config file 2011-12-25 19:02:14 +01:00
Hylke Bons 88700a83d6 fetcher git: Fix race condition when stopping a clone 2011-12-24 19:17:54 +01:00
Hylke Bons f1605a566f fetcher git: set the working dir to the tmp path. Fixes #488 2011-12-24 18:04:43 +01:00
Hylke Bons e9048d5180 config: don't add identity to .ssh/config twice 2011-12-20 17:47:39 +01:00
Hylke Bons c235248078 Use folders_path config option to create the tmo dir when it is set. Fixes #485 2011-12-18 17:10:06 +01:00
Hylke Bons a4d1e5d120 event log: report size and history size. Closes #379 2011-12-15 16:15:29 +01:00
Hylke Bons 3f70f08084 controller: lock when writing avatars. Fixes #476 2011-12-11 21:00:51 +01:00
Hylke Bons 20c6ac32d0 config: explicitly point to the sparkleshare private key in ssh config. Closes #396 2011-12-11 20:45:18 +01:00
wimh bb1d277cb0 avoid empty lines being added to .ssh/config file 2011-12-11 15:53:05 +01:00
wimh 613fa43f0d avoid empty lines being added to .ssh/config file 2011-12-10 22:07:55 +01:00
Hylke Bons 9a3e34381c repo: Improve handling of offline repos. Fixes #439 2011-12-03 12:40:55 +01:00
Hylke Bons 6540b19ae2 git: strip .empty from file paths in commit messages 2011-12-03 12:40:55 +01:00
Hylke Bons 23fed0359f fetcher git: always create folder for ignore file first. Fixes #460 2011-12-01 19:41:49 +01:00
Hylke Bons 6ad39da458 repo git: also check for number of dirs before creating .empty file 2011-11-30 15:04:56 +01:00
Hylke Bons 5030933abf setup: Show a warning when the user has a global gitignore. Closes #432 2011-11-28 14:40:34 +01:00
Hylke Bons 0c5b1ebae2 remove more smartirc references 2011-11-19 14:24:09 +00:00
Hylke Bons bc25f25bbb remove smartirc and related code. Closes #435 2011-11-18 21:40:42 +00:00
Hylke Bons c1a3d1ff2c Move SparkleOptions from lib to UI. Remove mercurial code. 2011-11-18 21:16:57 +00:00
Hylke Bons 444082f396 Move FormatMessage to bubbles controller 2011-11-18 20:53:53 +00:00
wimh 2fa6c72fd8 Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 8d315b7fa9 listener: point to a DNS record instead of an IP address 2011-11-13 22:03:13 +00:00
Hylke Bons 7e18e6d3cb repo: put a lock on toggling the watcher. Should fix #358 2011-11-13 18:04:13 +00:00
Hylke Bons be14c48ae9 repo base: Start initial remote check in a new thread. Prevents blocking an fixes #321 2011-11-13 00:57:00 +00:00
Hylke Bons 07b727bb72 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
Hylke Bons 1100fa205b repo: When listening, make poll interval long for every repo 2011-11-13 00:27:25 +00:00
Hylke Bons 17c8433f9a Merge branch 'enhancements' of https://github.com/travisghansen/SparkleShare into thansen
Conflicts:
	SparkleLib/SparkleListenerBase.cs
	SparkleLib/SparkleRepoBase.cs
2011-11-12 17:47:39 +00:00
Hylke Bons 76a24f9af3 config: skip badly formatted uris. Fixes #410 2011-11-12 01:54:08 +00:00
Hylke Bons 11609bccf2 Update README to build on OSX. Closes #383 2011-11-11 22:01:51 +00:00
Hylke Bons 05dd261789 config: Fix error 2011-11-07 18:35:00 +00:00
Hylke Bons b29c60bf14 config: use File.WriteAllText to write initial config 2011-11-07 18:03:19 +00:00
Travis Glenn Hansen 448e39924d bit more sync/listener logic 2011-11-07 08:39:33 -07:00
Hylke Bons 9855c1b154 Fix build. Closes #403 2011-11-06 14:37:56 +00:00
Travis Glenn Hansen 3d4a8b5f9d making announcements more robust and intelligent 2011-11-05 15:09:09 -06:00
wimh 9607a3801d fix compiler errors caused by merge 2011-11-04 22:44:39 +01:00
Travis Glenn Hansen 9ead45dc1c Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-04 14:55:16 -06:00
wimh 7d226076a3 Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons 73d5619615 repo: cover case where we're in a poll triggered syncdown and a message comes in half way through 2011-11-04 16:24:50 +00:00
Travis Glenn Hansen 74fc03f354 Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements 2011-11-03 18:21:48 -06:00
Hylke Bons 25877948ad repo: add better check for duplicate messages 2011-11-04 00:05:25 +00:00
Hylke Bons 26df391130 Fix compile error. Closes #402 2011-11-03 23:28:25 +00:00
Travis Glenn Hansen d0a4d126fc attempting to prevent the same announcement from being processed twice 2011-11-03 17:15:59 -06:00
Hylke Bons 439d26f803 listener: don't add duplicate messages to queue. attempt #2 2011-11-03 16:54:01 +00:00
Hylke Bons 1696712c21 listener: don't add duplicate messages to queue 2011-11-03 16:22:12 +00:00
Hylke Bons 46d8eecb51 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
Hylke Bons 92fe955910 config: fix error 2011-10-29 15:47:14 +01:00
Hylke Bons 337194538d config: catch FileNotFoundException and create config 2011-10-29 14:27:53 +01:00
wimh 61bd9af894 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	SparkleLib/SparkleHelpers.cs
2011-10-27 19:12:04 +02:00
wimh a10dc3b3fb Revert "refs #18 fix handling of allow_passwordless_join setting"
This reverts commit 475c4b479e.
2011-10-27 19:07:43 +02:00
PierreAronnax 6017e86665 SparkleListenerBase: Fixing delivering of queued messages.
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
2011-10-25 21:24:30 +03:00
PierreAronnax 9204fef03d SparkleListenerBase: Fixing delivering of queued messages.
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
2011-10-25 20:16:20 +02:00
PierreAronnax 15a827acd6 SparkleListenerTCP: Fixing Reconnect
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
2011-10-25 19:16:29 +03:00
PierreAronnax d97e8a8826 SparkleListenerTCP: Fixing Reconnect
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
2011-10-25 17:28:32 +02:00
Hylke Bons 80cf3cf26a git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons a018a6181b git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons 2fba6f4bb7 Fix compile error. Closes #375 2011-10-24 16:44:42 +01:00
Hylke Bons 6d1d58ff9a Add helper method DiffPaths 2011-10-23 13:48:13 +01:00
Hylke Bons 877aff9548 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
Hylke Bons fff5c8c2b2 irc listener: fix bugs in channel password feature 2011-10-22 15:02:22 +01:00
wimh f75ce66443 refs #18 fix handling of allow_passwordless_join setting 2011-10-21 22:08:30 +02:00
wimh ef28cb4a14 Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00