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
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
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
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
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
Nick Bolton
501dc6c886
More user-friendly SSL errors, and rate limited failure #4313
2015-03-04 13:42:19 +00:00
Nick Bolton
9cdff4a910
Removed throw from checkResult (causes client to freeze) #4313
2015-03-04 12:26:54 +00:00
Nick Bolton
87a81adeb4
Improved SLL error messages and throw on cert error #4313
2015-03-04 12:15:56 +00:00
Nick Bolton
55de0746dc
Copy all plugin files to bin dir (including symbols) #4168
2015-03-04 12:03:38 +00:00
Nick Bolton
a2524d9f57
Make profile dir hack Windows only #4168
2015-03-04 11:51:56 +00:00
Nick Bolton
719e8f6b56
Revert "More robust secure socket error handling #4313 "
...
This reverts commit 40fa58de8c
.
2015-03-04 11:43:52 +00:00
Nick Bolton
1c2576b8d7
Revert "Rephrased "crypto disabled" log, changed to error #4313 "
...
This reverts commit a6b5c872f5
.
2015-03-04 11:43:45 +00:00
Nick Bolton
6ef41522b7
Revert "Fixed: Exception was not thrown on secure accept/connect #4313 "
...
This reverts commit c5ed03a8a0
.
2015-03-04 11:43:42 +00:00
Nick Bolton
cfd21216cd
Fixed: Plugins dir may change depending on user #4168
2015-03-04 11:15:07 +00:00
Nick Bolton
c5ed03a8a0
Fixed: Exception was not thrown on secure accept/connect #4313
2015-03-04 10:14:21 +00:00
Nick Bolton
a6b5c872f5
Rephrased "crypto disabled" log, changed to error #4313
2015-03-04 09:00:01 +00:00
Nick Bolton
065960926c
Made OpenSSL config file location Windows-only #4313
2015-03-03 19:51:41 +00:00
Nick Bolton
40fa58de8c
More robust secure socket error handling #4313
2015-03-03 19:21:14 +00:00
Nick Bolton
b6a3788fea
Removed remnants of synmacph tool (part 3) #4398
2015-03-03 18:06:02 +00:00
Nick Bolton
7add4f4d3f
Fixed: Compile errors on Linux #4168
2015-03-03 17:29:52 +00:00
Nick Bolton
b8a5abc19f
Download and extract OpenSSL dependencies #4313
2015-03-03 11:42:26 +00:00
Nick Bolton
c181d5f480
Fixed #4358 - Corrected typo
2015-03-03 09:23:06 +00:00
Nick Bolton
68a49e0a3a
Fixed: Code style for "OpenSSL" should be "OpenSsl" #4313
2015-03-03 08:38:27 +00:00
Nick Bolton
f8847bfde8
Changed OpenSSL to SSL in GUI settings #4313
2015-03-03 08:36:01 +00:00
Nick Bolton
bce1d5be64
Fixed: Plugin manager doesn't download openssl.exe #4313
...
Refactored use of DataDownloader in PluginManager
2015-03-03 08:27:39 +00:00
Nick Bolton
450435d062
Removed remnants of synmacph tool (part 2) #4398
2015-03-02 18:06:23 +00:00
Nick Bolton
5767790e1e
Removed remnants of synmacph tool #4398
2015-03-02 17:50:42 +00:00
Nick Bolton
6e7b9491d4
Fixed: Incorrect log level used #4168
2015-02-26 16:44:15 +00:00
Michael Wilson
9314e64ce3
Drag/drop enabling is configurable in the GUI.
2015-02-26 02:01:00 -05:00
Nick Bolton
dd57a93345
Added OpenSSL DLLs to Windows installer #4313
...
libeay32.dll
ssleay32.dll
2015-02-26 00:04:17 +00:00
Nick Bolton
bcf1a1c4d4
Added extra logging to plugin loaders #4168
2015-02-26 00:03:24 +00:00
Nick Bolton
64c350fd96
Fixed: Plugin manager doesn't detect wow64 #4168
2015-02-25 21:22:43 +00:00
Nick Bolton
e4199b976e
Improved wording for enable OpenSSL setting #4313
2015-02-25 18:15:38 +00:00
Nick Bolton
eb1083ec45
Fixed: Missing 'else if' on arg parsing #4168
2015-02-25 17:44:17 +00:00
Nick Bolton
a1bfddeb5b
Changed plugin manager to use installed arch #4168
...
Using the processor arch to figure out which plugin to downloa is not
the best idea, since a user could install 32-bit Synergy on 64-bit
Windows.
2015-02-25 17:43:48 +00:00
Nick Bolton
40d304dc24
Refactored "syntool" usage into CoreInterface #4168
2015-02-25 17:19:33 +00:00
Nick Bolton
595e403c87
Fixed: Spinner doesn't stop when no plugins #4168
...
Also refactored duplicate code
2015-02-25 08:35:07 +00:00
Nick Bolton
c300b65662
Fixed: Plugin downloader freezes if no plugins #4168
2015-02-25 08:17:16 +00:00
Nick Bolton
a30a685ed2
Improved wording on plugin downloader #4168
...
Also used translate function on strings
2015-02-25 08:16:24 +00:00
Nick Bolton
3a0068ec2e
Fixed: Plugin downloader fails if no plugins #4168
2015-02-24 21:19:52 +00:00
Nick Bolton
5e580e5266
Improved use of English on activate screen #4168
2015-02-20 19:58:37 -05:00
Adam Potolsky
bca57674d0
Added patch that will better detect which Linux distribution is used when determining which plugins to URL to generate.
2015-02-14 19:25:22 -08:00
Adam Potolsky
b9e178a9ee
Fixed compiler warning on non-windows systems.
2015-02-14 19:22:08 -08:00
XinyuHou
226f2c966a
assigned arch static instance instead of create a new one #4313
2015-02-13 15:58:54 +00:00
Xinyu Hou
4014176d8e
Revert "created new instance of arch in plugin #4313 "
...
This reverts commit 8e4f758cb1
.
2015-02-13 14:26:03 +00:00
Xinyu Hou
9f1255d986
Revert "did not pass arch into plugins #4313 "
...
This reverts commit 0f686ff308
.
2015-02-13 14:25:29 +00:00
XinyuHou
0f686ff308
did not pass arch into plugins #4313
2015-02-13 12:42:23 +00:00
XinyuHou
8e4f758cb1
created new instance of arch in plugin #4313
2015-02-13 12:35:12 +00:00
XinyuHou
d642714fe8
add padlock icon when use secure connection #4313
2015-02-13 10:14:11 +00:00
XinyuHou
629f4b1781
used live url for openssl binary #4168
2015-02-12 17:40:38 +00:00
XinyuHou
4cd20d97ea
changed profile directory on mac #4168
2015-02-12 16:52:34 +00:00
XinyuHou
81bb74a24b
greyed out network security group when no plugin available #4168
2015-02-12 16:49:18 +00:00
XinyuHou
6cf40afcd7
added copyright #4168
2015-02-12 16:20:03 +00:00
XinyuHou
14bd991b24
productized setting dialog #4168
2015-02-12 16:18:44 +00:00
XinyuHou
c4c0fc8a08
added enable crypto argument to synergys/c #4313
2015-02-12 15:50:08 +00:00
XinyuHou
bbcca144f5
hacked avoid syntool sigsegv on linux #4168
2015-02-11 17:32:18 +00:00
XinyuHou
b9c5eb2e6f
added certificate generate #4168
2015-02-11 17:28:56 +00:00
XinyuHou
80343c41eb
deleted old home brew crypto #4313
2015-02-11 11:12:54 +00:00
XinyuHou
4fcec1d217
limited ns pluging to Mac 10.8 and above #4168
2015-02-10 16:20:49 +00:00
XinyuHou
7d5df54bd0
fixed copy command for libns on Linux #4168
2015-02-10 13:07:52 +00:00
XinyuHou
31440b1a8a
added const cast #4168
2015-02-10 12:22:30 +00:00
XinyuHou
98716f4e78
fixed compile error on ubuntu64 #4168
2015-02-10 12:13:59 +00:00
XinyuHou
3c4b6163e3
Merge remote-tracking branch 'origin/jerry-sandbox'
2015-02-10 10:28:45 +00:00
XinyuHou
b178d33d62
added plugin downloading from servere #4168
2015-02-09 15:37:47 +00:00
XinyuHou
05e6cb6254
queried plugin list from server #4168
2015-02-06 10:39:58 +00:00
XinyuHou
82b932b1c4
added download plugin page in wizard #4168
2015-02-05 15:52:50 +00:00
XinyuHou
aa46fe91a7
added activate page in wizard #4168
2015-02-05 14:17:34 +00:00
XinyuHou
097f4c4c1f
Revert "added login window #4168 "
...
This reverts commit ccc5834757
.
2015-02-05 11:44:33 +00:00
XinyuHou
c25b6a8bf6
Revert "stored user email, token and type in settings #4168 "
...
This reverts commit 319de60286
.
2015-02-05 11:44:31 +00:00
XinyuHou
f4f7315a54
Revert "added copy right #4168 "
...
This reverts commit e2fb03b8ce
.
2015-02-05 11:44:28 +00:00
XinyuHou
fc04901cda
Revert "moved gui into main subfolder #4168 "
...
This reverts commit 39f98d8133
.
2015-02-05 11:44:23 +00:00
XinyuHou
db1a611171
Revert "added plugin manager gui #4168 "
...
This reverts commit bfa9bab78d
.
2015-02-05 11:44:14 +00:00
XinyuHou
c34928b7c8
Revert "seperated login result and edition type #4168 "
...
This reverts commit da68664bda
.
2015-02-05 11:44:10 +00:00
XinyuHou
c81fa7db52
Revert "changed login window to dialog #4168 "
...
This reverts commit d1c1d79453
.
2015-02-05 11:44:04 +00:00
XinyuHou
52005f0905
Revert "changed plugin manager gui from window to dialog #4168 "
...
This reverts commit 1132da4598
.
2015-02-05 11:43:54 +00:00
XinyuHou
a0090c69ba
wq
...
Revert "fixed plugin gui compile error on mac #4168 "
This reverts commit f6d4cf1c38
.
2015-02-05 11:42:08 +00:00
Xinyu Hou
f6d4cf1c38
fixed plugin gui compile error on mac #4168
2015-02-04 19:11:54 +00:00
XinyuHou
1132da4598
changed plugin manager gui from window to dialog #4168
2015-02-04 18:17:06 +00:00
XinyuHou
d1c1d79453
changed login window to dialog #4168
2015-02-04 17:30:06 +00:00
XinyuHou
da68664bda
seperated login result and edition type #4168
2015-02-04 15:07:52 +00:00
XinyuHou
bfa9bab78d
added plugin manager gui #4168
2015-02-04 14:09:03 +00:00
XinyuHou
39f98d8133
moved gui into main subfolder #4168
2015-02-04 14:04:30 +00:00
XinyuHou
5f33a21878
deleted secure socket when close client time out #4313
2015-02-02 16:06:51 +00:00
XinyuHou
3aa6bed669
handled SSL connect failed on client side #4313
2015-02-02 15:33:40 +00:00
XinyuHou
10e6b5ad63
removed client connection when SSL handshake failed #4313
2015-02-02 14:18:34 +00:00
XinyuHou
e2fb03b8ce
added copy right #4168
2015-02-02 10:52:40 +00:00
XinyuHou
319de60286
stored user email, token and type in settings #4168
2015-01-30 17:38:12 +00:00
XinyuHou
ccc5834757
added login window #4168
2015-01-30 16:04:27 +00:00
XinyuHou
ad230d46e6
handled secure socket exception #4313
2015-01-29 16:16:45 +00:00
XinyuHou
767802f111
removed loop accept and connect and added more debug info #4313
2015-01-29 15:40:30 +00:00
XinyuHou
d15c99f41d
rearranged the deletion orders of clientlistener and server #4313
2015-01-28 17:34:19 +00:00
XinyuHou
4e42b9fdbd
fixed memory leak and validate ssl #4313
2015-01-28 17:33:10 +00:00
XinyuHou
622e40e5d7
managed secure socket allocation and deallocation #4313
2015-01-28 13:07:03 +00:00
XinyuHou
d80aa7c938
resolve #4337 removed IStreamFilterFactory dead code
2015-01-27 11:33:06 +00:00
XinyuHou
a53dae9be3
added assersions before lib func invoking and adjust log level #4313
2015-01-27 11:04:23 +00:00
XinyuHou
85813fd49b
added plugin unload and cleanup #4313
2015-01-27 10:42:10 +00:00
XinyuHou
10cddb97a8
fixed misused read and write #4313
2015-01-26 13:23:11 +00:00
XinyuHou
06253c965b
resolve #4328 by moving plugin into lib folder
2015-01-20 16:18:51 +00:00
XinyuHou
a98c4bd02a
made init function signature consistent #4313
2015-01-20 16:00:15 +00:00
Xinyu Hou
141b778477
refactored SecureSocket to use interface #4313
2015-01-14 17:25:53 +00:00
XinyuHou
be2b87fd39
fixed code style
2015-01-12 10:51:16 +00:00
XinyuHou
f973d1498d
dropped prefix C
2015-01-12 10:33:29 +00:00
XinyuHou
7bff958422
added pluging loader for unix #4313
2015-01-09 13:47:35 +00:00
XinyuHou
1d7eb3f5cb
updated pluging loader for Windows #4313
2015-01-09 13:46:35 +00:00
XinyuHou
de8fe7e2a5
fixed compiler cast warning in drag info class
2015-01-06 14:51:37 +00:00
XinyuHou
95a1752396
ported secure socket class from enterprise to ns plugin #4313
2015-01-06 14:20:05 +00:00
XinyuHou
a0f2261931
added new ns plugin #4313
2015-01-06 13:52:11 +00:00
Xinyu Hou
1f41b92693
Fixed client detected dialog not shown when Synergy is minimized #4307
2015-01-05 13:32:58 +00:00
the-wes
5703a41489
Update Server.cpp
...
clarified "cursor is locked" messages, moved the "scroll lock is on upon startup" message to NOTE level instead of DEBUG.
2014-12-30 13:33:21 -08:00
the-wes
d62c4a842b
Update App.h
...
update --help output.
2014-12-16 18:04:00 -08:00
the-wes
a99bea9d3b
clarify protocol error message
2014-12-05 16:59:39 -08:00
James McMullan
56b54da915
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.
2014-12-04 15:15:38 -05:00
Xinyu Hou
ebba77fd33
Suppressed empty server warning on startup #4240
2014-12-02 15:03:19 +00:00
Xinyu Hou
db9f7974ed
Fixed #4249 by add retain count for extension string
2014-12-02 12:36:01 +00:00
Xinyu Hou
774b217e8f
Fixed typo #4247
2014-12-01 18:32:00 +00:00
Xinyu Hou
0d3f14adb9
Fixed name conflict #4247
2014-12-01 18:19:20 +00:00
Xinyu Hou
b60608ece9
Fixed #4247 - Added firewall exception
2014-12-01 17:46:42 +00:00
Xinyu Hou
917c75026f
Show add client dialog only if main window is active #4230
2014-12-01 11:22:42 +00:00
Xinyu Hou
48b552a0e8
Made auto config checked after Bonjour download #4235
2014-11-28 16:34:16 +00:00
Xinyu Hou
e6e4f1b53d
Deleted the download thread in a Qt way #4235
2014-11-28 15:23:08 +00:00
Xinyu Hou
17278f7224
Closed wizard then open mainwindow #4235
2014-11-28 15:01:23 +00:00
Xinyu Hou
4452f14114
Updated zeroconf after Bonjour is installed #4235
2014-11-28 12:57:57 +00:00
Xinyu Hou
00d6b23d57
Use auto config if Bonjour already installed #4240
2014-11-28 11:21:45 +00:00
Xinyu Hou
581d4c5469
Added a icon for download message box #4235
2014-11-28 10:54:51 +00:00
Xinyu Hou
216f0f160d
Resolved #4242 keep auto config name consistent
2014-11-28 10:51:52 +00:00
Xinyu Hou
1730258311
Fixed wrong download message box title #4235
2014-11-27 19:11:01 +00:00
Xinyu Hou
d448fb777b
Merged 2 msgboxes into 1 when first startup #4240
2014-11-27 19:08:30 +00:00
Xinyu Hou
a0cc3d6e7f
Made Bonjour install in another thread #4235
2014-11-27 18:31:45 +00:00
Xinyu Hou
af4817d075
Suppressed auto connect warning on startup #4240
2014-11-27 18:31:42 +00:00
Xinyu Hou
54e294bffb
Improved auto connect massage #4237
2014-11-27 10:52:25 +00:00
Xinyu Hou
79f534273f
Ran Bonjour installer in passive mode
2014-11-27 10:52:21 +00:00
Xinyu Hou
dff2cb34be
Download Bonjour installer according to system architecture
2014-11-27 10:52:19 +00:00
Xinyu Hou
d89cb46912
Showed auto connect prompt after main window
2014-11-27 10:52:17 +00:00
Xinyu Hou
2e744b0f02
Auto start Synergy after a new client added
2014-11-27 10:52:16 +00:00
Xinyu Hou
3b1e15ba08
Try user specified name when auto detect failed
2014-11-27 10:52:14 +00:00
Xinyu Hou
97ea94de69
Solved zeroconf service name conflict
2014-11-27 10:52:12 +00:00
Xinyu Hou
5222b81600
Changed message box when no server detected
2014-11-27 10:52:10 +00:00
Xinyu Hou
c560eabeb2
Fixed close null mutex and condvar
2014-11-27 10:52:08 +00:00
Xinyu Hou
f022d814e6
Removed duplicated arch instance
2014-11-27 10:52:07 +00:00
Xinyu Hou
7c02369437
Stopped starting synergy when server is detected
2014-11-27 10:52:05 +00:00
Xinyu Hou
5afd94edb3
Added mutex for updating zeroconf service
2014-11-27 10:52:03 +00:00
Xinyu Hou
c323003f65
Removed dead code
2014-11-27 10:52:01 +00:00
Xinyu Hou
40ef0b03c2
Made Mac buttons the same layout as Windows ones
2014-11-27 10:51:59 +00:00
Xinyu Hou
e71e7e1cd3
Catched exception while getting active desktop name
2014-11-27 10:51:58 +00:00
Xinyu Hou
5833b434ef
Changed message box types
2014-11-27 10:51:56 +00:00
Xinyu Hou
a289c1cbe3
Showed first tab in server config dialog as default
2014-11-27 10:51:54 +00:00
Xinyu Hou
20db8d55af
Modified and centered install Bonjour msgbox
2014-11-27 10:51:52 +00:00
Xinyu Hou
ec4ef549bb
Added ignore auto connect clients check box in dialog
2014-11-27 10:51:50 +00:00
Xinyu Hou
471e198efc
Fixed race condition for updating zeroconf service
2014-11-27 10:51:49 +00:00
Xinyu Hou
56b3231a6c
Made service error log more readable
2014-11-27 10:51:47 +00:00
Xinyu Hou
22475067de
Fixed the warning logic when hostname is empty
2014-11-27 10:51:45 +00:00
Xinyu Hou
1a69f458b7
Shown client name in detect dialog
2014-11-27 10:51:42 +00:00
Xinyu Hou
2aec1223ae
Show server list when 2 or more servers detected
2014-11-27 10:51:39 +00:00
Xinyu Hou
66a1ffa5f5
Added ignore auto connect clients check box
2014-11-27 10:51:36 +00:00
Xinyu Hou
aa9990fba9
Updated server config dialog UI generated by Qt
2014-11-27 10:51:33 +00:00
Xinyu Hou
b2435cdaef
Resolve #4230 more user friendly dialog when client is detected
2014-11-27 10:51:29 +00:00
Xinyu Hou
30f478ad5c
Fixed legacy resource filename
2014-11-27 10:51:25 +00:00
Xinyu Hou
fa1092d665
Resolve zeroconf uses bogus IPs #4091
2014-11-27 10:51:22 +00:00
Xinyu Hou
8d7f6e146d
Fixed startSynergy twice when detect the first server
2014-11-27 10:51:18 +00:00
Xinyu Hou
f0cb271902
Resolved Auto-conf server select #4218
2014-11-27 10:51:15 +00:00
Xinyu Hou
6cb589d18e
Made Bonjour install Windows only #4196
2014-11-27 10:51:12 +00:00
Xinyu Hou
6fd8afafbd
Solved #4196 by download and open Bonjour installer
2014-11-27 10:51:08 +00:00
Xinyu Hou
376c983d21
Added cancel download
2014-11-27 10:51:05 +00:00
Xinyu Hou
8503833e3d
Added seamless download of Bonjour
2014-11-27 10:51:01 +00:00
Xinyu Hou
f781cce156
Prompt to enable auto connect #4196
2014-11-27 10:50:58 +00:00
Xinyu Hou
5bd65b5426
Added download Bonjour code
2014-11-27 10:50:54 +00:00
Xinyu Hou
330121ce55
Asked users if they want to install Bonjour
2014-11-27 10:50:51 +00:00
Xinyu Hou
5db30cff74
Fixed memory leak
2014-11-27 10:50:47 +00:00
Xinyu Hou
588494a730
Check is Bonjour running before update zeroconf
2014-11-27 10:50:44 +00:00
Xinyu Hou
6ef744cd81
Added code to check if Bonjour service is running
2014-11-27 10:50:40 +00:00
Xinyu Hou
c51ce29954
Removed Bonjour dependency in wix
2014-11-27 10:50:37 +00:00
Vasily Galkin
06df954366
fix removing jobs for closed sockets from m_socketJobs (patch by Brian Vincent from synergy issue tracker #2866 )
2014-11-14 18:29:28 +04:00
Xinyu Hou
9fd11da578
Drop C prefix on Windows
2014-11-12 11:44:29 +00:00
Xinyu Hou
e5e0a3b653
Drop C prefix on Linux
2014-11-12 11:28:41 +00:00
Xinyu Hou
67377109f3
Moved Screen class into synergy namespace
2014-11-11 17:45:24 +00:00
Xinyu Hou
a4843c4947
Fixed "c" prefix compile error on Mac 10.10
2014-11-11 14:58:30 +00:00
Xinyu Hou
1aaa55163c
Fixed "c" prefix compile error on Windows
2014-11-11 14:50:09 +00:00
Nick Bolton
41d6080028
changed company name in copyright notice
2014-11-11 13:52:03 +00:00
Nick Bolton
e8e156f0e2
dropped "c" prefix from class names
2014-11-11 13:51:47 +00:00
Xinyu Hou
afa24f4a02
Disable the privilege helper tool #4191
2014-11-06 17:08:58 +00:00
Xinyu Hou
37be6ec45f
Merge pull request #4160 from cribe78/cribe-pullrequest#4055
...
Fixed: Shift keys are not sent to clients #4055
2014-11-06 15:39:30 +00:00
Xinyu Hou
d347cbd45f
Merge branch 'pdecat-master'
2014-11-05 10:25:31 +00:00
chris
65fc59eeae
clean up changes for pull request
2014-11-04 12:17:30 -05:00
chris
93d864ad6f
clean up changes for pull request
2014-11-04 12:16:58 -05:00
chris
8024aa9ab1
Working fix for #4055 (client shift key problem) in place
2014-11-04 12:06:30 -05:00
Xinyu Hou
117208754f
Hided elevate checkbox on Unix #4130
2014-10-27 17:15:50 +00:00
Xinyu Hou
23670c5f9b
Moved elevate checkbox to settings #4130
2014-10-27 17:10:12 +00:00
Xinyu Hou
d2191b6b93
Auto elevate for Windows UAC and screen lock #4130
2014-10-27 16:39:18 +00:00
Xinyu Hou
4d3fd14ada
Merge branch 'caramis-master'
2014-10-27 14:46:54 +00:00
Xinyu Hou
6756296d85
Made daemon take full responsibility for logging #4128
2014-10-27 14:11:43 +00:00
Xinyu Hou
39b534f3b8
Merge branch 'petroules-mac-fixes'
2014-10-27 13:04:59 +00:00
Xinyu Hou
de68346874
Fixed hm config error
2014-10-27 11:58:25 +00:00
Xinyu Hou
df29bf8e54
Merge branch 'helkanen-master'
2014-10-24 15:10:44 +01:00
Jake Petroules
5b4e46f8ea
Fix Info.plist for Synergy GUI.
...
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
Xinyu Hou
5c6eba8790
Merged argsParse to master
2014-10-23 13:21:41 +01:00
Xinyu Hou
a32cb41342
Parse arg refactoring #4124
...
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou
a71ebc78b3
Parse arg refactoring #4124
...
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou
943a355359
Parse arg refactoring #4124
...
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Xinyu Hou
e26ccfdce6
Parse arg refactoring #4124
...
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou
f9f2d8e8af
Parse arg refactoring #4124
...
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou
d2814a423c
Parse arg refactoring #4124
...
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Xinyu Hou
bc772f98a6
Unable to start synergy server with "Cannot create a file when that file already exists" message #3752
...
Go to next iteration as soon as it fails.
2014-10-22 12:53:14 +01:00
Nick Bolton
c2b3f1414b
Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master
2014-10-22 12:49:16 +01:00
Jean-Philippe Andre
9e358233c3
Fix copy&paste for EFL applications
...
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
Nick Bolton
4a24a2117a
Merge branch 'master' of https://github.com/caramis/synergy into caramis-master
2014-10-22 11:59:14 +01:00
Xinyu Hou
4aa43d6995
Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit
2014-10-22 11:40:00 +01:00
Xinyu Hou
a58ca97941
Merge remote-tracking branch 'origin/master'
2014-10-21 16:00:56 +01:00
Xinyu Hou
504e41966e
Carbon loop not ready within 5 sec #4002
...
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
SeokYeon Hwang
3a663092cf
Do not throw exception if ProcessIdToSessionId() is failed.
...
Many security solutions forbid other program from accessing their own process. So if ProcessIdToSessionId() is failed, simply ignore it.
Signed-off-by: SeokYeon Hwang <caramis@gmail.com>
2014-10-21 19:51:28 +09:00
Jake Petroules
7dd2db25ec
Add support for building with 64-bit architectures on OS X.
...
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:
Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.
TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.
Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-15 19:29:49 -07:00
Xinyu Hou
38718a362f
Enable drag and drop by default #4122
...
Remove premium login from GUI
2014-10-15 14:57:28 +01:00
Patrick Decat
aeab72f724
Apply patch from https://github.com/synergy/synergy/issues/3749
2014-10-15 14:51:44 +02:00
jerry
7e562273d5
[no-issue]
...
revert to r2421
2014-09-15 15:17:07 +00:00
jerry
1805dd7900
issue #575 - Cannot build x86_64 or ppc64 on Mac OS X
...
applied patch by Jake Petroules
2014-09-15 13:04:43 +00:00
jerry
32feab2ef1
issue #65 - Auto config feature using Zeroconf/Bonjour
...
added warning during installation if bonjour not installed on Windows
2014-08-26 17:37:39 +00:00
jerry
cdc740c5d1
issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
...
added massage box to ask user where to add client
2014-08-26 14:49:27 +00:00
jerry
aa2accf5a6
issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
...
renamed tryFixNoServer to fixNoServer
2014-08-26 11:27:17 +00:00
jerry
a2d3b5c7e2
issue #65 - Auto config feature using Zeroconf/Bonjour
...
gave user an option to toggle auto connect
2014-08-26 11:22:09 +00:00
jerry
828f7c02b1
issue #65 - Auto config feature using Zeroconf/Bonjour
...
matched argument in error handle
2014-08-26 10:25:01 +00:00
jerry
2ec6a49795
issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
...
reverted position order back
2014-08-26 10:10:25 +00:00
jerry
eb99e843c2
issue #65 - Auto config feature using Zeroconf/Bonjour
...
fixed start button was broken
2014-08-26 10:09:23 +00:00
jerry
deb45ad393
issue #65 - Auto config feature using Zeroconf/Bonjour
...
change position order to left first then right
2014-08-26 09:42:24 +00:00
jerry
ff5ca8b8aa
issue #65 - Auto config feature using Zeroconf/Bonjour
...
added needed dll on windows, so no need to dependent on bonjour installation
2014-08-22 13:46:20 +00:00
jerry
8cad7551e6
issue #65 - Auto config feature using Zeroconf/Bonjour
...
merging zeroconf into trunk
2014-08-21 17:32:40 +00:00
jerry
c4dd6eb61c
sticky keys fix doesn't work, may make things worse - backed out [no-issue]
2014-08-01 10:35:16 +00:00
Nick Bolton
3a6d9e82e3
added comment about protocol version [no-issue] [no-build]
2014-07-28 08:19:29 +00:00
jerry
995730a646
issue #18 - Sticky modifier/meta keys
...
- improved on Mac.
2014-07-02 13:25:49 +00:00
jerry
547d99f7af
issue #3404 - Log path needs to be in quotes on windows
...
fixed compile error
2014-06-18 13:14:12 +00:00
jerry
559237f930
issue #3404 - Log path needs to be in quotes on windows
...
issue solved.
2014-06-18 12:59:30 +00:00
jerry
507abdcbfb
issue #4072 Carbon loop not ready within 5 sec
...
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry
9feaa959f1
issue #4072 - Carboon loop not ready within 5 sec
...
issue solved
2014-06-02 11:04:09 +00:00
jerry
ae4d8cee2a
issue #3307 - Configuration file paths containing spaces don't work
...
issue solved
2014-05-28 12:05:05 +00:00
jerry
23f762a623
issue #3404 - Log path needs to be in quotes on windows
...
issue solved
2014-05-28 11:59:14 +00:00
jerry
3d6413fada
issue #3996 - Installer fails when Windows Firewall is disabled
...
issue solved
2014-05-28 10:57:28 +00:00
jerry
2d91029de4
[no-issue] [no-build] fixed indentation in gui.pro
2014-05-23 15:58:57 +00:00
jerry
1dfe867c54
issue #4060 - Key stuck down on Windows server
...
finished solving issue.
2014-05-23 15:01:29 +00:00
jerry
f87bd9e860
- checked filename's validation before sending drag info
...
- refactored duplicated write to drop dir code
- removed legacy member variables
- fixed code style
- fixed typo
2014-05-14 14:45:15 +00:00
jerry
935ca0b2f2
Added support for copying images (BMP) and HTML to/from the OS X clipboard - patch by Ryan Chapman
2014-05-13 12:31:05 +00:00
Nick Bolton
d9f90e319e
changed synergy-foss.org to synergy-project.org
2014-05-08 07:33:35 +00:00
jerry
da3b77447a
fixed warning on 10.6 and 10.5
2014-05-06 19:54:02 +00:00
jerry
2797e9a719
fixed compile error and added header for runtime_error
2014-05-06 19:23:40 +00:00
jerry
9621cba99e
- redesigned drag information protocol
...
- used DragInformation to encapsulate information and helper functions.
- renamed parameters in sendDragInfo function.
2014-05-06 18:26:47 +00:00
jerry
2666bf7cf3
copy synmacph only on mavericks. fixed warning on 10.6
2014-05-06 16:12:27 +00:00
jerry
6df7ba2fc4
try to fix gui compile error on mac 10.6 and 10.5
2014-05-06 13:00:08 +00:00
jerry
b2f48a0f5b
included synmacph only on mavericks or above
2014-05-06 11:57:55 +00:00
jerry
cc752484e4
try to fix implicit declaration warnings below mac 10.6
2014-05-01 16:17:09 +00:00
jerry
735fd08400
fixed helper tool:
...
used xpc communicate between gui and mhp
made helper tool optional
gave more feedback
2014-05-01 15:54:09 +00:00
jerry
ff42afc36c
made drag info function name more consistent
2014-05-01 13:56:07 +00:00
jerry
f773ff3d00
refactored duplicated code in dragInfoReceived
...
refactored fakeDraggigFiles interface
2014-04-30 18:54:32 +00:00
jerry
fd68b70878
patch by Marc:
...
- fixed switchNeedsAlt not working
- improved logging
2014-04-30 11:17:54 +00:00
jerry
5773ed1ceb
made XBase non abstract
2014-04-23 14:15:41 +00:00
jerry
b876c0daf3
fixed compile error on 10.6 and 10.5
2014-04-22 16:43:04 +00:00
jerry
22ebb259d0
merged wix from ent to community (no shell extension any more)
2014-04-22 13:17:58 +00:00