Hylke Bons
63497bbed3
git: Don't compress already compressed file formats
2012-01-11 22:15:13 +00:00
serras
78a0b5ce34
Use layout in setup windows
2012-01-09 18:36:24 +01:00
serras
0dd7605834
Make it compile with Sparkleshare 0.6 and create .msi file correctly
2012-01-08 22:31:14 +01:00
serras
f4c4a94000
Merge remote-tracking branch 'hbons/master' into gettext-cs
...
Conflicts:
.gitignore
.gitmodules
SparkleLib/Git/SparkleFetcherGit.cs
SparkleLib/Hg/SparkleRepoHg.cs
SparkleLib/SparkleConfig.cs
SparkleLib/SparkleFetcherBase.cs
SparkleLib/SparkleListenerIrc.cs
SparkleShare/SparkleBubblesController.cs
SparkleShare/SparkleControllerBase.cs
SparkleShare/SparkleStatusIcon.cs
2012-01-07 14:13:36 +01:00
Hylke Bons
5665ea831e
config: don't change SSH config when email is unknown. Fixes #499
2012-01-01 14:58:53 +01:00
Hylke Bons
394cd39b57
repo: Also report progress on fetch
2011-12-30 15:00:15 +01:00
Hylke Bons
f30e534bfb
statusicon: add sync progress stats (one repo at a time only for now). Closes #222
2011-12-30 01:44:41 +01:00
Hylke Bons
317c7842a7
Don't exclude all dotfiles, Fixes #495
2011-12-29 12:44:18 +01:00
wimh
b8667b7b8b
fix potential crash at shutdown
2011-12-28 01:03:27 +01:00
Hylke Bons
45655d4395
fetcher: fix permissions on ssh config file
2011-12-25 20:33:39 +01:00
Hylke Bons
b84b6ba499
Fix warning
2011-12-25 20:32:39 +01:00
Hylke Bons
b391fd0a44
fetcher: uncomment code to set permissions on SSH config file
2011-12-25 19:02:14 +01:00
Hylke Bons
88700a83d6
fetcher git: Fix race condition when stopping a clone
2011-12-24 19:17:54 +01:00
Hylke Bons
f1605a566f
fetcher git: set the working dir to the tmp path. Fixes #488
2011-12-24 18:04:43 +01:00
Hylke Bons
e9048d5180
config: don't add identity to .ssh/config twice
2011-12-20 17:47:39 +01:00
Hylke Bons
c235248078
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
a4d1e5d120
event log: report size and history size. Closes #379
2011-12-15 16:15:29 +01:00
Hylke Bons
3f70f08084
controller: lock when writing avatars. Fixes #476
2011-12-11 21:00:51 +01:00
Hylke Bons
20c6ac32d0
config: explicitly point to the sparkleshare private key in ssh config. Closes #396
2011-12-11 20:45:18 +01:00
wimh
bb1d277cb0
avoid empty lines being added to .ssh/config file
2011-12-11 15:53:05 +01:00
wimh
613fa43f0d
avoid empty lines being added to .ssh/config file
2011-12-10 22:07:55 +01:00
Hylke Bons
9a3e34381c
repo: Improve handling of offline repos. Fixes #439
2011-12-03 12:40:55 +01:00
Hylke Bons
6540b19ae2
git: strip .empty from file paths in commit messages
2011-12-03 12:40:55 +01:00
Hylke Bons
23fed0359f
fetcher git: always create folder for ignore file first. Fixes #460
2011-12-01 19:41:49 +01:00
Hylke Bons
6ad39da458
repo git: also check for number of dirs before creating .empty file
2011-11-30 15:04:56 +01:00
Hylke Bons
5030933abf
setup: Show a warning when the user has a global gitignore. Closes #432
2011-11-28 14:40:34 +01:00
Hylke Bons
0c5b1ebae2
remove more smartirc references
2011-11-19 14:24:09 +00:00
Hylke Bons
bc25f25bbb
remove smartirc and related code. Closes #435
2011-11-18 21:40:42 +00:00
Hylke Bons
c1a3d1ff2c
Move SparkleOptions from lib to UI. Remove mercurial code.
2011-11-18 21:16:57 +00:00
Hylke Bons
444082f396
Move FormatMessage to bubbles controller
2011-11-18 20:53:53 +00:00
wimh
2fa6c72fd8
Merge remote-tracking branch 'upstream/master' into windows
2011-11-14 20:50:27 +01:00
Hylke Bons
8d315b7fa9
listener: point to a DNS record instead of an IP address
2011-11-13 22:03:13 +00:00
Hylke Bons
7e18e6d3cb
repo: put a lock on toggling the watcher. Should fix #358
2011-11-13 18:04:13 +00:00
Hylke Bons
be14c48ae9
repo base: Start initial remote check in a new thread. Prevents blocking an fixes #321
2011-11-13 00:57:00 +00:00
Hylke Bons
07b727bb72
repo git: we only need to determine CurrentRevision once per session.
2011-11-13 00:39:29 +00:00
Hylke Bons
1100fa205b
repo: When listening, make poll interval long for every repo
2011-11-13 00:27:25 +00:00
Hylke Bons
17c8433f9a
Merge branch 'enhancements' of https://github.com/travisghansen/SparkleShare into thansen
...
Conflicts:
SparkleLib/SparkleListenerBase.cs
SparkleLib/SparkleRepoBase.cs
2011-11-12 17:47:39 +00:00
Hylke Bons
76a24f9af3
config: skip badly formatted uris. Fixes #410
2011-11-12 01:54:08 +00:00
Hylke Bons
11609bccf2
Update README to build on OSX. Closes #383
2011-11-11 22:01:51 +00:00
Hylke Bons
05dd261789
config: Fix error
2011-11-07 18:35:00 +00:00
Hylke Bons
b29c60bf14
config: use File.WriteAllText to write initial config
2011-11-07 18:03:19 +00:00
Travis Glenn Hansen
448e39924d
bit more sync/listener logic
2011-11-07 08:39:33 -07:00
Hylke Bons
9855c1b154
Fix build. Closes #403
2011-11-06 14:37:56 +00:00
Travis Glenn Hansen
3d4a8b5f9d
making announcements more robust and intelligent
2011-11-05 15:09:09 -06:00
wimh
9607a3801d
fix compiler errors caused by merge
2011-11-04 22:44:39 +01:00
Travis Glenn Hansen
9ead45dc1c
Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements
2011-11-04 14:55:16 -06:00
wimh
7d226076a3
Merge remote-tracking branch 'upstream/master' into windows
2011-11-04 21:49:47 +01:00
Hylke Bons
73d5619615
repo: cover case where we're in a poll triggered syncdown and a message comes in half way through
2011-11-04 16:24:50 +00:00
Travis Glenn Hansen
74fc03f354
Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements
2011-11-03 18:21:48 -06:00
Hylke Bons
25877948ad
repo: add better check for duplicate messages
2011-11-04 00:05:25 +00:00
Hylke Bons
26df391130
Fix compile error. Closes #402
2011-11-03 23:28:25 +00:00
Travis Glenn Hansen
d0a4d126fc
attempting to prevent the same announcement from being processed twice
2011-11-03 17:15:59 -06:00
Hylke Bons
439d26f803
listener: don't add duplicate messages to queue. attempt #2
2011-11-03 16:54:01 +00:00
Hylke Bons
1696712c21
listener: don't add duplicate messages to queue
2011-11-03 16:22:12 +00:00
Hylke Bons
46d8eecb51
Fix host key check disabling/enabling by surrounding config with comments. Closes #390 .
2011-10-30 21:24:19 +00:00
Hylke Bons
92fe955910
config: fix error
2011-10-29 15:47:14 +01:00
Hylke Bons
337194538d
config: catch FileNotFoundException and create config
2011-10-29 14:27:53 +01:00
wimh
61bd9af894
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
SparkleLib/SparkleHelpers.cs
2011-10-27 19:12:04 +02:00
wimh
a10dc3b3fb
Revert "refs #18 fix handling of allow_passwordless_join setting"
...
This reverts commit 475c4b479e
.
2011-10-27 19:07:43 +02:00
PierreAronnax
6017e86665
SparkleListenerBase: Fixing delivering of queued messages.
...
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
2011-10-25 21:24:30 +03:00
PierreAronnax
9204fef03d
SparkleListenerBase: Fixing delivering of queued messages.
...
Removing a list item from inside a foreach causes a "InvalidOperationException: Collection Was Modified" error. First creating a copy fixes this.
2011-10-25 20:16:20 +02:00
PierreAronnax
15a827acd6
SparkleListenerTCP: Fixing Reconnect
...
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
2011-10-25 19:16:29 +03:00
PierreAronnax
d97e8a8826
SparkleListenerTCP: Fixing Reconnect
...
Calling socket.Connect again after socket.Close causes an ObjectDisposedException. Recreating the socket before connecting fixes this.
2011-10-25 17:28:32 +02:00
Hylke Bons
80cf3cf26a
git: add some more MS Office exclude rules
2011-10-24 19:43:55 +01:00
Hylke Bons
a018a6181b
git: add some more MS Office exclude rules
2011-10-24 19:42:18 +01:00
Hylke Bons
2fba6f4bb7
Fix compile error. Closes #375
2011-10-24 16:44:42 +01:00
Hylke Bons
6d1d58ff9a
Add helper method DiffPaths
2011-10-23 13:48:13 +01:00
Hylke Bons
877aff9548
fetcher git: add exclude rules for temporary MS Office files
2011-10-23 13:39:00 +01:00
Hylke Bons
fff5c8c2b2
irc listener: fix bugs in channel password feature
2011-10-22 15:02:22 +01:00
wimh
f75ce66443
refs #18 fix handling of allow_passwordless_join setting
2011-10-21 22:08:30 +02:00
wimh
ef28cb4a14
Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs)
2011-10-17 22:20:37 +02:00
wimh
0453083424
Merge remote-tracking branch 'upstream/master' into windows
2011-10-17 21:24:41 +02:00
Hylke Bons
363209cd15
Fix compile error and fix some style changes for merge request 368#
2011-10-17 19:54:41 +02:00
Hylke Bons
59d4a7367f
Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass
2011-10-17 19:43:05 +02:00
Hylke Bons
39ec42d167
git fetcher: System.Xml no longer needed here
2011-10-17 19:37:35 +02:00
Hylke Bons
537218b46e
git: Always use user info from global config to commit. Fixes #367
2011-10-17 19:34:46 +02:00
Nícolas Lazarte Kaqui
a3426e5ca5
accepting the suggestions made by hbons
2011-10-16 16:46:37 -02:00
wimh
75eb8c7f32
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
.gitignore
SparkleShare/SparkleStatusIcon.cs
2011-10-15 20:31:20 +02:00
Nícolas Lazarte Kaqui
9a1a7f4626
included setting to allow or disallow access to key channels without
2011-10-11 12:11:12 -03:00
Hylke Bons
4021ef40c5
Merge branch 'master' of https://github.com/funkey/SparkleShare
2011-10-05 23:26:06 +02:00
Jan Funke
73d11e0f9d
tcp-listener: fallback to polling instead of crashing on socket errors
2011-10-03 14:39:26 +02:00
wimh
86c84e4120
Merge remote-tracking branch 'tvollstaedt/issue10' into windows
2011-10-02 02:53:31 +02:00
wimh
cad52d7072
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
9f729e5e3e
Merge with upstream ( 11a932b73e
)
2011-10-02 00:52:21 +02:00
Hylke Bons
5a9b7d4ba6
new Add Project dialog, powered by plugins
2011-10-01 23:16:25 +02:00
Jan Funke
1a91c6d9c2
do not attempt to change file attributes of symlinks
2011-10-01 20:08:05 +02:00
Hylke Bons
e7c83ca06b
git: fix FillEmptyDirectories (somewhat)
2011-09-26 00:45:58 +02:00
Hylke Bons
2a0ef501a2
listener: default to the plain TCP protocol
2011-09-25 22:52:03 +02:00
Hylke Bons
d661c184e2
Remove OS detection code, rely on an abstract base controller with similarly named custom controller subclasses for each OS instead.
2011-09-25 22:52:03 +02:00
Hylke Bons
62b0bc2524
git: filling empty dirs: don't bother removing the .empty
2011-09-22 20:11:08 +01:00
Hylke Bons
0bdaa01099
Merge branch 'tutorial' of ssh://github.com/hbons/SparkleShare
2011-09-22 13:05:14 +01:00
Hylke Bons
87e6fc56a0
config: catch IOException, FileException does not exist
2011-09-22 12:55:35 +01:00
Nícolas Lazarte Kaqui
c869a07bd6
When not set the key user try to join no key
2011-09-20 15:11:38 -03:00
Hylke Bons
8ba23a6d11
config: create initial config when exception happens
2011-09-20 19:09:43 +01:00
Nícolas Lazarte Kaqui
876c331d84
Fixing wrong commit
2011-09-20 13:20:05 -03:00
Nícolas Lazarte Kaqui
920a58fbb3
Use password to access channel on IRC
2011-09-20 09:13:42 -03:00
Hylke Bons
1479662538
Close some streams immediately. Remove broken scp backend
2011-09-15 00:58:19 +02:00
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
Hylke Bons
cc17d00d00
Fix memory leak
2011-09-14 20:18:15 +02:00
Hylke Bons
bcc12f4a1c
Remove .empty files when they are no longer needed
2011-09-14 20:12:56 +02:00
Hylke Bons
d0244e0da6
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
ac3abe5b8c
git log: trim .empty off folder paths
2011-09-14 17:57:40 +02:00
Hylke Bons
9144a6f52b
setup: add images to tutorial pages
2011-09-14 02:09:03 +02:00
Hylke Bons
e675f27f7a
Edited SparkleLib/SparkleListenerIrc.cs via GitHub
2011-09-12 18:05:10 +03:00
Hylke Bons
497a323a0f
Edited SparkleLib/SparkleListenerIrc.cs via GitHub
2011-09-12 17:13:41 +03:00
Mirco Bauer
c9d158a26c
Added http_proxy support to SparkleListenerIrc
2011-09-12 15:59:17 +02:00
Hylke Bons
d29aea417d
Fix ignore Firefox and Chromium temp download files
2011-09-11 23:58:19 +02:00
Hylke Bons
7d5185a49b
Ignore Firefox and Chromium temp download files
2011-09-11 23:47:36 +02:00
Hylke Bons
d129b215c0
fetcher git: default protocol is ssh://
2011-09-11 22:15:23 +02:00
Mirco Bauer
9739debd02
Enhance user's privacy of the IRC channels
...
Set the channel mode to +s so other users cannot "spy" watched channels using
the WHOIS or LIST IRC command.
2011-09-11 20:29:25 +02:00
Mirco Bauer
ffbb5bce7b
Enhance user's privacy of the IRC connection
...
Use the invisible IRC usermode and random username instead of his
real username.
2011-09-11 20:24:17 +02:00
Thomas Vollstädt
839c3ed835
Added support for Hg Backend
2011-09-08 15:52:56 +02:00
Thomas Vollstädt
c74ed37c4e
Merge remote-tracking branch 'upstream/master' into issue10
2011-09-08 15:40:17 +02:00
Thomas Vollstädt
48e3beb9c2
RegEx not needed anymore
2011-09-05 17:40:53 +02:00
Thomas Vollstädt
c1481d51a0
Fixed code intendation
2011-09-05 17:39:20 +02:00
Thomas Vollstädt
0298e8c795
Implemented Exclusion Rule methods for handling non-readable files. See issue #10
2011-09-05 17:36:03 +02:00
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
Hylke Bons
b7c9fe4431
save progress on notes
2011-06-23 01:44:43 +01:00
Hylke Bons
de98e29f70
Add each note to its own namespace to avoid conflicts
2011-06-23 01:44:43 +01:00
Hylke Bons
a801f68340
fix AddNote, add Note object
2011-06-23 01:44:43 +01:00
Hylke Bons
1d5dd2a8b0
make adding a note work
2011-06-23 01:44:43 +01:00
Hylke Bons
f1ff61950c
add AddNote method
2011-06-23 01:44:43 +01:00
Hylke Bons
75afaff2cd
repo: ignore external watchers when watching is disabled
2011-06-22 16:02:38 +01:00
wimh
a0226f1024
windows: locate texttransform.exe
2011-06-18 23:45:30 +02:00
Hylke Bons
4574ae6056
Add a TCP based listener
2011-06-18 22:42:34 +01:00
Hylke Bons
06683678b2
Fix timzones in timestamps, again...
2011-06-15 00:34:29 +01:00
Hylke Bons
296d830917
repo: Move watcher to its own subclass
2011-06-14 23:14:03 +01:00
Hylke Bons
1d2a077b91
update NEWS and version
2011-06-14 19:08:28 +01:00
Hylke Bons
1f0d0c9da9
fetcher: create .ssh if it's not there
2011-06-14 14:48:18 +01:00
Hylke Bons
593d327660
repo base: disable watching by using the existing method instead
2011-06-14 14:25:25 +01:00
Hylke Bons
93bb772db0
repo base: disable watching when syncing down
2011-06-13 18:57:56 +01:00
Alex Hudson
d139a53a3f
Merge branch 'master' of https://github.com/hbons/SparkleShare
2011-06-13 13:30:11 +01:00
Alex Hudson
a5cf9d3bed
Attempt to merge the smartirc4net references into single build reference
2011-06-13 13:27:48 +01:00
Hylke Bons
773f940e69
repo base: make polling intervals setting a bit more readable
2011-06-12 02:56:01 +01:00
wimh
35c9c043dd
fix portability issue in OnFileActivity
2011-06-12 01:53:38 +01:00
wimh
b60a21731a
fix portability issue in OnFileActivity
2011-06-11 22:35:06 +02:00
wimh
5501a448b5
reset to upstream/master, add windows files and fixes
2011-06-11 21:52:41 +02:00
Hylke Bons
72f4052526
repo git: strip quotes from git commit message
2011-06-11 18:51:39 +01:00
Hylke Bons
4fdee4bf07
default disconnected polling interval is 3min
2011-06-11 18:51:39 +01:00
Hylke Bons
f3aca9da0a
repo git: strip quotes from git commit message
2011-06-10 21:40:13 +01:00
Hylke Bons
944a9c4a46
default disconnected polling interval is 3min
2011-06-10 11:08:03 -07:00
Hylke Bons
c16b2cb420
Save work
2011-06-10 00:01:45 +01:00
Hylke Bons
a07e0a6b8d
repo: don't poll every 10sec when disconnected
2011-06-09 23:59:56 +01:00
Hylke Bons
911a1f941a
changeset: Add a Folder property
2011-06-09 21:25:36 +01:00
Hylke Bons
18ec890574
repo base: poll continously even when connected (but not as frequent)
2011-06-09 21:20:57 +01:00
Hylke Bons
5b9455b73e
repo base: add some properties to be used for the manual polling
2011-06-09 18:53:36 +01:00
Travis Glenn Hansen
267987763c
removing is_polling completely
2011-06-09 10:21:55 -06:00
Travis Glenn Hansen
e937aa168f
Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
...
Conflicts:
SparkleLib/SparkleConfig.cs
2011-06-09 10:20:15 -06:00
Hylke Bons
169b5dfd7a
about: remove references to SparkleLib
2011-06-08 22:37:29 +01:00
Hylke Bons
1319a566f9
config: Only trim user name if it isn't null
2011-06-08 21:40:12 +01:00
Travis Glenn Hansen
1704d86b2f
Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
2011-06-07 19:39:34 -06:00
Hylke Bons
f658ea2b86
Work with repos on host names with a dash in them
2011-06-08 02:04:54 +01:00
Hylke Bons
60ffd9ef7a
config: never let user name be null or empty
2011-06-08 01:30:01 +01:00
Hylke Bons
ae8d03ebdc
listener irc: Fix race condition joining channel when not connected
2011-06-08 01:30:01 +01:00
Travis Glenn Hansen
b54ac8b259
fixing upstream issue 200
2011-06-07 14:39:35 -06:00
Hylke Bons
50dd9b1a95
config: never let username be empty
2011-06-06 21:00:06 +01:00
Hylke Bons
33338c2c0c
listener irc: adjust ping interval and timeout
2011-06-05 23:08:17 +01:00
Hylke Bons
9df0fd6440
Detect the correct .shh path on Windows
2011-06-05 19:59:48 +01:00
Hylke Bons
80e5343908
fetcher base: check if thread exists before disposing it
2011-06-05 17:35:22 +01:00
Hylke Bons
91bd2bff63
config: get default username depending on platform
2011-06-05 17:22:40 +01:00
Hylke Bons
b3fb85c305
Move OS detection code to the backend
2011-06-05 17:07:33 +01:00
Hylke Bons
efb2d2c878
Don't check for root user on non-unix systems.
2011-06-05 01:47:45 +01:00
Hylke Bons
f6dac691ca
controller: add a Initialize () method, instead of doing everything in the constructor
2011-06-04 18:16:00 +01:00
Hylke Bons
0458cf826d
paths: Use more the more crossplatform Environment.SpecialFolder enumeration to determine used paths.
2011-06-04 15:16:32 +01:00
Hylke Bons
4d972c66d1
repo base: only emit NewChangeSet event when SyncDown was successful
2011-06-03 01:33:41 +01:00
Hylke Bons
85be7121ab
Code cleanup
2011-06-03 00:35:51 +01:00
Hylke Bons
04d63c0a27
Update out of date SparkleShare tagline
2011-06-02 00:08:05 +01:00
Hylke Bons
503b02e85f
listener irc: only join a channel once
2011-06-01 23:59:18 +01:00
Hylke Bons
1e91f40569
Use custom folder watcher on Mac
2011-05-31 21:02:08 +01:00
Hylke Bons
6dfab204e7
fetcher git: fix url construction
2011-05-31 18:30:28 +01:00
Hylke Bons
71b43d530a
Move url forming logic to the fetcher
2011-05-31 02:28:23 +01:00
Hylke Bons
bda1bc3bc4
comment out debug rule
2011-05-30 16:22:09 +01:00
Hylke Bons
a941bd3b80
repo git: only disable emable watching once
2011-05-30 16:20:25 +01:00
Hylke Bons
39394de3bc
listener: get announcement server url from the config file
2011-05-30 02:19:58 +01:00
Hylke Bons
e2d75a57fb
listener: add Dispose method
2011-05-29 20:01:56 +01:00
Hylke Bons
6298c86a36
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
6926638822
repo: normalise timezones for the log
2011-05-29 16:48:47 +01:00
Hylke Bons
a7547f5076
repo base: don't call AnyDifferences on changes in .git or .hg
2011-05-29 13:53:09 +01:00
Hylke Bons
ec6c69452a
listener: move reconnect timer from repo. rename channelmessage event. add debuginfo
2011-05-29 00:52:46 +01:00
Hylke Bons
9549ae3816
repo: remove obsolete static IsRepo method
2011-05-28 20:23:33 +01:00
Hylke Bons
c2cff43f46
controller, backend: determine repo backend type in a cleaner way
2011-05-28 19:29:16 +01:00
Hylke Bons
0b937a0dda
config: user Unknown as default username instead of empty string
2011-05-28 17:52:50 +01:00
Hylke Bons
10ac5cbe5c
config: add url as part of the folder config xml
2011-05-26 23:41:55 +01:00
Hylke Bons
109f75aee9
Fix configuration issues
2011-05-26 20:46:49 +01:00
Hylke Bons
898c685cb6
repo base: move method for consistency
2011-05-26 02:05:30 +01:00
Hylke Bons
2e075959c4
repo base: use new config scheme to get the user name's and email
2011-05-26 01:44:10 +01:00
Hylke Bons
942aecc710
Use new XML based config scheme
2011-05-25 21:46:46 +01:00
Hylke Bons
cb27d3f551
Move the default backend initialisation to SparkleBackend
2011-05-25 20:24:25 +01:00
Hylke Bons
04c3aeca3b
hg: fix compile error
2011-05-25 20:20:20 +01:00
Hylke Bons
aa01351e2a
lib: Fix makefile whitespace
2011-05-25 20:15:15 +01:00
Hylke Bons
4e6fc33e3f
hg: remove some debug output
2011-05-25 20:13:26 +01:00
Hylke Bons
d5ec6472fd
backend: don't be inheritable explictly
2011-05-25 20:07:13 +01:00
Hylke Bons
ae87d1e68b
config: remove debug output
2011-05-25 19:38:25 +01:00
Hylke Bons
c2d844268d
config: fix RemoveFolder method
2011-05-25 19:36:43 +01:00
Hylke Bons
1f3ab4f529
save scp backend work
2011-05-25 19:33:45 +01:00
Hylke Bons
f2320abc11
config: fix style
2011-05-25 01:22:02 +01:00
Hylke Bons
44572da5c7
config: throw exception whenever config file doesn't exist
2011-05-25 01:20:37 +01:00
Hylke Bons
607b347dd5
config add exception when config file is not found
2011-05-25 01:15:30 +01:00
Hylke Bons
7634b7f655
config: add a default static SparkleConfig
2011-05-25 01:00:32 +01:00
Hylke Bons
80c676de6c
Add SparkleConfig class to deal with configuration
2011-05-25 00:46:55 +01:00
Hylke Bons
1288494ae5
hg: implement event logs for Mercurial
2011-05-23 21:16:21 +01:00
Hylke Bons
6779d3bdea
defines: remove unused OPEN_COMMAND
2011-05-23 19:42:28 +01:00
Hylke Bons
3d286a4b60
rough Mercurial log implementation and crash fixes on empty repo
2011-05-23 04:06:07 +01:00
Hylke Bons
5a0c45bc6a
repo: fix listener connecting
2011-05-23 01:18:10 +01:00
Hylke Bons
1bbf352028
don't watch for addition of ~/SparkleShare subfolders
2011-05-22 23:51:12 +01:00
Hylke Bons
e881206ab9
lib: update csproj file
2011-05-22 19:22:13 +01:00
Hylke Bons
bd60da2627
lib: update csproj file
2011-05-22 19:21:20 +01:00
Hylke Bons
4d6ea9d707
Do host name checking the same way in back- and frontend
2011-05-22 19:08:14 +01:00
Hylke Bons
0167aef16a
repo git: turn off garbage collection by default
2011-05-22 18:54:47 +01:00
Hylke Bons
4eb8abad8d
listener base: code cleanup
2011-05-22 18:52:50 +01:00
Hylke Bons
00327a1eb0
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
2e6d8ac33e
repo, listener base: make syncdown queue handle multiple channels
2011-05-22 18:37:36 +01:00
Hylke Bons
b4329eb928
repo: also announce changes after a syncup->down->up
2011-05-22 18:12:40 +01:00
Hylke Bons
b1950be6ff
repo base: Syncup after a SyncDownBase triggered by an initial SyncUpBase. leave it to the remote_timer to push afterwards
2011-05-22 18:06:28 +01:00
Hylke Bons
b18db88b61
repo: do a full SyncUpBase after a git rebase
2011-05-22 17:51:58 +01:00
Hylke Bons
37cd521d44
add debug info
2011-05-22 16:38:34 +01:00
Hylke Bons
442dc62980
repo git: fix compile error
2011-05-22 16:29:23 +01:00
Hylke Bons
0a91597291
repo git: push changes after conflict resolution
2011-05-22 16:27:06 +01:00
Hylke Bons
0a1fa73196
repo: get the remote changes if detected on a first connect
2011-05-22 16:05:35 +01:00
Hylke Bons
c9a472ee80
helpers: make debug info easier to read by using whitespace
2011-05-22 16:04:28 +01:00
Hylke Bons
7be63b07c9
repo: tweak algorithm
2011-05-22 15:46:24 +01:00
Hylke Bons
16bfce692a
build: fix build system
2011-05-22 12:42:22 +01:00
Hylke Bons
3e65a4fc94
build: move backend classes into subfolders
2011-05-22 12:28:14 +01:00
Hylke Bons
fbfd8885ed
use shorter Hg as class names instead of Mercurial
2011-05-22 01:15:46 +01:00
Hylke Bons
359ec616f9
listener: use one connection with multiple channels per server
2011-05-22 01:02:16 +01:00
Hylke Bons
3c1c0ed4f3
Rework and abstract the backend. Add basic Mercurial support
2011-05-20 01:55:49 +01:00
Hylke Bons
2168fa2ab9
save work
2011-05-19 17:07:42 +01:00
Hylke Bons
19aca9d238
listener: only reference relevant libs
2011-05-19 16:51:49 +01:00
Hylke Bons
50473764c8
listener: fix message queueing of last rework
2011-05-19 16:44:01 +01:00
Hylke Bons
73f2b2c2dd
listener: move more logic from Irc to Base
2011-05-19 16:41:46 +01:00
Hylke Bons
bd5fd01533
Edited SparkleLib/SparkleListenerBase.cs via GitHub
2011-05-19 08:14:50 -07:00
Hylke Bons
cf54ba0ddd
repo: abstract syncdown parts
2011-05-18 23:18:11 +01:00
Hylke Bons
9a4c950823
repo: block on commands in methods instead of starting in a new thread afterwards
2011-05-18 19:57:52 +01:00
Hylke Bons
e13b4d8501
repo: move some member declarations up
2011-05-18 19:31:43 +01:00
Hylke Bons
4920d4a61d
repo: give more members accessors
2011-05-18 19:12:45 +01:00
Hylke Bons
f45eeefbd4
repo: rename RemoteOriginUrl to the more git agnostic Url
2011-05-18 17:00:02 +01:00
Hylke Bons
685fa91e47
repo: rename and reduce number of enums in SyncStatus. ditch IsSyncing member
2011-05-18 16:34:31 +01:00
Hylke Bons
04cc6debfd
repo: use accessors for HasUnsyncedChanges
2011-05-18 14:03:50 +01:00
Hylke Bons
80289b499a
repo: list up to 20 changes in the commit message
2011-05-17 22:37:22 +01:00
Hylke Bons
d589a79a66
repo: fix whitespace in commit messages and remove some useless debuginfo
2011-05-17 20:40:14 +01:00
Hylke Bons
d544400234
repo: fix bug where the first commit hash wasn't used for the channel name
2011-05-17 13:15:44 +01:00
Hylke Bons
f887b28e45
Use 'revision' instead of 'hash'
2011-05-17 11:43:02 +01:00
Hylke Bons
1eac6ea67b
repo: add Status member that gets updates dynamically
2011-05-17 02:54:38 +01:00
Hylke Bons
be219a85dc
repo: remove IsFetching and IsPushing members
2011-05-17 02:51:25 +01:00
Hylke Bons
7e301ea1d1
repo: rename CurrentHash to Revision
2011-05-17 01:29:51 +01:00
Hylke Bons
59f3bd6e8b
repo: remove CommitEndedUpEmpty event
2011-05-17 01:17:40 +01:00
Hylke Bons
d1a545d65f
changeset: rename DateTime to Timestamp
2011-05-17 00:59:08 +01:00
Hylke Bons
2888d269e8
build: remove obsolete SparkleEvents class
2011-05-17 00:51:43 +01:00
Hylke Bons
13f78f4a7e
repo: controller: use more git agnostic naming
2011-05-17 00:49:01 +01:00
Hylke Bons
032f9dbc55
repo: replace multiple events by one SyncStatusChanged event + enum
2011-05-17 00:15:23 +01:00
Hylke Bons
a858d8e537
repo: remove unused Added event
2011-05-16 23:41:35 +01:00
Hylke Bons
0951760f1d
repo: remove unused Commited event handler
2011-05-16 23:30:45 +01:00
Hylke Bons
ef27c2f1b5
fetcher: remove unused arguments for the events
2011-05-16 23:16:56 +01:00
Hylke Bons
bba6621218
fetchergit: remove TODO
2011-05-16 21:24:51 +01:00
Hylke Bons
68fc6499c5
Split up the fetcher code into FetcherBase and FetcherGit
2011-05-16 21:19:58 +01:00
Hylke Bons
d22475de81
listener: use protected members instead of public and use base.x to access them
2011-05-16 21:19:19 +01:00
Hylke Bons
7235d9fa30
repo: use the first commit hash as an id for the repo and use that as the channel name' did not match any files
2011-05-14 18:11:31 +01:00
Hylke Bons
5f36f8a9e0
Replace abstract out Listener by ListenerBase + ListenerIrc
2011-05-14 18:10:24 +01:00
Hylke Bons
17b614121c
repo: push changes after resolving a conflict
2011-05-14 03:18:38 +01:00
Hylke Bons
dc61820baf
helpers: fix whitespace and coding style
2011-05-11 20:29:43 +01:00
Hylke Bons
79e2cda777
controller: fetcher: Use and xml based config file and add temporary migration method
2011-05-10 00:30:33 +01:00
Hylke Bons
19a1eba8dd
backend: Add IsUsablePath method and adjust related TODOs
2011-05-09 00:44:40 +01:00
Hylke Bons
a29f7b32bc
Add new backend class and a default backend. Add backend member to repo.
2011-05-09 00:04:53 +01:00
Hylke Bons
3322e46fc9
repo: fix coding style for private members
2011-05-08 23:01:07 +01:00
Hylke Bons
7f2b555e95
events: fix more whitespace
2011-05-08 20:43:12 +01:00
Hylke Bons
3795e1e1fa
events: fix whitespace
2011-05-08 20:40:08 +01:00
Hylke Bons
26dfba06e3
events: listener: code cleanup
2011-05-08 20:35:43 +01:00
Hylke Bons
26a99679a7
controller: dispose the fetcher when we're done so it can be garbage collected
2011-05-08 20:35:26 +01:00
Hylke Bons
825ea5b200
fetcher: prepare for multibackend
2011-05-08 18:25:55 +01:00
Hylke Bons
2400fa6d6f
repo: add debug info about conflict type when resolving
2011-05-07 13:08:56 +01:00
Hylke Bons
daad99c38b
update AUTHORS, and don't go on the slippery slope of using implicit typing
2011-05-05 00:07:02 +01:00
Gabriel Burt
2e638b9b02
repo: speed up by re-using Regex objects
2011-05-04 23:33:17 +01:00
Hylke Bons
f07dd48d0d
fetcher: remove the Cloning prefix from the events to make more sense grammatically
2011-05-03 18:30:51 +01:00
Hylke Bons
f1bafe1834
fetcher: ignore file permission changes in new checkouts
2011-05-01 17:25:42 +02:00
Hylke Bons
f9b2fbe724
Fix coding style and whitespace of all of SparkleLib
2011-05-01 15:40:46 +02:00
Hylke Bons
d91a922782
repo: resolve any kind of rebase conflict
2011-04-30 02:42:48 +02: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
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
Bertrand Lorentz
1e88eab334
Remove GitSharp from the build and delete submodule
2011-04-21 17:15:32 +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
9f0b0571a9
tmp
2011-04-17 12:22:20 +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
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
Hylke Bons
e4720628cc
Fix quit method
2011-03-27 13:56:36 +01:00
Hylke Bons
0080bdcf03
[repo] Fix the GetCommits regex to also parse GMT-n timezones
2011-03-24 00:50:08 +00:00
Hylke Bons
b2253a06ff
[paths] change the way git lookup is done
2011-03-23 23:14:50 +00:00
Hylke Bons
e1fb9f8640
Merge branch 'master' of ssh://github.com/hbons/SparkleShare
2011-03-22 22:50:25 +00:00