beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1457 commits 31 branches 6 tags 52 MiB
Commit graph

235 commits

Author SHA1 Message Date
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
Hylke Bons 83572cf649 [listener] Use SparkleShare's dedicated notification server instead of irc.gnome.org 2011-03-04 18:31:02 +00:00
Hylke Bons 203334a6a2 Add some TODO's 2011-03-04 17:03:29 +00:00
Hylke Bons d523f13eac [repo] Not everything is file dumping 2011-03-04 16:50:41 +00:00
Hylke Bons 6153d40f89 Fix hang on commit logs > 4096 bytes 2011-03-04 15:57:22 +00:00
Hylke Bons 0005a76388 [repo] Replace gitsharp's AnyDifferences by own implementation 2011-03-04 14:01:29 +00:00
Hylke Bons 0911117e31 [fetcher] Ignore Omnigraffle autosave files 2011-03-04 05:30:11 -08:00
Hylke Bons 767b933cd5 Remove NotifySsharp from solution 2011-03-04 09:05:15 +00:00
Hylke Bons ac36a5cabc remove debug line 2011-03-03 12:08:50 +00:00
Hylke Bons 3061844ee7 Support showing merge commits in logs (and fix crashes caused by them being missing) 2011-03-03 12:06:25 +00:00
Hylke Bons 515d637182 [repo] fix crash caused by GetCommits(n) returning n-1 entries 2011-03-02 22:07:05 +00:00
Hylke Bons 1f52f24910 [repo] also push changes the user makes whilst we're syncing 2011-03-02 21:20:25 +00:00
Hylke Bons ab37a53f18 remove some leftover debug messages 2011-03-02 00:24:18 +00:00
Hylke Bons a1ba6f1b36 [repo] Fix NewCommit event not being fired 2011-03-01 23:42:00 +00:00
Hylke Bons bb5229d4d3 [notifications] Reconnect to the IRC server after a disconnect 2011-03-01 23:13:43 +00:00
Hylke Bons 60ffb7450d Redo GetCommits method withoug GitSharp. hopefully solves memory problem 2011-02-27 18:50:42 +00:00
Hylke Bons e333a759ae change wording a bit 2011-02-27 01:01:13 +00:00
Hylke Bons 28d06b4eeb Tweak irc notifications 2011-02-27 00:53:14 +00:00
Hylke Bons d8fb3493b9 [repo] Make time from event to push 5x shorter by using folder size checking 2011-02-26 23:57:48 +00:00
Hylke Bons 060811c428 [repo] only rely on exclude rules to add/ignore changes 2011-02-26 18:46:08 +00:00
Hylke Bons b2ef131d92 [repo] massive cleanup, use GitSharp and SparkleGit 2011-02-26 14:20:32 +00:00
Hylke Bons 444fceeb7e [listener] use a SHA-1 sum for the nick so no user info is shared 2011-02-24 01:43:06 +00:00
Hylke Bons 590ca49dbe [repo] state is polling when checking for remote changes 2011-02-24 01:42:13 +00:00
Hylke Bons 919ec8eea9 [repo] Fix compilation issue 2011-02-23 01:13:54 +00:00
Hylke Bons cd130483fc [repo] forgot to create commit message before rebasing 2011-02-23 00:21:30 +00:00
Hylke Bons 60b77c5fa1 [repo] Always commit before rebasing fetched changes in case something changed 2011-02-23 00:09:44 +00:00
Hylke Bons 43290d387e [paths] look for git using whereis 2011-02-22 22:58:01 +00:00
Hylke Bons 1a327ea0ad [repo] Fix pushing bug 2011-02-13 00:02:07 +00:00
Hylke Bons b51681c662 [log] Add a default buddy icon and prettify the event log 2011-02-13 00:02:06 +00:00
Hylke Bons 7ed60cc0a7 [repo] Run 'git gc' about every 10 commits 2011-02-13 00:02:06 +00:00
Hylke Bons da057026c7 [fetcher] Add more handy exclude rules 2011-02-12 23:55:27 +00:00
Hylke Bons 584312f88b [controller] Disable SSH host key checking temporarily for cloning 2011-02-06 01:10:15 +00:00
Hylke Bons 4c72883e28 Merge branch 'master' of https://github.com/kristi/SparkleShare into integration 2011-02-05 16:35:47 +00:00
Hylke Bons 4f883f4d87 [fetcher] adjust gitignore that is to be added adter cloning 2011-02-05 16:22:38 +00:00
Kristi adb8a5cbf4 Start processes after adding delegates to avoid duplicate pull messages. 2011-02-01 23:39:50 -08:00
Kristi be286b7672 Fix whitespace 2011-02-01 01:38:56 -08:00
Kristi 2dea155085 Fix bug when syncing a empty repository with no commits 2011-02-01 01:20:30 -08:00
Hylke Bons 5ae4ba3638 [osx] Hook things up 2010-12-18 01:01:43 +01:00
Łukasz Jernaś b6b481d738 Get data root dif info from configure 
Also fixes the path to the about dialog pixmap.
 2010-12-02 22:31:35 +01:00
Hylke Bons 71017990a9 [paths] Add a SparklePath for git 2010-11-27 21:24:34 +00:00
Hylke Bons 62a9afbb70 [repo] Combine paths properly 2010-11-27 21:24:34 +00:00
Hylke Bons 7a497997b5 [controller] Make OpenSparkleShareFolder abstract and implement a linux version 2010-11-27 21:24:34 +00:00
Hylke Bons 2e6ece3667 [repo] clean up comment a bit 2010-11-27 21:24:34 +00:00
wimh abd338b5c4 fix SparkleRepo.FormatCommitMessage () 2010-11-27 21:24:34 +00:00
Hylke Bons b0f3ae4dc2 [repo][controller] Abstract GetCommits method 2010-11-27 21:24:34 +00:00
Hylke Bons f15bba90e4 Remove double space type crime in license headers 2010-11-27 21:24:33 +00:00
Hylke Bons dd9c1db9f6 [listener] Prevent irc nick from becoming null 2010-11-27 21:24:33 +00:00
Hylke Bons 842c8683a8 [listener] Fix nick not being set 2010-11-27 21:24:32 +00:00
Hylke Bons fd6d489ce5 Move more logic from [intro] to [controller] 2010-11-27 21:24:31 +00:00
Hylke Bons 8f6a6f0710 Create a working Mac solution file and add some temporary workarounds 2010-11-27 21:24:31 +00:00
Hylke Bons 438d8e55d0 Create a working Mac solution file and add some temporary workarounds 2010-11-27 21:24:30 +00:00
Hylke Bons 6f58758bd0 [listener] Fix crash due to empty username 2010-11-16 00:56:21 +00:00
Hylke Bons 1625d2df31 [build] Make SS build and run on OSX 2010-11-13 22:30:00 +00:00