Commit graph

905 commits

Author SHA1 Message Date
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
wimh 0453083424 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons 363209cd15 Fix compile error and fix some style changes for merge request 368# 2011-10-17 19:54:41 +02:00
Hylke Bons 59d4a7367f Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass 2011-10-17 19:43:05 +02:00
Hylke Bons 39ec42d167 git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons 537218b46e git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
Nícolas Lazarte Kaqui a3426e5ca5 accepting the suggestions made ​​by hbons 2011-10-16 16:46:37 -02:00
wimh 75eb8c7f32 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	.gitignore
	SparkleShare/SparkleStatusIcon.cs
2011-10-15 20:31:20 +02:00
Nícolas Lazarte Kaqui 9a1a7f4626 included setting to allow or disallow access to key channels without 2011-10-11 12:11:12 -03:00
Hylke Bons 4021ef40c5 Merge branch 'master' of https://github.com/funkey/SparkleShare 2011-10-05 23:26:06 +02:00
Jan Funke 73d11e0f9d tcp-listener: fallback to polling instead of crashing on socket errors 2011-10-03 14:39:26 +02:00
wimh 86c84e4120 Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00
wimh cad52d7072 Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/Program.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleExtensions.cs
	SparkleShare/SparkleLinController.cs
	SparkleShare/SparkleStatusIcon.cs
	SparkleShare/SparkleUI.cs
