Commit Graph

2553 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou) 02bfeff1b2 Merge pull request #4596 from joweiser/patch-1
Typo 'occurred' in WebClient.cpp
2015-05-06 14:00:07 +01:00
XinyuHou b35911eaf2 Updated ignore list 2015-05-06 13:22:34 +01:00
XinyuHou 68edff43cd Merge branch 'pr-jpmcmu-macosx-sticky-key-fix' 2015-05-06 13:20:54 +01:00
XinyuHou 1f0adb0d7b Fixed warning on Linux #4570 2015-05-06 12:11:12 +01:00
XinyuHou c168721d2f Added deprecated args handling #4570 2015-05-06 11:57:42 +01:00
Adam Potolsky c3f003bf5b Adding new binary installer locations to make files #4587 2015-05-01 16:56:45 -07:00
Adam Potolsky fcf68d1ce4 Adding OSX binaries and headers for compilation from binaries #4587 2015-05-01 16:55:29 -07:00
Adam Potolsky a88bf3d3f0 Merge branch 'master' of https://github.com/synergy/synergy into build_using_openssl_binaries 2015-04-30 09:31:55 -07:00
Johannes Weiser 82bb539d5e Typo in WebClient.cpp 2015-04-29 22:18:15 +02:00
Adam Potolsky 54ca552aa6 added gvim swap files to gitignore 2015-04-29 11:42:15 -07:00
Adam Potolsky 5266d94faa Added code to fetch openssl libs from archetecture specific location #4587 2015-04-29 11:35:12 -07:00
Adam Potolsky fb1a4456a6 Correcting binaries for #4587 2015-04-29 11:02:49 -07:00
Adam Potolsky 503a6e26bf Added variable to define location of windows binaries #4587 2015-04-29 10:27:41 -07:00
Adam Potolsky b7d869c7a7 Added additional required files #4587 2015-04-29 10:26:40 -07:00
Adam Potolsky 39c26f38f1 Removed wrong libs and replaced them with correct ones #4587 2015-04-29 10:26:25 -07:00
XinyuHou 4af987e8de Made secure socket logging more user friendly #4558 2015-04-29 13:25:01 +01:00
XinyuHou 88a8099881 Merge branch 'jerry-sandbox' 2015-04-29 12:57:42 +01:00
Xinyu Hou 783673127f Reverted to legacy Mac deployment and signing #4591 2015-04-29 12:22:39 +01:00
Adam Potolsky e8b4017960 Changing ns plugin to use new binaries instead of older source directory. #4587 2015-04-28 11:55:59 -07:00
Adam Potolsky db631ac61d Checking in Win32 and Win64 binaries #4587 2015-04-28 11:55:16 -07:00
Adam Potolsky 25cce186dd Adding VIM temp files to the gitignore 2015-04-28 10:37:40 -07:00
Adam Potolsky 99e84b82f9 adding genlist to the usage output (#4586) 2015-04-28 10:37:20 -07:00
Xinyu Hou a1977fa009 Updated ignore list 2015-04-28 13:22:02 +01:00
XinyuHou a597596654 Merge branch 'MacOSX-Sticky-Key-Fix' of https://github.com/jpmcmu/synergy into pr-jpmcmu-macosx-sticky-key-fix 2015-04-24 12:34:08 +01:00
XinyuHou c7b444a762 Modified auto hide feature #4569
Made auto hide on startup and added an info masseage on first connection
2015-04-23 17:32:18 +01:00
XinyuHou fb76dee8cc Reintroduced GUI auto-hide setting (disabled by default) #4569 2015-04-23 15:37:07 +01:00
XinyuHou fb6186304b Dropped SSLv3 support #4567 2015-04-23 13:02:42 +01:00
XinyuHou decf7ca313 Removed unused dependency #4520 2015-04-23 13:02:42 +01:00
XinyuHou a7848d6cd2 Made comment more clear #4567 2015-04-23 13:02:42 +01:00
jpmcmu 8cd256a0b2 Removed stray character. 2015-04-23 07:04:29 -04:00
jpmcmu 9978a85a4f Added modifier flags to mouse events as a fix for sticky keys. 2015-04-22 19:33:25 -04:00
jpmcmu 1a05bed6da Merge branch 'master' into MacOSX-Sticky-Key-Fix 2015-04-22 19:19:00 -04:00
jpmcmu abfe8f5b78 Merge remote-tracking branch 'synergy/master' 2015-04-22 19:14:22 -04:00
jpmcmu 564d9b894e Added entry into gitignore for Samba temporary files 2015-04-22 19:13:41 -04:00
Nick Bolton c4f7c9be70 Version to 1.7.2 2015-04-21 18:49:49 +01:00
Nick Bolton 366f813a2c ChangeLog for v1.7.1-stable 2015-04-21 18:46:32 +01:00
XinyuHou 363dc78ca8 Updated local fingerprint after wizard is finished #4557 2015-04-21 17:56:01 +01:00
XinyuHou 018480412a Stopped retry when fatal error happened in secure socket #4553 2015-04-21 16:54:49 +01:00
Xinyu Hou 423d698436 Fixed secure socket using old trusted fingerprint path #4525 2015-04-21 16:46:05 +01:00
Nick Bolton f56d06d95d Disabled auto-hide feature #4390 2015-04-21 16:25:55 +01:00
Nick Bolton d184be31b5 Fixed: SSL dir not created on Mac #4551 2015-04-21 14:48:28 +01:00
Nick Bolton dbc5da7a48 Refactored certificate class (part 2) #4549 2015-04-21 12:55:45 +01:00
Nick Bolton 7e239c6f71 Refactored certificate class
Split `generateCertificate` into separtate `generateFingerprint`
function, renamed a few functions, removed some unused functions.
2015-04-20 19:26:41 +01:00
Nick Bolton a894615ca7 Fixed ns plugin using old certificate path #4525 2015-04-20 19:08:03 +01:00
Nick Bolton f997aea8e7 Moved SSL generate code as is into new class #4549 2015-04-20 18:51:22 +01:00
Nick Bolton 2a2d095527 Merge branch 'master' of https://github.com/synergy/synergy 2015-04-20 16:53:34 +01:00
Nick Bolton aa9504f43e Changed filenames in app data directory #4525
- Changed `ssl` to `SSL`
- Moved pem file to `SSL`
2015-04-20 16:40:50 +01:00
Nick Bolton 97060d9698 Removed unused SSL download code #4546 2015-04-20 16:31:36 +01:00
Nick Bolton a649a0e3df Reduced code duplication in fingerprint logic #4548 2015-04-20 16:28:26 +01:00
XinyuHou 5e2b8a5048 Fixed #4537 by add file error checking 2015-04-20 16:16:53 +01:00