Commit graph

493 commits

Author SHA1 Message Date
Thomas Vollstädt 73f58892e8 Check readabilty only for existing files; Remove Exclusions when file is readable again 2011-09-05 17:34:07 +02:00
Thomas Vollstädt 85abd6bbb7 Skipping files which are unreadable by sparkleshare and added some methods for git's exclude file manipulation, see #10 2011-09-05 03:28:25 +02:00
Thomas Vollstädt c767dbc302 Added a new helper function for getting a relative-to-repostory path 2011-09-05 03:02:15 +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 3d9d7bb246 default path to git
avoid it stays null when not found in paths[]
2011-09-03 22:11:49 +02:00
wimh 6f27b23719 fix crash if file was renamed remote
see #8 (https://github.com/wimh/SparkleShare/issues/8)
2011-09-03 22:11:28 +02:00
wimh b6d17da8ef avoid crash if remote folder is deleted by user.
When all files including the .git folder are removed from a remote folder, but that folder is not removed from the SparkleShare config, SparkleShare crashes at startup, and when showing the log for that folder. This commit should avoid a crash.
2011-09-03 22:09:55 +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
Hylke Bons 8d062a059f Add nicer error reporting 2011-08-27 20:57:34 +02:00
Hylke Bons f3b53db8ab Fix whitespace for last commit 2011-08-27 17:53:17 +02:00
Hylke Bons f3cb3e6e0f setup: Add progress indication when adding a new folder 2011-08-27 17:10:39 +02:00
Hylke Bons 824fd3392b Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-27 02:42:09 +02:00
Hylke Bons 36d7269974 config: fix some whitespace 2011-08-27 01:11:53 +02:00
Hylke Bons 4d42639fcb fetcher git: don't prepend ssh:// when using git:// 2011-08-27 00:49:08 +02:00
Hylke Bons 3a571c7baf Create a new config.xml if it exists but is empty. Throw an error if the format is invalid. Fixes #315 2011-08-26 23:53:04 +02:00
Hylke Bons 79f3473467 Allow initial sync to be cancelled by adding a cancel button. Closes #307 2011-08-26 22:47:46 +02:00
Hylke Bons 57a6d8dbf0 Bring back descriptive commit message. Fixes #317 2011-08-26 21:00:22 +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
Wizard_85 33826c0735 Resolving Bug with already defined variable 'n' 2011-07-30 20:48:47 +02:00
Hylke Bons bf015d32f0 fetcher: add configuration option to show special characters in the git log. Fixes 288 2011-07-29 23:03:45 +01:00
Hylke Bons b326c85638 setup controller: fix wrong path being created 2011-07-25 02:26:46 +01:00
Hylke Bons dbce0e14e9 Add events to tcp listener 2011-07-24 19:22:17 +01:00
Hylke Bons 5afd3dc59f Refactor config and merge with Paths 2011-07-24 02:00:40 +01:00
Hylke Bons 253111e901 lib: add a User object 2011-07-23 22:33:15 +01:00
Hylke Bons 1eece7806e Add notifications for new notes 2011-07-23 22:23:14 +01:00
wimh 06ede455b7 fix bug in CheckForChanges 2011-07-23 21:41:56 +01:00
Hylke Bons 2d7b78df72 ... 2011-07-23 21:34:04 +01:00
Hylke Bons d92879d830 Revert "log: get commits from the last week, instead of the last X commits"
This reverts commit fba5162e4e.
2011-07-23 21:20:19 +01:00
Hylke Bons 1ed107e6e9 cleanup log and fix some small porting bugs 2011-07-23 20:57:36 +01:00
Hylke Bons d42dfe728f log: get commits from the last week, instead of the last X commits 2011-07-23 20:57:10 +01:00
Hylke Bons 89bb89afe8 hook up linux event log to new controller 2011-07-23 16:57:46 +01:00
Hylke Bons 6e4ace9643 add some comments 2011-07-23 15:27:35 +01:00
Hylke Bons 943dfcc767 Merge pull request #296 from ways/master
Rewritten autocomplete
2011-07-23 06:06:22 -07:00
Lars Falk-Petersen 3d707244b7 FolderPaths 2011-07-22 22:27:16 +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
Hylke ca762a9220 repo git: sync up initial commit 2011-06-28 20:03:10 +01:00
Alex Hudson 2e31e0094d Change 'notification' language to 'announcement' 2011-06-28 20:03:10 +01:00
Alex Hudson b27725ab72 Make listener type configurable from config file 2011-06-28 20:03:10 +01:00
Alex Hudson 7a7da66a50 Simplify some config functions, add a notification server entry 2011-06-28 20:03:10 +01:00
wimh 879abee53f C:\msysgit\msysgit -> C:\msysgit, see also 7631edc6f9 2011-06-27 18:04:28 +02:00
Hylke Bons 4018f82728 remove some TODOs 2011-06-26 02:41:00 +01:00
Hylke Bons c9b56efb3a Move translations initialization to SparkleUI and add translations to Mac UI 2011-06-26 02:00:53 +01:00
Hylke Bons a9c52ea738 note: don't push notes to read only repos 2011-06-25 22:39:53 +01:00
Hylke cd0b76bba8 fetch notes periodically 2011-08-25 16:02:34 +01:00
Hylke 7b87b1f6b9 avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs 2011-08-25 15:36:26 +01:00
Hylke ee51f685ef don't show a notification on new notes 2011-06-24 23:55:23 +01:00
Hylke b9eab774dc git fetch all branches 2011-06-24 23:43:11 +01:00
Hylke 52e44b2053 add note fetching line to config 2011-06-24 23:23:41 +01:00
Hylke ef292b34cc Merge branch 'master' into notes
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2011-06-24 19:13:02 +01:00
wimh d541f2179f fix merge issues 2011-06-23 22:05:09 +02:00
wimh 0fb2bc840e Merge remote branch 'upstream/master' into merge 2011-06-23 20:39:41 +02:00
wimh a97b7d9647 Merge commit '4f59a03a6f395b1db7d6' into merge 2011-06-23 20:38:21 +02:00
Hylke 6889b42963 Merge branch 'master' of github.com:hbons/SparkleShare 2011-06-23 15:24:08 +01:00
Hylke c5a092c8a4 repo: don't show warning statusicon upon initial commit 2011-06-23 13:56:25 +01:00
Hylke Bons 25e08545d2 continue implementing notes 2011-06-23 01:44:43 +01:00