beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3222 commits 31 branches 6 tags 52 MiB
Commit graph

259 commits

Author SHA1 Message Date
Hylke Bons fa1f52ad68 fetcher git: set the working dir to the tmp path. Fixes #488 2011-12-24 18:04:43 +01:00
Hylke Bons 53db52610f Use folders_path config option to create the tmo dir when it is set. Fixes #485 2011-12-18 17:10:06 +01:00
Hylke Bons 89c75c0746 event log: report size and history size. Closes #379 2011-12-15 16:15:29 +01:00
Hylke Bons c01c8525ef repo: Improve handling of offline repos. Fixes #439 2011-12-03 12:40:55 +01:00
Hylke Bons d83df10953 git: strip .empty from file paths in commit messages 2011-12-03 12:40:55 +01:00
Hylke Bons 6cb6eebca4 fetcher git: always create folder for ignore file first. Fixes #460 2011-12-01 19:41:49 +01:00
Hylke Bons 1856a9e922 repo git: also check for number of dirs before creating .empty file 2011-11-30 15:04:56 +01:00
Hylke Bons e4317fc412 setup: Show a warning when the user has a global gitignore. Closes #432 2011-11-28 14:40:34 +01:00
wimh a3899d6b1f Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 92e698ec40 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
wimh 36d562ab2c Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons 1c801b1e94 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
wimh da5e79f217 Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	SparkleLib/SparkleHelpers.cs
 2011-10-27 19:12:04 +02:00
Hylke Bons c9d5c2c8c2 git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons a7c130295f git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons a0c613e0d5 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
wimh 9202ed1117 Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00
wimh 1bbc3fb396 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons 3fd59b76fe git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons 4268c12dcb git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
wimh 89ecfe2d20 Merge remote-tracking branch 'upstream/master' into windows 
Conflicts:
	.gitignore
	SparkleShare/SparkleStatusIcon.cs
 2011-10-15 20:31:20 +02:00
wimh 1fcee3a69a Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00
wimh 5aece32778 Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/Program.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleExtensions.cs
	SparkleShare/SparkleLinController.cs
	SparkleShare/SparkleStatusIcon.cs
	SparkleShare/SparkleUI.cs
 2011-10-02 01:57:14 +02:00
wimh 636efe9011 Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
Hylke Bons d7adcf6d1f new Add Project dialog, powered by plugins 2011-10-01 23:16:25 +02:00
Hylke Bons 58926c4715 git: fix FillEmptyDirectories (somewhat) 2011-09-26 00:45:58 +02:00
Hylke Bons 54302d8d8f git: filling empty dirs: don't bother removing the .empty 2011-09-22 20:11:08 +01:00
Hylke Bons 7b81c37691 Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare 2011-09-22 13:05:14 +01:00
Hylke Bons f2e3776be2 Close some streams immediately. Remove broken scp backend 2011-09-15 00:58:19 +02:00
Beau Gunderson 1e9d6b752c 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
Hylke Bons 068f1dd26c Fix memory leak 2011-09-14 20:18:15 +02:00
Hylke Bons 2f492c00f8 Remove .empty files when they are no longer needed 2011-09-14 20:12:56 +02:00
Hylke Bons 1c404cc82d Allow empty folders to be added by putting a hidden file in each of them before committing 2011-09-14 19:30:17 +02:00
Hylke Bons ec42dce430 git log: trim .empty off folder paths 2011-09-14 17:57:40 +02:00
Hylke Bons 360dc1ab40 setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Hylke Bons 7c9c64a095 Fix ignore Firefox and Chromium temp download files 2011-09-11 23:58:19 +02:00
Hylke Bons c1b684dc2a Ignore Firefox and Chromium temp download files 2011-09-11 23:47:36 +02:00
Hylke Bons 19645f2182 fetcher git: default protocol is ssh:// 2011-09-11 22:15:23 +02:00
Thomas Vollstädt 989e647ead Merge remote-tracking branch 'upstream/master' into issue10 2011-09-08 15:40:17 +02:00
Thomas Vollstädt fb03cd0940 Implemented Exclusion Rule methods for handling non-readable files. See issue #10 2011-09-05 17:36:03 +02:00
wimh d66656da08 Add ~* to ignored files 
Fix crash when a conflict has been resolved already
 2011-09-03 23:38:53 +02:00