2011-10-02 01:57:14 +02:00
wimh 9f729e5e3e Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
Hylke Bons 5a9b7d4ba6 new Add Project dialog, powered by plugins 2011-10-01 23:16:25 +02:00
Jan Funke 1a91c6d9c2 do not attempt to change file attributes of symlinks 2011-10-01 20:08:05 +02:00
Hylke Bons e7c83ca06b git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +02:00
Hylke Bons 2a0ef501a2 listener: default to the plain TCP protocol 2011-09-25 22:52:03 +02:00
Hylke Bons d661c184e2 Remove OS detection code, rely on an abstract base controller with similarly named custom controller subclasses for each OS instead. 2011-09-25 22:52:03 +02:00
Hylke Bons 62b0bc2524 git: filling empty dirs: don't bother removing the .empty 2011-09-22 20:11:08 +01:00
Hylke Bons 0bdaa01099 Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare 2011-09-22 13:05:14 +01:00
Hylke Bons 87e6fc56a0 config: catch IOException, FileException does not exist 2011-09-22 12:55:35 +01:00
Nícolas Lazarte Kaqui c869a07bd6 When not set the key user try to join no key 2011-09-20 15:11:38 -03:00
Hylke Bons 8ba23a6d11 config: create initial config when exception happens 2011-09-20 19:09:43 +01:00
Nícolas Lazarte Kaqui 876c331d84 Fixing wrong commit 2011-09-20 13:20:05 -03:00
Nícolas Lazarte Kaqui 920a58fbb3 Use password to access channel on IRC 2011-09-20 09:13:42 -03:00
Hylke Bons 1479662538 Close some streams immediately. Remove broken scp backend 2011-09-15 00:58:19 +02:00
Beau Gunderson 9ee12f31ad Added the GIT_SSH environment variable and set it to "ssh" so that git will use ssh-agent; fixed a bug where SparkleShare creates an exclude file within the "info" directory without checking if the "info" directory exists. 2011-09-14 12:19:53 -07:00
Hylke Bons cc17d00d00 Fix memory leak 2011-09-14 20:18:15 +02:00
Hylke Bons bcc12f4a1c Remove .empty files when they are no longer needed 2011-09-14 20:12:56 +02:00
Hylke Bons d0244e0da6 Allow empty folders to be added by putting a hidden file in each of them before committing 2011-09-14 19:30:17 +02:00
Hylke Bons ac3abe5b8c git log: trim .empty off folder paths 2011-09-14 17:57:40 +02:00
Hylke Bons 9144a6f52b setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Hylke Bons e675f27f7a Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 18:05:10 +03:00
Hylke Bons 497a323a0f Edited SparkleLib/SparkleListenerIrc.cs via GitHub 2011-09-12 17:13:41 +03:00
Mirco Bauer c9d158a26c Added http_proxy support to SparkleListenerIrc 2011-09-12 15:59:17 +02:00
Hylke Bons d29aea417d Fix ignore Firefox and Chromium temp download files 2011-09-11 23:58:19 +02:00
Hylke Bons 7d5185a49b Ignore Firefox and Chromium temp download files 2011-09-11 23:47:36 +02:00
Hylke Bons d129b215c0 fetcher git: default protocol is ssh:// 2011-09-11 22:15:23 +02:00
Mirco Bauer 9739debd02 Enhance user's privacy of the IRC channels
Set the channel mode to +s so other users cannot "spy" watched channels using
the WHOIS or LIST IRC command.
2011-09-11 20:29:25 +02:00
Mirco Bauer ffbb5bce7b Enhance user's privacy of the IRC connection
Use the invisible IRC usermode and random username instead of his
real username.
2011-09-11 20:24:17 +02:00
Thomas Vollstädt 839c3ed835 Added support for Hg Backend 2011-09-08 15:52:56 +02:00
Thomas Vollstädt c74ed37c4e Merge remote-tracking branch 'upstream/master' into issue10 2011-09-08 15:40:17 +02:00
Thomas Vollstädt 48e3beb9c2 RegEx not needed anymore 2011-09-05 17:40:53 +02:00
Thomas Vollstädt c1481d51a0 Fixed code intendation 2011-09-05 17:39:20 +02:00
Thomas Vollstädt 0298e8c795 Implemented Exclusion Rule methods for handling non-readable files. See issue #10 2011-09-05 17:36:03 +02:00
Thomas Vollstädt 73f58892e8 Check readabilty only for existing files; Remove Exclusions when file is readable again 2011-09-05 17:34:07 +02:00
Thomas Vollstädt 85abd6bbb7 Skipping files which are unreadable by sparkleshare and added some methods for git's exclude file manipulation, see #10 2011-09-05 03:28:25 +02:00
Thomas Vollstädt c767dbc302 Added a new helper function for getting a relative-to-repostory path 2011-09-05 03:02:15 +02:00
wimh 04b3b43f88 Add ~* to ignored files
Fix crash when a conflict has been resolved already
2011-09-03 23:38:53 +02:00
wimh 3d9d7bb246 default path to git
avoid it stays null when not found in paths[]
2011-09-03 22:11:49 +02:00
wimh 6f27b23719 fix crash if file was renamed remote
see #8 (https://github.com/wimh/SparkleShare/issues/8)
2011-09-03 22:11:28 +02:00
wimh b6d17da8ef avoid crash if remote folder is deleted by user.
When all files including the .git folder are removed from a remote folder, but that folder is not removed from the SparkleShare config, SparkleShare crashes at startup, and when showing the log for that folder. This commit should avoid a crash.
2011-09-03 22:09:55 +02:00
wimh 0a9aaff4b8 fix crash if file was renamed remote
see #8 (https://github.com/wimh/SparkleShare/issues/8)
2011-08-28 22:02:01 +02:00
Hylke Bons 77caf67a8d Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-28 21:56:25 +02:00
wimh 51cb04d363 set PlatformTarget from AnyCPU to x86
CefSharp is win32 only:
https://github.com/chillitom/CefSharp/blob/master/CefSharp/CefSharp.vcproj#L11
2011-08-28 21:49:04 +02:00
Hylke Bons 8d062a059f Add nicer error reporting 2011-08-27 20:57:34 +02:00
Hylke Bons f3b53db8ab Fix whitespace for last commit 2011-08-27 17:53:17 +02:00
Hylke Bons f3cb3e6e0f setup: Add progress indication when adding a new folder 2011-08-27 17:10:39 +02:00
Hylke Bons 824fd3392b Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-27 02:42:09 +02:00
Hylke Bons 36d7269974 config: fix some whitespace 2011-08-27 01:11:53 +02:00
Hylke Bons 4d42639fcb fetcher git: don't prepend ssh:// when using git:// 2011-08-27 00:49:08 +02:00
Hylke Bons 3a571c7baf Create a new config.xml if it exists but is empty. Throw an error if the format is invalid. Fixes #315 2011-08-26 23:53:04 +02:00
Hylke Bons 79f3473467 Allow initial sync to be cancelled by adding a cancel button. Closes #307 2011-08-26 22:47:46 +02:00
Hylke Bons 57a6d8dbf0 Bring back descriptive commit message. Fixes #317 2011-08-26 21:00:22 +02:00
wimh deafe9c5c4 set PlatformTarget from x86 to AnyCPU 2011-08-13 22:33:48 +02:00
wimh 9ebf8c8f98 add and integrate submodule TextTemplating (TextTransform.exe) in build 2011-08-13 01:33:15 +02:00
wimh 580ec563b9 remove references to gtksharp and mono when compiled under .net 2011-08-07 00:26:23 +02:00
wimh a99e5b0288 convert SparkleSetup to winforms
fixed some exceptions during debugging
renamed class SparkleShare to Program because of namespace problems (see http://blogs.msdn.com/b/ericlippert/archive/2010/03/09/do-not-name-a-class-the-same-as-its-namespace-part-one.aspx)
2011-08-06 23:44:37 +02:00
Wizard_85 33826c0735 Resolving Bug with already defined variable 'n' 2011-07-30 20:48:47 +02:00
Hylke Bons bf015d32f0 fetcher: add configuration option to show special characters in the git log. Fixes 288 2011-07-29 23:03:45 +01:00
Hylke Bons b326c85638 setup controller: fix wrong path being created 2011-07-25 02:26:46 +01:00
Hylke Bons dbce0e14e9 Add events to tcp listener 2011-07-24 19:22:17 +01:00
Hylke Bons 5afd3dc59f Refactor config and merge with Paths 2011-07-24 02:00:40 +01:00
Hylke Bons 253111e901 lib: add a User object 2011-07-23 22:33:15 +01:00
Hylke Bons 1eece7806e Add notifications for new notes 2011-07-23 22:23:14 +01:00
wimh 06ede455b7 fix bug in CheckForChanges 2011-07-23 21:41:56 +01:00
Hylke Bons 2d7b78df72 ... 2011-07-23 21:34:04 +01:00
Hylke Bons d92879d830 Revert "log: get commits from the last week, instead of the last X commits"
This reverts commit fba5162e4e.
2011-07-23 21:20:19 +01:00
Hylke Bons 1ed107e6e9 cleanup log and fix some small porting bugs 2011-07-23 20:57:36 +01:00
Hylke Bons d42dfe728f log: get commits from the last week, instead of the last X commits 2011-07-23 20:57:10 +01:00
Hylke Bons 89bb89afe8 hook up linux event log to new controller 2011-07-23 16:57:46 +01:00
Hylke Bons 6e4ace9643 add some comments 2011-07-23 15:27:35 +01:00
Hylke Bons 943dfcc767 Merge pull request #296 from ways/master
Rewritten autocomplete
2011-07-23 06:06:22 -07:00
Lars Falk-Petersen 3d707244b7 FolderPaths 2011-07-22 22:27:16 +02:00
wimh 5117c95b84 Merge remote-tracking branch 'upstream/master' into windows 2011-07-22 20:27:59 +02:00
wimh d08bddc6f1 fix bug in CheckForChanges 2011-07-22 20:09:18 +02:00
Hylke Bons 14da54b8b6 Squash events per day+user+folder 2011-07-22 02:12:09 +01:00
wimh c079332926 revert to vs2008 2011-07-21 18:20:20 +02:00
wimh 5c8039e906 Merge remote-tracking branch 'upstream/master' into windows 2011-07-21 11:26:09 +02:00
Hylke Bons 67056369af Fix notifications
The check wether it was a new commit always returned false
2011-07-21 00:49:16 +01:00
Hylke Bons 55b75f84a8 Fix bug where large amounts of files aren't being added/commited/pushed (process class hung on the large outputs) 2011-07-21 00:02:21 +01:00
wimh 614629ec0d convert to vs2010, fix about dialog background 2011-07-19 23:54:07 +02:00
wimh e11ba04bfb Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	.gitignore
	SparkleShare/SparkleIntro.cs
	SparkleShare/SparkleShare.cs
	SparkleShare/SparkleUI.cs
2011-07-19 23:20:21 +02:00
Hylke Bons 9e48917e03 ignore note adds in the log 2011-07-17 01:37:36 +01:00
Hylke Bons 6cf8eca2b7 fix notes 2011-07-17 01:22:39 +01:00
Hylke Bons f496a3b854 notes: stop using git-notes, use files instead 2011-07-16 23:30:46 +01:00
Hylke Bons 9ff8e7cf95 Fix css and add Show All N feature 2011-07-16 19:41:37 +01:00
Hylke Bons 4b74b09f75 Update project and make files 2011-07-08 22:53:03 +01:00
Hylke 1e13ca711f intro config: we want to prefill a host only once 2011-07-02 17:20:54 +01:00
Hylke 118591e262 UI is not allowed to access config. go via controller and talk about hosts 2011-07-02 17:10:57 +01:00
Hylke b57a59cc60 config: get urls in a simpler way and clean up 2011-07-02 17:05:05 +01:00
Hylke c8df2ce85a Merge https://github.com/ways/SparkleShare into bookmarks 2011-07-02 16:53:01 +01:00
Lars Falk-Petersen b102609899 Formatting and removing of comments. 2011-07-02 14:56:42 +02:00
Lars Falk-Petersen f28b6e8512 Formatting and removing of comments. 2011-07-02 14:55:56 +02:00
Lars Falk-Petersen 70adad83b4 Strip ssh:// and git:// from urls. 2011-07-02 14:46:08 +02:00
Lars Falk-Petersen 3fc7ff54cd Added GetUrls 2011-07-02 13:29:37 +02:00
Lars Falk-Petersen 8ab8c847fc Removed PrevServer, PrevFolder 2011-07-02 12:37:04 +02:00
wimh 0079c209d0 change platform to x86 because gtk# does not support x64 2011-07-02 10:24:33 +02:00
Hylke Bons beafcebd5a Fix tcp listener (needed newlines at the end of messages) 2011-07-02 02:24:12 +01:00
Hylke Bons cf1a7a5e2b adjust tcp listener to work with nodejs server (subscribing doesn't work yet) 2011-07-02 02:13:33 +01:00
Lars Falk-Petersen 046199428b If options don't exist in config, create them! 2011-07-01 09:58:51 +02:00
Lars Falk-Petersen b9645cc4ae Problems with missing options in earlier config. 2011-07-01 02:10:13 +02:00
Lars Falk-Petersen dc3d65562a Added PrevFolder to config. 2011-07-01 01:43:55 +02:00
lars 27504373ef Added saving of last used server. 2011-06-30 23:31:55 +02:00
Alex Hudson f61212b930 Project Evil: allow SparkleShare to take full http(s) URIs without choking. 2011-06-30 12:53:05 +01:00
Alex Hudson 524496efc9 Put in XML fragment parsing - listener now basically works over tcp 2011-06-29 23:36:18 +01:00
Alex Hudson b94e7c846a Convert JSON commands to TCP server into XML fragments. 2011-06-29 23:36:18 +01:00
Alex Hudson 2769e38866 Remove IRC listener code from TCP version 2011-06-29 23:36:18 +01:00
Alex Hudson 5fea05f84d Make tcp listener startup-able 2011-06-29 23:36:18 +01:00
Alex Hudson c385fe21ea Fix bpbb on git callout 2011-06-29 22:40:34 +01:00
Hylke Bons cfbdf98150 repo git: don't hang on huge command outputs 2011-06-29 20:45:37 +01:00
Hylke Bons de564d89ff repo: add a property that shows the currenly unsynced paths (to hook up with the badger) 2011-06-29 20:28:49 +01:00
wimh 509f969e9c fix compile problem on windows x64 2011-06-29 16:28:00 +02:00
Hylke 138e8e744f Fix nullreference exception when adding new files before starting sparkleshare 2011-06-28 20:54:47 +01:00
Hylke d3e20e22d7 repo: create watch after initial change set 2011-06-28 20:06:04 +01:00
Hylke ca762a9220 repo git: sync up initial commit 2011-06-28 20:03:10 +01:00
Alex Hudson 2e31e0094d Change 'notification' language to 'announcement' 2011-06-28 20:03:10 +01:00
Alex Hudson b27725ab72 Make listener type configurable from config file 2011-06-28 20:03:10 +01:00
Alex Hudson 7a7da66a50 Simplify some config functions, add a notification server entry 2011-06-28 20:03:10 +01:00
wimh 879abee53f C:\msysgit\msysgit -> C:\msysgit, see also 7631edc6f9 2011-06-27 18:04:28 +02:00
Hylke Bons 4018f82728 remove some TODOs 2011-06-26 02:41:00 +01:00
Hylke Bons c9b56efb3a Move translations initialization to SparkleUI and add translations to Mac UI 2011-06-26 02:00:53 +01:00
Hylke Bons a9c52ea738 note: don't push notes to read only repos 2011-06-25 22:39:53 +01:00
Hylke cd0b76bba8 fetch notes periodically 2011-08-25 16:02:34 +01:00
Hylke 7b87b1f6b9 avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs 2011-08-25 15:36:26 +01:00
Hylke ee51f685ef don't show a notification on new notes 2011-06-24 23:55:23 +01:00
Hylke b9eab774dc git fetch all branches 2011-06-24 23:43:11 +01:00
Hylke 52e44b2053 add note fetching line to config 2011-06-24 23:23:41 +01:00
Hylke ef292b34cc Merge branch 'master' into notes
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2011-06-24 19:13:02 +01:00
wimh d541f2179f fix merge issues 2011-06-23 22:05:09 +02:00
wimh 0fb2bc840e Merge remote branch 'upstream/master' into merge 2011-06-23 20:39:41 +02:00
wimh a97b7d9647 Merge commit '4f59a03a6f395b1db7d6' into merge 2011-06-23 20:38:21 +02:00
Hylke 6889b42963 Merge branch 'master' of github.com:hbons/SparkleShare 2011-06-23 15:24:08 +01:00
Hylke c5a092c8a4 repo: don't show warning statusicon upon initial commit 2011-06-23 13:56:25 +01:00
Hylke Bons 25e08545d2 continue implementing notes 2011-06-23 01:44:43 +01:00
Hylke Bons b7c9fe4431 save progress on notes 2011-06-23 01:44:43 +01:00
Hylke Bons de98e29f70 Add each note to its own namespace to avoid conflicts 2011-06-23 01:44:43 +01:00
Hylke Bons a801f68340 fix AddNote, add Note object 2011-06-23 01:44:43 +01:00
Hylke Bons 1d5dd2a8b0 make adding a note work 2011-06-23 01:44:43 +01:00
Hylke Bons f1ff61950c add AddNote method 2011-06-23 01:44:43 +01:00
Hylke Bons 75afaff2cd repo: ignore external watchers when watching is disabled 2011-06-22 16:02:38 +01:00
wimh a0226f1024 windows: locate texttransform.exe 2011-06-18 23:45:30 +02:00
Hylke Bons 4574ae6056 Add a TCP based listener 2011-06-18 22:42:34 +01:00
Hylke Bons 06683678b2 Fix timzones in timestamps, again... 2011-06-15 00:34:29 +01:00
Hylke Bons 296d830917 repo: Move watcher to its own subclass 2011-06-14 23:14:03 +01:00
Hylke Bons 1d2a077b91 update NEWS and version 2011-06-14 19:08:28 +01:00
Hylke Bons 1f0d0c9da9 fetcher: create .ssh if it's not there 2011-06-14 14:48:18 +01:00
Hylke Bons 593d327660 repo base: disable watching by using the existing method instead 2011-06-14 14:25:25 +01:00
Hylke Bons 93bb772db0 repo base: disable watching when syncing down 2011-06-13 18:57:56 +01:00
Alex Hudson d139a53a3f Merge branch 'master' of https://github.com/hbons/SparkleShare 2011-06-13 13:30:11 +01:00
Alex Hudson a5cf9d3bed Attempt to merge the smartirc4net references into single build reference 2011-06-13 13:27:48 +01:00
Hylke Bons 773f940e69 repo base: make polling intervals setting a bit more readable 2011-06-12 02:56:01 +01:00
wimh 35c9c043dd fix portability issue in OnFileActivity 2011-06-12 01:53:38 +01:00
wimh b60a21731a fix portability issue in OnFileActivity 2011-06-11 22:35:06 +02:00
wimh 5501a448b5 reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00
Hylke Bons 72f4052526 repo git: strip quotes from git commit message 2011-06-11 18:51:39 +01:00
Hylke Bons 4fdee4bf07 default disconnected polling interval is 3min 2011-06-11 18:51:39 +01:00
Hylke Bons f3aca9da0a repo git: strip quotes from git commit message 2011-06-10 21:40:13 +01:00
Hylke Bons 944a9c4a46 default disconnected polling interval is 3min 2011-06-10 11:08:03 -07:00
Hylke Bons c16b2cb420 Save work 2011-06-10 00:01:45 +01:00
Hylke Bons a07e0a6b8d repo: don't poll every 10sec when disconnected 2011-06-09 23:59:56 +01:00
Hylke Bons 911a1f941a changeset: Add a Folder property 2011-06-09 21:25:36 +01:00
Hylke Bons 18ec890574 repo base: poll continously even when connected (but not as frequent) 2011-06-09 21:20:57 +01:00
Hylke Bons 5b9455b73e repo base: add some properties to be used for the manual polling 2011-06-09 18:53:36 +01:00
Travis Glenn Hansen 267987763c removing is_polling completely 2011-06-09 10:21:55 -06:00
Travis Glenn Hansen e937aa168f Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
Conflicts:
	SparkleLib/SparkleConfig.cs
2011-06-09 10:20:15 -06:00
Hylke Bons 169b5dfd7a about: remove references to SparkleLib 2011-06-08 22:37:29 +01:00
Hylke Bons 1319a566f9 config: Only trim user name if it isn't null 2011-06-08 21:40:12 +01:00
Travis Glenn Hansen 1704d86b2f Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes 2011-06-07 19:39:34 -06:00
Hylke Bons f658ea2b86 Work with repos on host names with a dash in them 2011-06-08 02:04:54 +01:00
Hylke Bons 60ffd9ef7a config: never let user name be null or empty 2011-06-08 01:30:01 +01:00
Hylke Bons ae8d03ebdc listener irc: Fix race condition joining channel when not connected 2011-06-08 01:30:01 +01:00
Travis Glenn Hansen b54ac8b259 fixing upstream issue 200 2011-06-07 14:39:35 -06:00
Hylke Bons 50dd9b1a95 config: never let username be empty 2011-06-06 21:00:06 +01:00
Hylke Bons 33338c2c0c listener irc: adjust ping interval and timeout 2011-06-05 23:08:17 +01:00
Hylke Bons 9df0fd6440 Detect the correct .shh path on Windows 2011-06-05 19:59:48 +01:00
Hylke Bons 80e5343908 fetcher base: check if thread exists before disposing it 2011-06-05 17:35:22 +01:00
Hylke Bons 91bd2bff63 config: get default username depending on platform 2011-06-05 17:22:40 +01:00
Hylke Bons b3fb85c305 Move OS detection code to the backend 2011-06-05 17:07:33 +01:00
Hylke Bons efb2d2c878 Don't check for root user on non-unix systems. 2011-06-05 01:47:45 +01:00
Hylke Bons f6dac691ca controller: add a Initialize () method, instead of doing everything in the constructor 2011-06-04 18:16:00 +01:00
Hylke Bons 0458cf826d paths: Use more the more crossplatform Environment.SpecialFolder enumeration to determine used paths. 2011-06-04 15:16:32 +01:00
Hylke Bons 4d972c66d1 repo base: only emit NewChangeSet event when SyncDown was successful 2011-06-03 01:33:41 +01:00
Hylke Bons 85be7121ab Code cleanup 2011-06-03 00:35:51 +01:00
Hylke Bons 04d63c0a27 Update out of date SparkleShare tagline 2011-06-02 00:08:05 +01:00
Hylke Bons 503b02e85f listener irc: only join a channel once 2011-06-01 23:59:18 +01:00
Hylke Bons 1e91f40569 Use custom folder watcher on Mac 2011-05-31 21:02:08 +01:00
Hylke Bons 6dfab204e7 fetcher git: fix url construction 2011-05-31 18:30:28 +01:00
Hylke Bons 71b43d530a Move url forming logic to the fetcher 2011-05-31 02:28:23 +01:00
Hylke Bons bda1bc3bc4 comment out debug rule 2011-05-30 16:22:09 +01:00
Hylke Bons a941bd3b80 repo git: only disable emable watching once 2011-05-30 16:20:25 +01:00
Hylke Bons 39394de3bc listener: get announcement server url from the config file 2011-05-30 02:19:58 +01:00
Hylke Bons e2d75a57fb listener: add Dispose method 2011-05-29 20:01:56 +01:00
Hylke Bons 6298c86a36 repo git: convert commit timestamps by converting them to utc, then converting them to our timezone 2011-05-29 17:47:40 +01:00
Hylke Bons 6926638822 repo: normalise timezones for the log 2011-05-29 16:48:47 +01:00
Hylke Bons a7547f5076 repo base: don't call AnyDifferences on changes in .git or .hg 2011-05-29 13:53:09 +01:00
Hylke Bons ec6c69452a listener: move reconnect timer from repo. rename channelmessage event. add debuginfo 2011-05-29 00:52:46 +01:00
Hylke Bons 9549ae3816 repo: remove obsolete static IsRepo method 2011-05-28 20:23:33 +01:00
Hylke Bons c2cff43f46 controller, backend: determine repo backend type in a cleaner way 2011-05-28 19:29:16 +01:00
Hylke Bons 0b937a0dda config: user Unknown as default username instead of empty string 2011-05-28 17:52:50 +01:00
Hylke Bons 10ac5cbe5c config: add url as part of the folder config xml 2011-05-26 23:41:55 +01:00
Hylke Bons 109f75aee9 Fix configuration issues 2011-05-26 20:46:49 +01:00
Hylke Bons 898c685cb6 repo base: move method for consistency 2011-05-26 02:05:30 +01:00
Hylke Bons 2e075959c4 repo base: use new config scheme to get the user name's and email 2011-05-26 01:44:10 +01:00
Hylke Bons 942aecc710 Use new XML based config scheme 2011-05-25 21:46:46 +01:00
Hylke Bons cb27d3f551 Move the default backend initialisation to SparkleBackend 2011-05-25 20:24:25 +01:00
Hylke Bons 04c3aeca3b hg: fix compile error 2011-05-25 20:20:20 +01:00
Hylke Bons aa01351e2a lib: Fix makefile whitespace 2011-05-25 20:15:15 +01:00
Hylke Bons 4e6fc33e3f hg: remove some debug output 2011-05-25 20:13:26 +01:00
Hylke Bons d5ec6472fd backend: don't be inheritable explictly 2011-05-25 20:07:13 +01:00
Hylke Bons ae87d1e68b config: remove debug output 2011-05-25 19:38:25 +01:00
Hylke Bons c2d844268d config: fix RemoveFolder method 2011-05-25 19:36:43 +01:00
Hylke Bons 1f3ab4f529 save scp backend work 2011-05-25 19:33:45 +01:00
Hylke Bons f2320abc11 config: fix style 2011-05-25 01:22:02 +01:00
Hylke Bons 44572da5c7 config: throw exception whenever config file doesn't exist 2011-05-25 01:20:37 +01:00
Hylke Bons 607b347dd5 config add exception when config file is not found 2011-05-25 01:15:30 +01:00
Hylke Bons 7634b7f655 config: add a default static SparkleConfig 2011-05-25 01:00:32 +01:00
Hylke Bons 80c676de6c Add SparkleConfig class to deal with configuration 2011-05-25 00:46:55 +01:00
Hylke Bons 1288494ae5 hg: implement event logs for Mercurial 2011-05-23 21:16:21 +01:00
Hylke Bons 6779d3bdea defines: remove unused OPEN_COMMAND 2011-05-23 19:42:28 +01:00
Hylke Bons 3d286a4b60 rough Mercurial log implementation and crash fixes on empty repo 2011-05-23 04:06:07 +01:00
Hylke Bons 5a0c45bc6a repo: fix listener connecting 2011-05-23 01:18:10 +01:00
Hylke Bons 1bbf352028 don't watch for addition of ~/SparkleShare subfolders 2011-05-22 23:51:12 +01:00