wimh
|
9f729e5e3e
|
Merge with upstream (11a932b73e)
|
2011-10-02 00:52:21 +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
|
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 |
|
|
wimh
|
903eed8c23
|
Merge branch 'winforms' into windows
|
2011-08-13 23:22:54 +02:00 |
|
|
wimh
|
b55309da0c
|
Revert "fix handling of paths to be able to clone a github repo (#7)"
This reverts commit 590b8e3a38.
This is fixed slightly different in the winforms branch, so
want to revert it for a clean merge.
|
2011-08-13 23:16:43 +02:00 |
|
|
wimh
|
deafe9c5c4
|
set PlatformTarget from x86 to AnyCPU
|
2011-08-13 22:33:48 +02:00 |
|
|
wimh
|
2a1368c5f6
|
fix git path
|
2011-08-13 01:46:47 +02:00 |
|
|
wimh
|
9ebf8c8f98
|
add and integrate submodule TextTemplating (TextTransform.exe) in build
|
2011-08-13 01:33:15 +02:00 |
|
|
wimh
|
9ef53d34de
|
fix crash at shutdown
See https://github.com/chillitom/CefSharp/issues/27
|
2011-08-07 01:17:33 +02:00 |
|
|
wimh
|
239d41f121
|
fix some issues on close + cleanup
|
2011-08-07 01:06:09 +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 |
|
|
wimh
|
408c285243
|
fix handling of paths to be able to clone a github repo (#7)
|
2011-08-04 22:33:02 +02:00 |
|
|
wimh
|
8eaa91532d
|
convert SparkleEventLog to winforms
|
2011-07-31 02:44:05 +02:00 |
|
|
wimh
|
bdf226ead2
|
convert SparkleAbout to winforms
|
2011-07-23 22:37:09 +02:00 |
|
|
wimh
|
ea20f12a56
|
delete Win32 folder
|
2011-07-23 20:24:12 +02:00 |
|
|
wimh
|
5a4038df87
|
convert SparkleStatusIcon to winforms
|
2011-07-23 20:18:58 +02:00 |
|
|
wimh
|
933f1c5574
|
stop downloading further avatars w/o internet access
|
2011-07-23 00:16:03 +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
|
8a16f940ef
|
log: not everything is a time interval
|
2011-07-22 02:56:56 +01:00 |
|
|
Hylke Bons
|
1cd9a2cf06
|
update NEWS
|
2011-07-22 02:18:16 +01: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
|
b870adcfc4
|
update NEWS
|
2011-07-21 02:50:02 +01:00 |
|
|
Hylke Bons
|
59f979a71f
|
update NEWS
|
2011-07-21 02:46:32 +01:00 |
|
|
Hylke Bons
|
9d306e2293
|
html: don't go overboard on padding
|
2011-07-21 02:37:21 +01: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
|
45b6f0e668
|
update version for next release
|
2011-07-21 00:17:28 +01:00 |
|
|
Hylke Bons
|
a81940f9e5
|
update version in solution
|
2011-07-21 00:15:48 +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 |
|
Łukasz Jernaś
|
164dea6c78
|
Update POTFILES.in
|
2011-07-19 07:02:35 +02:00 |
|
Sven Koehler
|
9f05e30eaf
|
Update Dutch translation from Transifex
|
2011-07-19 06:58:09 +02:00 |
|
|
Sven Koehler
|
da421db465
|
Update Esperanto translation from Transifex
|
2011-07-19 06:56:22 +02:00 |
|
Emmanouel Kapernaros
|
2b5e29cded
|
Update Greek translation from Transifex
|
2011-07-19 06:52:02 +02:00 |
|
|
Hylke Bons
|
420aa456b3
|
remove unneeded info.plist
|
2011-07-17 01:47:24 +01:00 |
|
|
Hylke Bons
|
f9753c981e
|
Merge branch 'logstyle'
|
2011-07-17 01:40:36 +01: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
|
4ec894bc67
|
ellipsize all events
|
2011-07-16 22:30:35 +01:00 |
|
|
Hylke Bons
|
8009530c69
|
Add color back to change type icons, rearrange source files
|
2011-07-16 22:00:40 +01:00 |
|
|
Hylke Bons
|
47e31c2d93
|
tweak css
|
2011-07-16 21:09:17 +01:00 |
|
|
Hylke Bons
|
e2be732b71
|
tweak css
|
2011-07-16 20:55:22 +01:00 |
|
|
Hylke Bons
|
0275dc8d31
|
Add avatars to notes
|
2011-07-16 20:38:04 +01:00 |
|