Hylke Bons
|
b505cde0e8
|
use absolute paths to move our version of conflicting file
|
2011-04-30 02:43:41 +02:00 |
|
Hylke Bons
|
f4862b32f3
|
save work on conflict resolution fix
|
2011-04-30 02:43:41 +02:00 |
|
Hylke Bons
|
d91a922782
|
repo: resolve any kind of rebase conflict
|
2011-04-30 02:42:48 +02:00 |
|
Hylke Bons
|
de0f02ae83
|
Merged pull request #157 from thelightmaker/patch-1.
German translation.
|
2011-04-29 06:58:02 -07:00 |
|
thelightmaker
|
0fa8985516
|
Updated german translation.
|
2011-04-29 06:41:29 -07: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
|
8fc3ad11ca
|
repo: controller: bring back support for renames in event logs
|
2011-04-28 13:46:22 +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 |
|
Hylke Bons
|
92a5db7dac
|
Remove GitSharp from Mac solution file
|
2011-04-21 17:27:47 +02:00 |
|
Bertrand Lorentz
|
1e88eab334
|
Remove GitSharp from the build and delete submodule
|
2011-04-21 17:15:32 +02:00 |
|
Bertrand Lorentz
|
31916e354d
|
SparkleIntro: Fix build
|
2011-04-21 17:05:15 +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
|
f81f8da115
|
[about] actually check for new versions
|
2011-04-18 00:49:50 +01:00 |
|
Łukasz Jernaś
|
12c4ff0796
|
Fixup Finnish translation
|
2011-04-17 22:09:45 +02:00 |
|
Olli Jarva
|
9fdd8be84c
|
Add Finnish translation
|
2011-04-17 21:23:03 +02:00 |
|
Hylke Bons
|
b833655e53
|
Add newlines
|
2011-04-17 13:40:34 +01:00 |
|
Hylke Bons
|
99cbfb43a5
|
Merge remote branch 'origin/about' into about
Conflicts:
SparkleShare/SparkleAbout.cs
|
2011-04-17 13:35:25 +01:00 |
|
Hylke Bons
|
86b1f3fcac
|
[about] hook up VersionUpToDate event
|
2011-04-17 13:31:40 +01:00 |
|
Hylke Bons
|
2f4922d5b7
|
[about] Move version checking to [controller] with events
|
2011-04-17 12:22:32 +01:00 |
|
Hylke Bons
|
dc003cba89
|
[about] some version check work
|
2011-04-17 12:22:32 +01:00 |
|
Hylke Bons
|
9f0b0571a9
|
tmp
|
2011-04-17 12:22:20 +01:00 |
|
Hylke Bons
|
866e3c16a1
|
Show libnotify bubble and set urgent hint to the window when cloning has finished
|
2011-04-17 01:29:06 +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 |
|
Kepi
|
4ad1afc650
|
[controller] We has to wait for ssh-add to finish
|
2011-04-16 21:53:21 +02: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 |
|
Lapo Calamandrei
|
f2022223de
|
Put the pid file in a place where it doesn't get deleted.
|
2011-04-15 00:28:04 +01:00 |
|
Hylke Bons
|
438405ecae
|
[into][osx] Don't crash when the user doesn't have a unix username set
|
2011-04-06 07:24:20 -07:00 |
|
Hylke Bons
|
f9fcfac9de
|
[intro] Don't crash when the user doesn't have a unix username set
|
2011-04-06 07:23:08 -07:00 |
|
Hylke Bons
|
e4720628cc
|
Fix quit method
|
2011-03-27 13:56:36 +01:00 |
|
Hylke Bons
|
85626a6da2
|
[controller] Prevent some crashes clicking logs byy only showing them once the list is done loading
|
2011-03-27 13:46:56 +01:00 |
|
Hylke Bons
|
2adedd88f9
|
[controller] Prevent some crashes clicking logs byy only showing them once the list is done loading
|
2011-03-25 10:24:46 +00:00 |
|
Łukasz Jernaś
|
52d98d4175
|
Added Czech translation from transifex
|
2011-03-24 19:00:10 +01:00 |
|
Hylke Bons
|
0749c1a5ce
|
[about] hook up VersionUpToDate event
|
2011-03-24 10:28:05 +00:00 |
|
Hylke Bons
|
6310ba1f76
|
[about] Move version checking to [controller] with events
|
2011-03-24 10:22:10 +00:00 |
|
Hylke Bons
|
82f49665c5
|
Merge branch 'master' into about
|
2011-03-24 10:15:33 +00:00 |
|
Hylke Bons
|
c714ad4af3
|
Update Dutch translation
|
2011-03-24 02:09:49 +00:00 |
|