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 |
Nick Bolton
|
80fd3cc01b
|
Refactored fingerprint file path logic #4525
|
2015-04-20 15:58:11 +01:00 |
Nick Bolton
|
36a6bb9218
|
Removed OpenSSL download from plugin manager #4546
|
2015-04-20 15:27:24 +01:00 |
XinyuHou
|
cf6a6bcd48
|
Removed dead code #4527
|
2015-04-20 14:57:59 +01:00 |
Xinyu Hou
|
e6e3eae0a9
|
Disabled reconnect after fingerprint failed #4527
|
2015-04-20 14:43:39 +01:00 |
Nick Bolton
|
453638fa39
|
Added OpenSSL component to installer #4546
|
2015-04-20 14:35:52 +01:00 |
Nick Bolton
|
05b833d1b6
|
Added OpenSSL config file #4546
|
2015-04-20 14:35:29 +01:00 |
XinyuHou
|
365d16c94b
|
Added more status details #4537
|
2015-04-17 16:33:43 +01:00 |
XinyuHou
|
586a893201
|
Made retry secure write/read use the exactly last parameters #4539
|
2015-04-17 14:01:35 +01:00 |
XinyuHou
|
951cbe9a62
|
Enable network security checkbox only when ns plugin exists #4540
|
2015-04-16 17:15:58 +01:00 |
XinyuHou
|
59d013ac6a
|
Show fingerprint only when file exists #4526
|
2015-04-16 17:12:42 +01:00 |
XinyuHou
|
88538e5ee6
|
Resolve #4526 added local fingerprint in server GUI
|
2015-04-16 15:10:33 +01:00 |
XinyuHou
|
7ab1081b3f
|
Fixed server crash caused by double delete a socket #4535
|
2015-04-16 11:55:05 +01:00 |
Nick Bolton
|
7c6561b3da
|
Fixed #4528 - invalid/misleading log line
|
2015-04-15 15:17:30 +01:00 |
Nick Bolton
|
14bf90264e
|
Renamed function, was reserved keyword on Mac #4522
|
2015-04-15 14:49:05 +01:00 |
Nick Bolton
|
c7de2da062
|
Comment out unused fingerprint filename consts #4522
Causing compile to fail on Mac (fails on warnings)
|
2015-04-15 14:33:26 +01:00 |
Nick Bolton
|
407f92e9d4
|
Removed --certificate-fingerprint argument #4522
Used profile dir for fingerprint file path instead
|
2015-04-15 14:16:28 +01:00 |
Nick Bolton
|
6580ad0015
|
Merge branch 'master' of https://github.com/synergy/synergy
|
2015-04-15 13:40:55 +01:00 |
XinyuHou
|
2752d24dc4
|
Merge branch 'jerry-sandbox'
|
2015-04-15 13:33:39 +01:00 |
Xinyu Hou
|
e405ec25e3
|
Always log out server fingerprint #4522
|
2015-04-15 13:25:18 +01:00 |
Nick Bolton
|
689737ee7a
|
Fingerprint file check and trust logic #4522
Also refactored the 'get profile dir' code to use the core interface
(reduce code duplication)
|
2015-04-15 13:09:22 +01:00 |
Xinyu Hou
|
52d9b1beed
|
Logged out new fingerprint when not match #4522
|
2015-04-15 13:06:49 +01:00 |
Xinyu Hou
|
1e2b822226
|
Removed unused variable
|
2015-04-14 17:52:24 +01:00 |
XinyuHou
|
fa1ea0022b
|
Fixed code style
|
2015-04-14 17:52:15 +01:00 |
XinyuHou
|
f60e98c8cd
|
Fixed error from merge
|
2015-04-14 17:52:08 +01:00 |
XinyuHou
|
916a4c75af
|
Refactored no or wrong ssl certificate error handling #4410
Conflicts:
src/lib/net/TCPListenSocket.cpp
src/lib/plugin/ns/SecureListenSocket.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
|
2015-04-14 17:52:00 +01:00 |
XinyuHou
|
dd574c4f2c
|
Added unit tests for string operations
|
2015-04-14 17:51:50 +01:00 |
XinyuHou
|
28eb85660f
|
Fixed error from merge
|
2015-04-14 17:51:41 +01:00 |
XinyuHou
|
b4665b9cd5
|
Passed args into client and socket
Conflicts:
src/lib/client/Client.cpp
src/lib/client/Client.h
src/lib/synergy/ClientApp.cpp
src/test/integtests/net/NetworkTests.cpp
|
2015-04-14 17:51:31 +01:00 |
Xinyu Hou
|
39e183da3e
|
Refactored string operations
Conflicts:
src/lib/base/String.cpp
|
2015-04-14 17:51:19 +01:00 |
XinyuHou
|
cb0f0dd06d
|
Improved fingerprint verification #4522
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
src/lib/synergy/ClientApp.cpp
|
2015-04-14 17:50:49 +01:00 |
XinyuHou
|
b24eb2b724
|
Removed test string #4522
|
2015-04-14 17:50:36 +01:00 |
XinyuHou
|
71dc472a64
|
Fixed code style
|
2015-04-14 17:49:56 +01:00 |
XinyuHou
|
b8ba37b4f4
|
Made callback function global #4522
|
2015-04-14 17:49:33 +01:00 |
Xinyu Hou
|
5dfe4aa0b5
|
Added verification of server certificate fingerprint #4522
Conflicts:
src/lib/mt/Thread.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/synergy/ClientArgs.cpp
|
2015-04-14 17:46:58 +01:00 |
Nick Bolton
|
07b1ea203f
|
Message box asking user to verify fingerprint #4522
|
2015-04-14 17:29:08 +01:00 |
Nick Bolton
|
6e2ccb8f8d
|
Merge pull request #4422 from legonigel/shortcut_fix
Changed server shortcut on GUI main window
Fixes #4367
|
2015-03-28 08:56:36 +00:00 |
Nick Bolton
|
0008ad2778
|
Merge pull request #4462 from synergy/pr-jpmcmu-tripple-click-fix
Double click breaks dragging and tripple click on Mac #3784
|
2015-03-28 08:53:40 +00:00 |
Nick Bolton
|
f80050bea4
|
Merge remote-tracking branch 'origin/master' into pr-jpmcmu-tripple-click-fix
|
2015-03-22 00:22:16 +00:00 |
Nick Bolton
|
be06c198d4
|
Merge branch '1.6.3-stable'
|
2015-03-21 23:51:27 +00:00 |
Nick Bolton
|
9706252fb9
|
Only trust errors for macdeployqt 5+ #4464
|
2015-03-21 22:01:49 +00:00 |
Nick Bolton
|
162ed1fef5
|
Disabled code signing for old Qt versions #4464
|
2015-03-21 21:15:53 +00:00 |
Nick Bolton
|
a833611804
|
Updated ChangeLog for 1.6.3
|
2015-03-21 20:01:13 +00:00 |
Nick Bolton
|
0edb3a74b3
|
Fixed #4465 - Added syntool sign call
|
2015-03-21 19:59:07 +00:00 |
Nick Bolton
|
2e060cc2f3
|
ChangeLog for 1.6.3
|
2015-03-21 19:35:59 +00:00 |
Nick Bolton
|
dcf8a9f5f0
|
Changed use of popen to getstatusoutput #4464
The getstatusoutput function seems easier to use
|
2015-03-21 19:05:43 +00:00 |