smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1992 commits 2 branches 0 tags 101 MiB
Commit graph

693 commits

Author SHA1 Message Date
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
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