Hylke Bons
|
76c5756864
|
repo: resolve any kind of rebase conflict
|
2011-04-30 02:43:42 +02:00 |
|
|
Hylke Bons
|
1d13e7d6ee
|
use absolute paths to move our version of conflicting file
|
2011-04-30 02:43:41 +02:00 |
|
|
Hylke Bons
|
c65d76ecd6
|
save work on conflict resolution fix
|
2011-04-30 02:43:41 +02:00 |
|
|
Hylke Bons
|
36b856e8bf
|
repo: controller: bring back support for renames in event logs
|
2011-04-28 13:46:22 +02:00 |
|
|
Hylke Bons
|
4131958a0e
|
repo: don't fetch changes when we're busy adding files
|
2011-04-27 18:44:59 +02:00 |
|
|
Hylke Bons
|
ef89629e7c
|
repo: add support for renames and names with spaces in FormatCommitMessage method
|
2011-04-27 12:04:51 +02:00 |
|
|
Hylke Bons
|
7bcefc9831
|
[repo] Add a simple notification queue when disconnected, and send them when reconnected.
|
2011-04-23 15:56:05 +02:00 |
|
|
Hylke Bons
|
e609c0b3a4
|
[repo] add back empty repo check without Git#
|
2011-04-21 23:14:44 +02:00 |
|
|
Hylke Bons
|
949e2ed464
|
Use unicode for standardoutput. Fixes weird characters in logs but needs the latest mono
|
2011-04-21 19:45:11 +02:00 |
|
Bertrand Lorentz
|
111bef36d8
|
Remove GitSharp from the build and delete submodule
|
2011-04-21 17:15:32 +02:00 |
|
|
Hylke Bons
|
aef32e64ab
|
Uncomment out conflict event. Fixes build errors
|
2011-04-21 16:49:26 +02:00 |
|
|
Hylke Bons
|
34983c28e7
|
Remote last bits of Git# code and comment out broken conflict resolution code
|
2011-04-21 15:46:46 +02:00 |
|
|
Hylke Bons
|
c6d189f028
|
Don't rely on Git# for FormatCommitMessage ()
|
2011-04-21 14:25:28 +02:00 |
|
|
Hylke Bons
|
1c5e05685a
|
remove unneeded gitsharp.* libs
|
2011-04-20 16:43:10 +02:00 |
|
|
Hylke Bons
|
493e39dabe
|
[repo] add todo
|
2011-04-20 16:40:17 +02:00 |
|
|
Hylke Bons
|
97f419666d
|
[repo] don't rely on Git# for username, email and remote url
|
2011-04-20 16:32:34 +02:00 |
|
|
Hylke Bons
|
8a93f69892
|
[repo] don't rely on Git# Directory property
|
2011-04-20 16:23:02 +02:00 |
|
|
Hylke Bons
|
d7b2a3ed08
|
[repo] Fix whitespace
|
2011-04-20 15:02:20 +01:00 |
|
|
Hylke Bons
|
780d8ccc61
|
tmp
|
2011-04-17 12:22:20 +01:00 |
|
|
Hylke Bons
|
dc11211a00
|
Use git command for committing instead of GitSharp
|
2011-04-17 00:30:57 +01:00 |
|
|
Hylke Bons
|
9604be2a53
|
Use git command for getting the current hash instead of GitSharp
|
2011-04-17 00:19:42 +01:00 |
|
|
Hylke Bons
|
d4bdea0be6
|
[repo] pull before pushing in every situation
|
2011-04-15 01:28:42 +01:00 |
|
|
Hylke Bons
|
42f461b507
|
[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
|
4c9216a8a2
|
Fix quit method
|
2011-03-27 13:56:36 +01:00 |
|
|
Hylke Bons
|
68f0610979
|
[repo] Fix the GetCommits regex to also parse GMT-n timezones
|
2011-03-24 00:50:08 +00:00 |
|
|
Hylke Bons
|
1e4ef90ef5
|
[paths] change the way git lookup is done
|
2011-03-23 23:14:50 +00:00 |
|
|
Hylke Bons
|
6410633c12
|
Merge branch 'master' of ssh://github.com/hbons/SparkleShare
|
2011-03-22 22:50:25 +00:00 |
|
Hylke Bons
|
7a722f52be
|
[lib] Allow disabling of central notification server and fallback to own
|
2011-03-22 13:44:52 +00:00 |
|
|
Hylke Bons
|
c983d4a067
|
[osx] quickly fix the git path
|
2011-03-20 19:24:57 +00:00 |
|
|
Hylke Bons
|
3cb52d217b
|
[commit] remove unneeded member
|
2011-03-20 16:26:56 +00:00 |
|
|
Hylke Bons
|
5959f1db5f
|
[log] remove 'IsFileDump' workaround and move message code to controller
|
2011-03-20 14:59:35 +00:00 |
|
|
Hylke Bons
|
6c5bf06558
|
New thread + spinner instead of freeze when opening big logs
|
2011-03-16 15:13:14 +00:00 |
|
|
Hylke Bons
|
0dfac3279f
|
Show menu item icons on Fedora too
|
2011-03-16 00:01:37 +00:00 |
|
|
Hylke Bons
|
53eca6e848
|
[watcher] ignore files in .git/
|
2011-03-13 22:26:01 +00:00 |
|
|
Hylke Bons
|
538bdf0dd0
|
Fix notifications
|
2011-03-13 02:07:47 +00:00 |
|
|
Hylke Bons
|
10b05898dd
|
[statusicon] update icons and add icons for pressed state syncing animation
|
2011-03-13 01:21:49 +00:00 |
|
|
Hylke Bons
|
d79fcce3a2
|
[osx] Pop up a warning when the backend (git) isn't found.
|
2011-03-13 00:15:19 +00:00 |
|
|
Hylke Bons
|
be2edd8866
|
Fix cloning problem and better debuginfo
|
2011-03-12 19:39:42 +00:00 |
|
|
Hylke Bons
|
db0af9dbda
|
[repo] add todo
|
2011-03-12 18:58:04 +00:00 |
|
|
Hylke Bons
|
c000f8cb0c
|
Use SparkleLib.IsRepo for folder checking
|
2011-03-12 18:36:03 +00:00 |
|
|
Hylke Bons
|
e8ae8198ff
|
Merge branch 'fetcher-fix'
Conflicts:
SparkleLib/SparkleFetcher.cs
|
2011-03-12 17:58:53 +00:00 |
|
|
Hylke Bons
|
fa4e7dd368
|
[fetcher] Fix InstallConfiguration method
|
2011-03-12 17:53:49 +00:00 |
|
|
Hylke Bons
|
ced6065c18
|
[fetcher] no need to keep error message in memory
|
2011-03-12 16:18:36 +00:00 |
|
|
Hylke Bons
|
b1bd01b86a
|
Merge branch 'master' of https://github.com/palango/SparkleShare into palango-master
|
2011-03-12 16:10:24 +00:00 |
|
|
Hylke Bons
|
4fb08eae64
|
[fetcher] set core.ignorecase to false for each folder
|
2011-03-12 15:38:49 +00:00 |
|
|
Hylke Bons
|
68d7d99f1e
|
[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
|
b4d2b47cb7
|
Add SparkleAbout to .csproj
|
2011-03-08 23:55:21 +00:00 |
|
|
Hylke Bons
|
d5dced649b
|
[repo] align regexes
|
2011-03-06 15:29:36 +00:00 |
|
Paul Lange
|
9f31bc23e2
|
Add some error messages
|
2011-03-06 16:07:16 +01:00 |
|
|
Hylke Bons
|
c67277c079
|
[listener] Use SparkleShare's dedicated notification server instead of irc.gnome.org
|
2011-03-04 18:31:02 +00:00 |
|