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
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
Nick Bolton
88d85204db
Fixed distftp source file path #4464
2015-03-21 18:57:09 +00:00
Nick Bolton
ccaf4a8ef3
Removed toolchain code to skip packages #4407
2015-03-21 18:39:06 +00:00
Nick Bolton
e0cb5bda6e
Separated post back build into release and debug #4464
...
Also related to #4463
2015-03-21 18:38:25 +00:00
Nick Bolton
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
James McMullan
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
Nick Bolton
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
Nick Bolton
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
Nick Bolton
32323bc0d1
Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
...
This reverts commit b5effc0591
, reversing
changes made to 297100c88a
.
2015-03-21 11:36:38 +00:00
Nick Bolton
b5effc0591
Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix
2015-03-21 11:08:53 +00:00
Nick Bolton
0b4d480bcc
Removed remnants of synmacph tool (part 3) #4398
2015-03-20 15:11:22 +00:00
Nick Bolton
3deb5492d6
Removed remnants of synmacph tool (part 2) #4398
2015-03-20 15:11:22 +00:00
Nick Bolton
c05d7fad36
Removed remnants of synmacph tool #4398
2015-03-20 15:11:22 +00:00
Nick Bolton
f5cac2846e
Removed obsolete code and used Qt to codesign #4397
2015-03-20 14:43:27 +00:00
Nick Bolton
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
Nick Bolton
297100c88a
Merge remote-tracking branch 'origin/1.6.3-stable'
2015-03-20 13:01:12 +00:00
Nick Bolton
14241362ca
Removed legacy file remover script
2015-03-20 13:00:21 +00:00
Nick Bolton
69f4a444fd
Merge remote-tracking branch 'origin/1.6.3-stable'
2015-03-20 12:59:54 +00:00
Nick Bolton
cf21deb29c
Removed test file
2015-03-20 12:59:13 +00:00
Nick Bolton
c2b1674977
Merge 1.6.3-stable
2015-03-20 12:51:56 +00:00
XinyuHou
d3b3513f4b
Resolve #4455 replaced version with branch name
2015-03-20 12:24:37 +00:00
XinyuHou
486bea0d02
Resolve #4455 replaced version with branch name
2015-03-20 12:22:56 +00:00
XinyuHou
acb4442259
Version to 1.6.3
2015-03-20 12:18:49 +00:00
legonigel
3c89d60ccb
Fix #4349
...
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
2015-03-20 11:41:37 +00:00
XinyuHou
5aaaa784ab
Merge branch 'legonigel-focus_fix_gitscrubz'
2015-03-20 11:39:34 +00:00
legonigel
447169df32
Fix #4349
...
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
2015-03-20 03:12:50 -04:00
legonigel
393ac100c8
Changed shortcut on main window gui for server
...
The shortcut for the server checkbox on the main gui is now Alt-V. This deconflicts the start/stop button.
Fixes #4367
2015-03-09 11:47:13 -04:00
Nick Bolton
702d79570d
Merge pull request #4414 from JoshMcCullough/4389
...
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-09 10:55:43 +00:00
Josh McCullough
4ac8f61a54
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-06 18:10:39 -05:00
Nick Bolton
3dcd36b10e
Removed toolchain code to skip packages #4407
2015-03-05 17:30:08 +00:00
Nick Bolton
4fc46a17ef
Version to 1.7.1
2015-03-04 17:09:23 +00:00
Nick Bolton
0da87304a5
ChangeLog for 1.7.0
2015-03-04 17:07:11 +00:00
Nick Bolton
2feb916f2f
Unfucked --enable-drag-drop arg parse #4168
2015-03-04 15:10:03 +00:00
Nick Bolton
3364d38498
Removed unused retry variables #4313
2015-03-04 14:07:43 +00:00
Nick Bolton
b4a1c3627f
Improved SSL error handling for accept/connect socket #4313
2015-03-04 13:59:53 +00:00