Commit graph

413 commits

Author SHA1 Message Date
Beau Gunderson 9ee12f31ad Added the GIT_SSH environment variable and set it to "ssh" so that git will use ssh-agent; fixed a bug where SparkleShare creates an exclude file within the "info" directory without checking if the "info" directory exists. 2011-09-14 12:19:53 -07: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 deafe9c5c4 set PlatformTarget from x86 to AnyCPU 2011-08-13 22:33:48 +02:00
wimh 9ebf8c8f98 add and integrate submodule TextTemplating (TextTransform.exe) in build 2011-08-13 01:33:15 +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 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 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 67056369af Fix notifications
The check wether it was a new commit always returned false
2011-07-21 00:49:16 +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
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 9ff8e7cf95 Fix css and add Show All N feature 2011-07-16 19:41:37 +01:00
Hylke Bons 4b74b09f75 Update project and make files 2011-07-08 22:53:03 +01:00
Hylke 1e13ca711f intro config: we want to prefill a host only once 2011-07-02 17:20:54 +01:00
Hylke 118591e262 UI is not allowed to access config. go via controller and talk about hosts 2011-07-02 17:10:57 +01:00
Hylke b57a59cc60 config: get urls in a simpler way and clean up 2011-07-02 17:05:05 +01:00
Hylke c8df2ce85a Merge https://github.com/ways/SparkleShare into bookmarks 2011-07-02 16:53:01 +01:00
Lars Falk-Petersen b102609899 Formatting and removing of comments. 2011-07-02 14:56:42 +02:00
Lars Falk-Petersen f28b6e8512 Formatting and removing of comments. 2011-07-02 14:55:56 +02:00
Lars Falk-Petersen 70adad83b4 Strip ssh:// and git:// from urls. 2011-07-02 14:46:08 +02:00
Lars Falk-Petersen 3fc7ff54cd Added GetUrls 2011-07-02 13:29:37 +02:00
Lars Falk-Petersen 8ab8c847fc Removed PrevServer, PrevFolder 2011-07-02 12:37:04 +02:00
wimh 0079c209d0 change platform to x86 because gtk# does not support x64 2011-07-02 10:24:33 +02:00
Hylke Bons beafcebd5a Fix tcp listener (needed newlines at the end of messages) 2011-07-02 02:24:12 +01:00
Hylke Bons cf1a7a5e2b adjust tcp listener to work with nodejs server (subscribing doesn't work yet) 2011-07-02 02:13:33 +01:00
Lars Falk-Petersen 046199428b If options don't exist in config, create them! 2011-07-01 09:58:51 +02:00
Lars Falk-Petersen b9645cc4ae Problems with missing options in earlier config. 2011-07-01 02:10:13 +02:00
Lars Falk-Petersen dc3d65562a Added PrevFolder to config. 2011-07-01 01:43:55 +02:00
lars 27504373ef Added saving of last used server. 2011-06-30 23:31:55 +02:00
Alex Hudson f61212b930 Project Evil: allow SparkleShare to take full http(s) URIs without choking. 2011-06-30 12:53:05 +01:00
Alex Hudson 524496efc9 Put in XML fragment parsing - listener now basically works over tcp 2011-06-29 23:36:18 +01:00
Alex Hudson b94e7c846a Convert JSON commands to TCP server into XML fragments. 2011-06-29 23:36:18 +01:00
Alex Hudson 2769e38866 Remove IRC listener code from TCP version 2011-06-29 23:36:18 +01:00
Alex Hudson 5fea05f84d Make tcp listener startup-able 2011-06-29 23:36:18 +01:00
Alex Hudson c385fe21ea Fix bpbb on git callout 2011-06-29 22:40:34 +01:00
Hylke Bons cfbdf98150 repo git: don't hang on huge command outputs 2011-06-29 20:45:37 +01:00
Hylke Bons de564d89ff repo: add a property that shows the currenly unsynced paths (to hook up with the badger) 2011-06-29 20:28:49 +01:00
wimh 509f969e9c fix compile problem on windows x64 2011-06-29 16:28:00 +02:00
Hylke 138e8e744f Fix nullreference exception when adding new files before starting sparkleshare 2011-06-28 20:54:47 +01:00
Hylke d3e20e22d7 repo: create watch after initial change set 2011-06-28 20:06:04 +01:00