Commit graph

187 commits

Author SHA1 Message Date
Hylke Bons f1bafe1834 fetcher: ignore file permission changes in new checkouts 2011-05-01 17:25:42 +02:00
Hylke Bons f9b2fbe724 Fix coding style and whitespace of all of SparkleLib 2011-05-01 15:40:46 +02:00
Hylke Bons d91a922782 repo: resolve any kind of rebase conflict 2011-04-30 02:42:48 +02:00
Hylke Bons d584367340 use absolute paths to move our version of conflicting file 2011-04-29 00:32:16 +02:00
Hylke Bons f01a3b41e4 save work on conflict resolution fix 2011-04-28 13:49:14 +02:00
Hylke Bons 28aa6d2305 repo: don't fetch changes when we're busy adding files 2011-04-27 18:44:59 +02:00
Hylke Bons a8ab0a2db4 repo: add support for renames and names with spaces in FormatCommitMessage method 2011-04-27 12:04:51 +02:00
Hylke Bons 43621431d9 [repo] Add a simple notification queue when disconnected, and send them when reconnected. 2011-04-23 15:56:05 +02:00
Hylke Bons 6213b95ef1 [repo] add back empty repo check without Git# 2011-04-21 23:14:44 +02:00
Hylke Bons ff779d6932 Use unicode for standardoutput. Fixes weird characters in logs but needs the latest mono 2011-04-21 19:45:11 +02:00
Bertrand Lorentz 1e88eab334 Remove GitSharp from the build and delete submodule 2011-04-21 17:15:32 +02:00
Hylke Bons 31289e984e Uncomment out conflict event. Fixes build errors 2011-04-21 16:49:26 +02:00
Hylke Bons 780ed8e751 Remote last bits of Git# code and comment out broken conflict resolution code 2011-04-21 15:46:46 +02:00
Hylke Bons 739f06b37b Don't rely on Git# for FormatCommitMessage () 2011-04-21 14:25:28 +02:00
Hylke Bons f3a3218848 remove unneeded gitsharp.* libs 2011-04-20 16:43:10 +02:00
Hylke Bons 22bf0a821a [repo] add todo 2011-04-20 16:40:17 +02:00
Hylke Bons 8ac8fee912 [repo] don't rely on Git# for username, email and remote url 2011-04-20 16:32:34 +02:00
Hylke Bons 1d3d5fe82a [repo] don't rely on Git# Directory property 2011-04-20 16:23:02 +02:00
Hylke Bons f5f80e9a8d [repo] Fix whitespace 2011-04-20 15:02:20 +01:00
Hylke Bons 9f0b0571a9 tmp 2011-04-17 12:22:20 +01:00
Hylke Bons 4eaa233bb6 Use git command for committing instead of GitSharp 2011-04-17 00:30:57 +01:00
Hylke Bons 062d705920 Use git command for getting the current hash instead of GitSharp 2011-04-17 00:19:42 +01:00
Hylke Bons 462fd68708 [repo] pull before pushing in every situation 2011-04-15 01:28:42 +01:00
Hylke Bons 695dbaddbe [repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect 2011-04-15 00:56:02 +01:00
Hylke Bons e4720628cc Fix quit method 2011-03-27 13:56:36 +01:00
Hylke Bons 0080bdcf03 [repo] Fix the GetCommits regex to also parse GMT-n timezones 2011-03-24 00:50:08 +00:00
Hylke Bons b2253a06ff [paths] change the way git lookup is done 2011-03-23 23:14:50 +00:00
Hylke Bons e1fb9f8640 Merge branch 'master' of ssh://github.com/hbons/SparkleShare 2011-03-22 22:50:25 +00:00
Hylke Bons 520d6b8f3f [lib] Allow disabling of central notification server and fallback to own 2011-03-22 13:44:52 +00:00
Hylke Bons 5e6fadebe9 [osx] quickly fix the git path 2011-03-20 19:24:57 +00:00
Hylke Bons f60b64dce2 [commit] remove unneeded member 2011-03-20 16:26:56 +00:00
Hylke Bons e2e51624c9 [log] remove 'IsFileDump' workaround and move message code to controller 2011-03-20 14:59:35 +00:00
Hylke Bons dbf5d1158a New thread + spinner instead of freeze when opening big logs 2011-03-16 15:13:14 +00:00
Hylke Bons ec4785eec6 Show menu item icons on Fedora too 2011-03-16 00:01:37 +00:00
Hylke Bons 52a7d746fd [watcher] ignore files in .git/ 2011-03-13 22:26:01 +00:00
Hylke Bons b947908a46 Fix notifications 2011-03-13 02:07:47 +00:00
Hylke Bons 3bf278ffe2 [statusicon] update icons and add icons for pressed state syncing animation 2011-03-13 01:21:49 +00:00
Hylke Bons 3404ff774e [osx] Pop up a warning when the backend (git) isn't found. 2011-03-13 00:15:19 +00:00
Hylke Bons 34254d9ca5 Fix cloning problem and better debuginfo 2011-03-12 19:39:42 +00:00
Hylke Bons 393e0e6b06 [repo] add todo 2011-03-12 18:58:04 +00:00
Hylke Bons 05fe993b89 Use SparkleLib.IsRepo for folder checking 2011-03-12 18:36:03 +00:00
Hylke Bons be79dfdb06 Merge branch 'fetcher-fix'
Conflicts:
	SparkleLib/SparkleFetcher.cs
2011-03-12 17:58:53 +00:00
Hylke Bons 5da5926407 [fetcher] Fix InstallConfiguration method 2011-03-12 17:53:49 +00:00
Hylke Bons 714a55b32a [fetcher] no need to keep error message in memory 2011-03-12 16:18:36 +00:00
Hylke Bons 73bf910896 Merge branch 'master' of https://github.com/palango/SparkleShare into palango-master 2011-03-12 16:10:24 +00:00
Hylke Bons 8071a1331d [fetcher] set core.ignorecase to false for each folder 2011-03-12 15:38:49 +00:00
Hylke Bons 1f6304d205 [repo] quick fix to re-push changes after encountering a non fast-forward to origin master 2011-03-09 06:23:24 -08:00
Hylke Bons 5d8717d354 Add SparkleAbout to .csproj 2011-03-08 23:55:21 +00:00
Hylke Bons fd90f69da2 [repo] align regexes 2011-03-06 15:29:36 +00:00
Paul Lange 8a2694feaa Add some error messages 2011-03-06 16:07:16 +01:00