wimh 1e32374e81 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 60273631f3 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 8f6083a671 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 fcca840655 Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-28 21:56:25 +02:00
Hylke Bons 38cb2499ea Fix whitespace for last commit 2011-08-27 17:53:17 +02:00
Hylke Bons 71f476e255 setup: Add progress indication when adding a new folder 2011-08-27 17:10:39 +02:00
Hylke Bons a0db35d877 Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names 2011-08-27 02:42:09 +02:00
Hylke Bons 6917bd0ab7 fetcher git: don't prepend ssh:// when using git:// 2011-08-27 00:49:08 +02:00
Hylke Bons 9aeb848d33 Allow initial sync to be cancelled by adding a cancel button. Closes #307 2011-08-26 22:47:46 +02:00
Hylke Bons 78c399157b Bring back descriptive commit message. Fixes #317 2011-08-26 21:00:22 +02:00
wimh 26a39cab69 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 cc7ecec014 Resolving Bug with already defined variable 'n' 2011-07-30 20:48:47 +02:00
Hylke Bons 9ef9fd4243 fetcher: add configuration option to show special characters in the git log. Fixes 288 2011-07-29 23:03:45 +01:00
Hylke Bons 5eaa557de6 setup controller: fix wrong path being created 2011-07-25 02:26:46 +01:00
Hylke Bons fd62154f6c Refactor config and merge with Paths 2011-07-24 02:00:40 +01:00
Hylke Bons 8d19596f8d ... 2011-07-23 21:34:04 +01:00
Hylke Bons 49ce54f15c cleanup log and fix some small porting bugs 2011-07-23 20:57:36 +01:00
wimh 0b605aca44 Merge remote-tracking branch 'upstream/master' into windows 2011-07-21 11:26:09 +02:00
Hylke Bons bc79205308 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 4150ed7845 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 d199e5135a ignore note adds in the log 2011-07-17 01:37:36 +01:00
Hylke Bons 8cef98a010 fix notes 2011-07-17 01:22:39 +01:00
Hylke Bons 03d547e0c7 notes: stop using git-notes, use files instead 2011-07-16 23:30:46 +01:00
Alex Hudson 577c2f4069 Project Evil: allow SparkleShare to take full http(s) URIs without choking. 2011-06-30 12:53:05 +01:00
Alex Hudson a4bb32f607 Fix bpbb on git callout 2011-06-29 22:40:34 +01:00
Hylke Bons 0944efe992 repo git: don't hang on huge command outputs 2011-06-29 20:45:37 +01:00
Hylke Bons c498347931 repo: add a property that shows the currenly unsynced paths (to hook up with the badger) 2011-06-29 20:28:49 +01:00
Hylke 3d8c124e74 repo git: sync up initial commit 2011-06-28 20:03:10 +01:00
Hylke Bons dca0706fc5 remove some TODOs 2011-06-26 02:41:00 +01:00
Hylke Bons 80eadff9e1 Move translations initialization to SparkleUI and add translations to Mac UI 2011-06-26 02:00:53 +01:00
Hylke Bons 741910c8ad note: don't push notes to read only repos 2011-06-25 22:39:53 +01:00
Hylke 46140fb8d8 fetch notes periodically 2011-08-25 16:02:34 +01:00
Hylke 350cdbad1f 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 5e5d7481af git fetch all branches 2011-06-24 23:43:11 +01:00
Hylke 907d8e429d add note fetching line to config 2011-06-24 23:23:41 +01:00
Hylke 02ec2faf93 Merge branch 'master' into notes 
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
 2011-06-24 19:13:02 +01:00
wimh 642fb34389 Merge remote branch 'upstream/master' into merge 2011-06-23 20:39:41 +02:00
wimh 42db1ac7d4 Merge commit '4f59a03a6f395b1db7d6' into merge 2011-06-23 20:38:21 +02:00
Hylke 1428f486b1 repo: don't show warning statusicon upon initial commit 2011-06-23 13:56:25 +01:00
Hylke Bons bb7fe1d888 continue implementing notes 2011-06-23 01:44:43 +01:00
Hylke Bons 268d5c8027 save progress on notes 2011-06-23 01:44:43 +01:00
Hylke Bons 17110efe4b Add each note to its own namespace to avoid conflicts 2011-06-23 01:44:43 +01:00
Hylke Bons ebc49fe540 fix AddNote, add Note object 2011-06-23 01:44:43 +01:00
Hylke Bons 14aba962e4 make adding a note work 2011-06-23 01:44:43 +01:00
Hylke Bons ad8c96e2f4 add AddNote method 2011-06-23 01:44:43 +01:00
Hylke Bons 41f2241457 Fix timzones in timestamps, again... 2011-06-15 00:34:29 +01:00
wimh c16623715c reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00
Hylke Bons 410cd2a7c4 repo git: strip quotes from git commit message 2011-06-11 18:51:39 +01:00
Hylke Bons 01f266c21a repo git: strip quotes from git commit message 2011-06-10 21:40:13 +01:00
Hylke Bons c2a38157ab Save work 2011-06-10 00:01:45 +01:00
Hylke Bons a5ac4ab5fa changeset: Add a Folder property 2011-06-09 21:25:36 +01:00
Hylke Bons 987127f5ec Update out of date SparkleShare tagline 2011-06-02 00:08:05 +01:00
Hylke Bons e7da511b77 fetcher git: fix url construction 2011-05-31 18:30:28 +01:00
Hylke Bons 21181c34e4 Move url forming logic to the fetcher 2011-05-31 02:28:23 +01:00
Hylke Bons 99cf47e45c repo git: only disable emable watching once 2011-05-30 16:20:25 +01:00
Hylke Bons 1659387fb0 repo git: convert commit timestamps by converting them to utc, then converting them to our timezone 2011-05-29 17:47:40 +01:00
Hylke Bons b5c8332e15 repo: normalise timezones for the log 2011-05-29 16:48:47 +01:00
Hylke Bons aab6e36e4d repo: remove obsolete static IsRepo method 2011-05-28 20:23:33 +01:00
Hylke Bons 857cf4e57d config: add url as part of the folder config xml 2011-05-26 23:41:55 +01:00
Hylke Bons 865582eef6 Fix configuration issues 2011-05-26 20:46:49 +01:00
Hylke Bons e307bf0ebe repo git: turn off garbage collection by default 2011-05-22 18:54:47 +01:00
Hylke Bons 3a42d1c1de repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later 2011-05-22 18:49:04 +01:00
Hylke Bons 3efe9060c2 repo: do a full SyncUpBase after a git rebase 2011-05-22 17:51:58 +01:00
Hylke Bons d78ad40397 repo git: fix compile error 2011-05-22 16:29:23 +01:00
Hylke Bons a6735b7cdb repo git: push changes after conflict resolution 2011-05-22 16:27:06 +01:00
Hylke Bons 8a35a4a490 repo: tweak algorithm 2011-05-22 15:46:24 +01:00
Hylke Bons f8f7ffa88a build: fix build system 2011-05-22 12:42:22 +01:00
Hylke Bons 1da17be25d build: move backend classes into subfolders 2011-05-22 12:28:14 +01:00