Hylke Bons
2d1f7d3f8c
Merge branch 'tortoise'
...
Conflicts:
SparkleLib/Git/SparkleGit.cs
SparkleLib/SparkleFetcherSSH.cs
SparkleShare/SparkleControllerBase.cs
2013-06-23 10:03:09 +01:00
Hylke Bons
c7565665de
windows: Fix GIT_SSH path to ssh.exe
2013-06-23 09:58:55 +01:00
Hylke Bons
6608745120
fetcher git: Catch stream errors when process has been killed by user. Fixes #1187
2013-06-20 21:44:34 +01:00
Hylke Bons
3e191c0ec2
windows: use forwards slashes whem importing key on domain account. #1263
2013-06-17 16:12:50 +01:00
Hylke Bons
43ee6b7815
Merge pull request #1310 from melchips/master
...
Compilation issue on Gnu/Linux (misspelled SparkleLogger object call)
2013-06-16 15:09:36 -07:00
Francois Truphemus (melchips)
13fa197da0
Fix for compilation issue on GNU/Linux with misspelled SparkleLogger object
2013-06-16 23:38:17 +02:00
Hylke Bons
614f65c5dd
Bump version and update news
2013-06-13 23:32:29 +01:00
Hylke Bons
ed8cd51de3
invites mac: Start SparkleShare after opening invites
2013-06-13 18:36:31 +01:00
Hylke Bons
44631f6515
Fix build
2013-06-13 18:17:04 +01:00
Hylke Bons
d2032043f5
Fix build
2013-06-13 18:11:10 +01:00
Hylke Bons
fc7a4ba725
Remove accidentally added file from tree
2013-06-13 18:00:14 +01:00
Hylke Bons
741eca4c61
invites: make temporary invite files invisible
2013-06-13 17:58:18 +01:00
Hylke Bons
ea36f8bc85
repo: Fix a few race conditions updating the status icon
2013-06-13 17:51:38 +01:00
Hylke Bons
fd5f92d4db
+ ‘.sparkleshare’
2013-06-13 17:25:08 +01:00
Hylke Bons
dc6695299c
Remove accidentally added files from tree
2013-06-13 16:57:20 +01:00
Hylke Bons
38717dd8eb
Merge pull request #1308 from directhex/master
...
Add missing / to sed in "sparkleshare open"
2013-06-13 07:29:54 -07:00
Jo Shields
709b02fc3e
Add missing / from sed in "sparkleshare open"
2013-06-13 15:23:26 +01:00
Hylke Bons
ddd3b61d21
Merge pull request #1307 from directhex/master
...
Add missing quotes to launch script
2013-06-13 06:15:03 -07:00
Jo Shields
4818d7772c
Add quoting to invocation of sed in "sparkleshare open" to avoid
...
sed: -e expression #1 , char 18: unknown option to `s'
2013-06-13 14:07:51 +01:00
Hylke Bons
2f071d2490
mac: Reposition the Events windows nicer when opening
2013-06-10 16:06:08 +01:00
Hylke Bons
b81d462a8e
setup: Fix path being saved where it shouldn't after closing window
2013-06-10 15:26:13 +01:00
Hylke Bons
51d42168ce
+ ‘.sparkleshare’
...
+ ‘SparkleShare.txt’
2013-06-02 18:27:04 +01:00
Hylke Bons
06edfd9b0e
windows: Don't crash and show a warning when FIPS is enabled. Closes #1298
2013-06-01 20:54:01 +01:00
Hylke Bons
1ed718d29e
build: Adjust version bump script to include Mac Info.plist. Closes #1297
2013-06-01 16:37:32 +01:00
Hylke Bons
436e7a38af
linux bubbles: Add debug info, don't fail silently. #1299
2013-06-01 11:12:44 +01:00
Hylke Bons
4bd393828d
repo: Fix race condition causing the statusicon to report an error where there isn't one
2013-05-30 13:05:50 +01:00
Hylke Bons
6c9df498ff
Merge pull request #1296 from mortenn/master
...
Fix invite url breakage in third party applications
2013-05-30 02:27:28 -07:00
Morten Nilsen
0a8d064266
Fix broken URLs from calling applications
2013-05-30 11:11:56 +02:00
Hylke Bons
a037ba5785
Merge pull request #1294 from mortenn/master
...
Hide console window when clicking invite links
2013-05-30 01:31:10 -07:00
Morten Nilsen
71cfdd65f1
Do not show console window when clicking links
2013-05-30 07:40:42 +02:00
Hylke Bons
2f4231c073
repo: Fix a possible race condition that can cause a double upload
2013-05-29 12:09:39 +01:00
Hylke Bons
e188ae878c
build: Remove System.Web
2013-05-29 10:13:26 +01:00
Hylke Bons
34aba1f655
Merge pull request #1292 from mortenn/master
...
Fix for issue #1285
2013-05-29 02:07:25 -07:00
Morten Nilsen
6534767a46
Fix for issue #1285
2013-05-29 10:38:56 +02:00
Hylke Bons
d160e5303e
setup: Mention Client ID more explicitly on error page. Closes #1227
2013-05-28 00:01:18 +01:00
Hylke Bons
b15ce8716a
setup: Reset plugin selection after closing window
2013-05-27 23:54:02 +01:00
Hylke Bons
8040d696f9
setup controller: Remove old code
2013-05-27 23:04:30 +01:00
Hylke Bons
069bf713f1
about: Fix version check
2013-05-27 18:54:42 +01:00
Hylke Bons
6bb1cd64ff
setup: enable Client ID in status icon after key has been created
2013-05-26 13:44:57 +01:00
Hylke Bons
4e817aa635
Update invite test page with new scheme
2013-05-26 13:19:51 +01:00
Hylke Bons
9dc04e84c9
invites: use new url scheme on all platforms. #1283
2013-05-26 13:18:23 +01:00
Hylke Bons
a6de29a983
mac: Change invite scheme to sparkleshare://addProject/. #1283
2013-05-26 13:13:01 +01:00
Hylke Bons
3a990f4655
setup: Allow spaces in the middle of passwords. closes #1278
2013-05-21 19:17:10 +01:00
Hylke Bons
a3083a9d81
mac setup: Make sure to update list after adding new plugin
2013-05-21 19:16:18 +01:00
Hylke Bons
88b9c5a53c
Merge pull request #1288 from melchips/master
...
Fix for compilation on GNU/Linux (missing System.Web reference)
2013-05-21 01:32:36 -07:00
Francois Truphemus (melchips)
ce60c0b04e
Link against System.Web on GNU/Linux
2013-05-21 09:44:50 +02:00
Hylke Bons
0bf4a061c3
Merge pull request #1287 from eighthave/master
...
support private, secure shares with tor .onion addresses
2013-05-18 02:16:49 -07:00
Hans-Christoph Steiner
1833fe9b96
when using tor .onion addresses, skip ssh-keyscan (no proxying support)
...
Tor has special domain names called ".onion addresses". They can only be
resolved by using a proxy via tor. While the rest of the openssh suite
fully supports proxying. ssh-keyscan does not, so it can't be used for
.onion addresses because it just barfs saying unknown host
2013-05-17 23:08:53 -04:00
Hylke Bons
c4ccaaef68
invite: encode url data before posting it. closes #1285
2013-05-15 17:16:17 +01:00
Hylke Bons
e07570335d
repo git: show first file revision in history if unedited file has been deleted. fixes #1272
2013-05-14 22:40:20 +01:00
