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
407f92e9d4
Removed --certificate-fingerprint argument #4522
...
Used profile dir for fingerprint file path instead
2015-04-15 14:16:28 +01:00
6580ad0015
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-15 13:40:55 +01:00
2752d24dc4
Merge branch 'jerry-sandbox'
2015-04-15 13:33:39 +01:00
e405ec25e3
Always log out server fingerprint #4522
2015-04-15 13:25:18 +01:00
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
52d9b1beed
Logged out new fingerprint when not match #4522
2015-04-15 13:06:49 +01:00
1e2b822226
Removed unused variable
2015-04-14 17:52:24 +01:00
fa1ea0022b
Fixed code style
2015-04-14 17:52:15 +01:00
f60e98c8cd
Fixed error from merge
2015-04-14 17:52:08 +01:00
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
dd574c4f2c
Added unit tests for string operations
2015-04-14 17:51:50 +01:00
28eb85660f
Fixed error from merge
2015-04-14 17:51:41 +01:00
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
39e183da3e
Refactored string operations
...
Conflicts:
src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
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
b24eb2b724
Removed test string #4522
2015-04-14 17:50:36 +01:00
71dc472a64
Fixed code style
2015-04-14 17:49:56 +01:00
b8ba37b4f4
Made callback function global #4522
2015-04-14 17:49:33 +01:00
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
07b1ea203f
Message box asking user to verify fingerprint #4522
2015-04-14 17:29:08 +01:00
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
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
f80050bea4
Merge remote-tracking branch 'origin/master' into pr-jpmcmu-tripple-click-fix
2015-03-22 00:22:16 +00:00
be06c198d4
Merge branch '1.6.3-stable'
2015-03-21 23:51:27 +00:00
9706252fb9
Only trust errors for macdeployqt 5+ #4464
2015-03-21 22:01:49 +00:00
162ed1fef5
Disabled code signing for old Qt versions #4464
2015-03-21 21:15:53 +00:00
a833611804
Updated ChangeLog for 1.6.3
2015-03-21 20:01:13 +00:00
0edb3a74b3
Fixed #4465 - Added syntool sign call
2015-03-21 19:59:07 +00:00
2e060cc2f3
ChangeLog for 1.6.3
2015-03-21 19:35:59 +00:00
dcf8a9f5f0
Changed use of popen to getstatusoutput #4464
...
The getstatusoutput function seems easier to use
2015-03-21 19:05:43 +00:00
88d85204db
Fixed distftp source file path #4464
2015-03-21 18:57:09 +00:00
ccaf4a8ef3
Removed toolchain code to skip packages #4407
2015-03-21 18:39:06 +00:00
e0cb5bda6e
Separated post back build into release and debug #4464
...
Also related to #4463
2015-03-21 18:38:25 +00:00
9b2fd85f58
Merge branch '1.6.3-stable'
...
Conflicts:
ext/toolchain/commands1.py
src/lib/plugin/ns/SecureListenSocket.h
2015-03-21 15:57:48 +00:00
1bbd086a17
MacOSX Double / Triple Click Fix
...
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
2015-03-21 13:41:00 +00:00
ecd51d231b
Revert "Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"""
...
This reverts commit 7f721ee7b1
2015-03-21 13:38:20 +00:00
7f721ee7b1
Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix""
...
This reverts commit 32323bc0d1
2015-03-21 11:42:37 +00:00
32323bc0d1
Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
...
This reverts commit b5effc0591297100c88a
2015-03-21 11:36:38 +00:00
b5effc0591
Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix
2015-03-21 11:08:53 +00:00
0b4d480bcc
Removed remnants of synmacph tool (part 3) #4398
2015-03-20 15:11:22 +00:00
3deb5492d6
Removed remnants of synmacph tool (part 2) #4398
2015-03-20 15:11:22 +00:00
c05d7fad36
Removed remnants of synmacph tool #4398
2015-03-20 15:11:22 +00:00
f5cac2846e
Removed obsolete code and used Qt to codesign #4397
2015-03-20 14:43:27 +00:00
3b44f9d6c5
Added ignore for OpenSSL
...
This is to stop buildbot from wiping out the openssl dir when switching.
2015-03-20 14:06:48 +00:00
297100c88a
Merge remote-tracking branch 'origin/1.6.3-stable'
2015-03-20 13:01:12 +00:00
14241362ca
Removed legacy file remover script
2015-03-20 13:00:21 +00:00
69f4a444fd
Merge remote-tracking branch 'origin/1.6.3-stable'
2015-03-20 12:59:54 +00:00
cf21deb29c
Removed test file
2015-03-20 12:59:13 +00:00
c2b1674977
Merge 1.6.3-stable
2015-03-20 12:51:56 +00:00
Nick Bolton
XinyuHou
James McMullan