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 |
|