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

757 commits

Author SHA1 Message Date
Nye Liu
6c11de6a22 Fix bug #4735 - don't leave() until fillClipboard()s all complete 2016-03-15 12:46:45 -07:00
Jerry (Xinyu Hou)
0207b697e3 Remove debug logging #5030 2015-11-30 12:01:00 -08:00
Jerry (Xinyu Hou)
42f201785c Revert "Added timeout for waiting active destop result #4723" 
This reverts commit aec52c36e6.
 2015-11-24 11:53:38 -08:00
Jerry (Xinyu Hou)
539ac32136 Revert "Fixed using wrong local variable #4723" 
This reverts commit d7063a87c8.
 2015-11-24 11:53:18 -08:00
Jerry (Xinyu Hou)
8a2106a09e Revert "workaround for Fast cursor on any client with Mac server #451" 
This reverts commit 267f3ac41f.
 2015-11-24 11:40:04 -08:00
Jerry (Xinyu Hou)
3bca8deac3 Use secure URL #4715 2015-11-23 11:42:47 -08:00
Jerry (Xinyu Hou)
953ad5bc4a Use live URL #4715 2015-11-23 10:03:44 -08:00
Jerry (Xinyu Hou)
fbd2c1413e Merge branch 'jerry-sandbox2' 2015-11-23 09:54:05 -08:00
Jerry (Xinyu Hou)
fa8a0ebbfe Make center point be aware of DPI scaling #5030 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
df89859400 Fix indentation 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
c259af9b41 Fix code style 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
4f1f2dcff0 Use condition instead of assertion #5030 2015-11-19 13:46:48 -08:00
XinyuHou
af305ba3df Add size_t dependency #5030 2015-11-19 13:46:47 -08:00
Jerry (Xinyu Hou)
0cc831b2fb Fix code style 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
c994b0a4f7 Make sure all variables are non zero #5030 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
a09bfc5f07 Fix high DPI breaking edge detection and mouse delta calculation #5030 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
66335cd6f8 Pass resolution and center into core on Windows #5030 2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou)
1ccc258455 Add DPI helper #5030 2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou)
e1e38bd3a2 Compress network error during notification #4932 2015-11-19 10:01:50 -08:00
Jerry (Xinyu Hou)
4698394e21 URL encode identity and MAC address 2015-11-18 11:51:45 -08:00
Jerry (Xinyu Hou)
f8e9047c36 Rephrase and refactor serial warning message #4716 2015-11-17 14:17:00 -08:00
Jerry (Xinyu Hou)
4b7796d215 Catch exception from notification request #4932 2015-11-12 12:05:26 -08:00
Jerry (Xinyu Hou)
55df81b1a6 Add company and email into serial key #4715 2015-11-12 10:08:35 -08:00
Jerry (Xinyu Hou)
4c1b6f3f23 Use test website #4932 2015-10-30 13:49:18 -07:00
Jerry (Xinyu Hou)
10e3917b61 Change notify failure log level #4932 2015-10-30 13:42:05 -07:00
Jerry (Xinyu Hou)
382607129c Make notify failure silent #4932 2015-10-30 12:43:28 -07:00
Jerry (Xinyu Hou)
73ac3df22d Limit expired time to trial version #4716 2015-10-30 11:41:51 -07:00
Jerry (Xinyu Hou)
068b3b98ed Fix compile warnning #4933 2015-10-30 11:25:16 -07:00
Jerry (Xinyu Hou)
0a1c439535 Only send notify request on wizard finish #4932 2015-10-29 16:50:23 -07:00
Jerry (Xinyu Hou)
b4563a42c4 Use string split function in syntool #4933 2015-10-29 15:47:10 -07:00
Jerry (Xinyu Hou)
d429988e73 Add more unit tests for split string function #4933 2015-10-29 13:00:03 -07:00
Jerry (Xinyu Hou)
72397137c0 Add split string function #4933 2015-10-29 12:52:55 -07:00
Jerry (Xinyu Hou)
582629e968 Use the passed in OS info if specified #4933 2015-10-28 17:29:42 -07:00
Xinyu Hou
a4c799c285 Notify activation when skipping or using serial #4932 2015-10-27 16:31:09 -07:00
Xinyu Hou
4d20a3ce91 Add OS and arch in auth request #4933 2015-10-27 15:50:34 -07:00
Xinyu Hou
32da441fc0 Simplify OS info on Unix #4933 2015-10-27 15:45:39 -07:00
Jerry (Xinyu Hou)
da315ec164 Add unit tests for subscription manager #4715 2015-10-23 11:35:58 -07:00
Jerry (Xinyu Hou)
978c97cbc0 Refactor parse plain serial #4715 2015-10-23 11:35:57 -07:00
XinyuHou
0429986470 Add dependency for Linux #4715 2015-10-22 16:41:48 -07:00
Jerry (Xinyu Hou)
85ef7935cc Rename a variable 2015-10-22 16:04:05 -07:00
Jerry (Xinyu Hou)
ca0237dcc7 Remove legacy subscription checking #4715 2015-10-21 17:48:44 -07:00
Jerry (Xinyu Hou)
18e7004213 Add subscription functionalities in syntool #4715 2015-10-21 16:35:22 -07:00
Jerry (Xinyu Hou)
8f941f5713 Port subscription feature #4715 2015-10-21 16:00:23 -07:00
Jerry (Xinyu Hou)
d2c94bfb04 Revert "Removed mutex locking from get and set of log level #4809" 
This reverts commit 3eef49d5c9.
 2015-08-06 12:57:57 -07:00
Xinyu Hou
9b09703c1a Revert "Allowed reconnect after SSL fatal error #4857" 
This reverts commit cbd63e9d67ead4199d5ab49b17d68a7583421d92.
 2015-08-06 12:55:59 -07:00
Xinyu Hou
95c9ffe7e8 Removed unused variable #4866 2015-08-03 16:38:42 -07:00
Jerry (Xinyu Hou)
5b1e7acca9 Plugin version to 1.3 2015-08-03 16:29:36 -07:00
Jerry (Xinyu Hou)
0f4837aa21 Fixed warning on Mac 10.6 #4866 2015-08-03 15:56:39 -07:00
Jerry (Xinyu Hou)
945ccfdb75 Refactored plugin names #4866 2015-08-03 15:56:21 -07:00
Xinyu Hou
b105bc8f42 Unified secure socket name across platforms #4866 2015-08-03 15:56:03 -07:00
Xinyu Hou
fedad2b8a1 Improved plugin version logging for Unix #4866 2015-08-03 15:55:37 -07:00
Nick Bolton
3eb1bffb70 Improved variable name for plugin loading on Windows #4866 2015-08-03 15:51:53 -07:00
Nick Bolton
cb5f0f7b12 Improved plugin version logging for Windows #4866 
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
 2015-08-03 15:51:27 -07:00
Jerry (Xinyu Hou)
dc72b4e512 Changed plugin version mismatch log level to error #4866 2015-08-03 15:46:47 -07:00
Jerry (Xinyu Hou)
6602ebe435 Refactored adding plugin only after loaded #4866 
Conflicts:
	src/lib/arch/unix/ArchPluginUnix.cpp
 2015-08-03 15:45:31 -07:00
Xinyu Hou
a99699df7a Only loaded matching plugin on Mac #4866 
Conflicts:
	src/lib/arch/unix/ArchPluginUnix.cpp
 2015-08-03 15:43:54 -07:00
Jerry (Xinyu Hou)
a249c38b96 Only loaded matching plugin on Windows #4866 
Conflicts:
	src/gui/gui.pro
	src/gui/src/PluginManager.cpp
	src/lib/arch/win32/ArchPluginWindows.cpp
 2015-08-03 15:41:57 -07:00
Jerry (Xinyu Hou)
86d5567e74 Removed redundant logging #4721 2015-07-31 13:57:18 -07:00
Jerry (Xinyu Hou)
5d61996405 Fixed code style #4712 2015-07-31 13:56:58 -07:00
Xinyu Hou
1659f9f018 Added keep alive massge before each data transfer #4712 2015-07-31 13:56:33 -07:00
Jerry (Xinyu Hou)
9d44affc89 Fixed Ipc unit test intermittently fail #4721 2015-07-31 13:56:10 -07:00
Jerry (Xinyu Hou)
7259e71439 Reset thread back to null on finish #4712 2015-07-31 13:55:35 -07:00
Jerry (Xinyu Hou)
bfc3ac340f Fixed possible loss of data warning #4677 2015-07-31 13:55:23 -07:00
Jerry (Xinyu Hou)
c3d38db053 Made buffer thread wait for notify when no gui #4721 2015-07-31 13:55:00 -07:00
Jerry (Xinyu Hou)
5ec9ccc76e Revert "Made buffer thread wait until there is a GUI client #4721" 
This reverts commit 9a4327e44236c0ac30809660dc87a97e984dc84f.
 2015-07-31 13:52:56 -07:00
Xinyu Hou
5a9cbc97e3 Fixed code style 
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
 2015-07-31 13:51:48 -07:00
Xinyu Hou
afdcb9cefe Made buffer thread wait until there is a GUI client #4721 
Conflicts:
	src/lib/ipc/IpcLogOutputter.cpp
 2015-07-31 13:49:17 -07:00
Jerry (Xinyu Hou)
cc3dc315f9 Allowed reconnect after SSL fatal error #4857 2015-07-31 13:46:35 -07:00
Jerry (Xinyu Hou)
a44e9832c5 Refactored code order to make it more readable 2015-07-31 13:46:23 -07:00
Jerry (Xinyu Hou)
9800bec857 Made clipboard log more consistent #4712 2015-07-31 13:46:11 -07:00
Jerry (Xinyu Hou)
c2b96cfbb7 Updated comment #4750 2015-07-31 13:45:46 -07:00
Jerry (Xinyu Hou)
d51eb7b8b5 Fixed code style 2015-07-31 13:42:51 -07:00
Jerry (Xinyu Hou)
f8bb948776 Removed unused variable #4750 2015-07-31 13:42:41 -07:00
Jerry (Xinyu Hou)
0ddf544efb Used static variable than define #4750 
Conflicts:
	src/lib/plugin/ns/SecureSocket.cpp
 2015-07-31 13:25:03 -07:00
Jerry (Xinyu Hou)
44966ee17f Removed redundant log #4858 2015-07-31 13:22:50 -07:00
Jerry (Xinyu Hou)
4fe46e117e Shorten data transfer log #4858 2015-07-31 13:20:50 -07:00
Jerry (Xinyu Hou)
485547d6ea Reverted Notify back to note #4855 2015-07-31 13:20:35 -07:00
Jerry (Xinyu Hou)
81649376fa Revert "Added symbolic link creation to linux and macos #4696" 
This reverts commit ad9cfd64af.

Conflicts:
	src/gui/src/PluginManager.cpp
 2015-07-31 13:20:16 -07:00
Jerry (Xinyu Hou)
a8cf9173c8 Revert "Changed note to notify #4745" 
This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
 2015-07-31 13:19:17 -07:00
Jerry (Xinyu Hou)
69a6038cf9 Revert "Moved note into either warning or info #4745" 
This reverts commit d3a4ce1f11.
 2015-07-31 13:18:57 -07:00
Jerry (Xinyu Hou)
9483fecc42 Fixed code style 
Revert "Moved note into either warning or info #4745"

This reverts
commit d3a4ce1f11.

Revert "Changed note to notify #4745"

This reverts commit
5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp

Shortened transmission log #4858

Revert "Added code to throw an error if the plugin can't be deleted or
written to #4696"

This reverts commit
5696497bc0.
 2015-07-31 13:17:12 -07:00
Jerry (Xinyu Hou)
cfec3a93f2 Fixed code style 2015-07-06 16:48:36 -07:00
Jerry (Xinyu Hou)
260a7337d3 Added timestamp in log #4845 2015-07-06 15:50:21 -07:00
Jerry
23739f8484 Prevented open clipboard twice #4815 2015-07-06 13:00:28 -07:00
Jerry (Xinyu Hou)
8a026e06bd Merge remote-tracking branch 'origin/v1.7.4-stable' 2015-06-30 15:43:39 -07:00
Xinyu Hou
85dc7a566e Made log consistent #4745 2015-06-30 03:37:36 +01:00
Jerry (Xinyu Hou)
673fba5846 Merge branch 'master' of https://github.com/synergy/synergy 2015-06-25 12:38:33 -07:00
Jerry (Xinyu Hou)
3aebb87b37 Fixed using old log level convention #4745 2015-06-25 11:25:58 -07:00
Adam Potolsky
9dc0a1d862 Added comment for clarity #4750 2015-06-25 09:54:28 -07:00
Adam Potolsky
25c1754d2d Merge branch 'master' into adam-sandbox 2015-06-25 09:46:21 -07:00
Adam Potolsky
4569de5413 Fixed misplaces statis string in windows code #4793 2015-06-25 09:44:16 -07:00
Adam Potolsky
d7043ef84b Added plugin version output to unix builds #4793 2015-06-25 09:35:56 -07:00
Adam Potolsky
55a38ff8cc removed unnecessary flag settings, fixed wrong call. #4750 2015-06-24 17:57:22 -07:00
Adam Potolsky
f10f0f13c4 retry case needs to do another job with the same parameters not just a new job #4750 2015-06-24 16:31:47 -07:00
Adam Potolsky
2df88e07c4 fixed retry logic for secure connect and accept #4750 2015-06-24 12:20:25 -07:00
Adam Potolsky
e50b239592 Changed secure connest and accept to match read/write retry logic #4750 2015-06-24 11:11:20 -07:00
kahiroka
267f3ac41f workaround for Fast cursor on any client with Mac server #451 2015-06-19 17:20:26 -07:00
Adam Potolsky
d51e2e4fb1 Merge branch 'v1.7.4-stable' of https://github.com/synergy/synergy into v1.7.4-stable 2015-06-18 14:19:06 -07:00
Adam Potolsky
3eef49d5c9 Removed mutex locking from get and set of log level #4809 2015-06-18 14:18:05 -07:00
Jerry (Xinyu Hou)
14046db32a Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-15 09:59:38 -07:00
Jerry (Xinyu Hou)
667b6f13c7 Enforced secure socket rewrite on the same buffer address #4712 2015-06-12 18:03:28 -07:00
Jerry (Xinyu Hou)
3e32d9fbee Improved secure socket intensive try operations #4796 2015-06-12 16:53:41 -07:00
Adam Potolsky
768445816b Merge branch 'adam-sandbox' 2015-06-12 16:03:34 -07:00
Adam Potolsky
efab42962f Merge branch 'master' of https://github.com/synergy/synergy 2015-06-12 16:03:25 -07:00
Adam Potolsky
afb0e2a2ea Added log level protection, changed log levels for some logging #4793 2015-06-12 15:07:53 -07:00
Adam Potolsky
16a2815504 Added additional SSL logging abotu connection information as well as client and server cipher availability #4793 2015-06-12 14:40:15 -07:00
Adam Potolsky
4b0dec69bf Added additional SSL logging abotu connection information as well as client and server cipher availability #4793 2015-06-12 14:33:28 -07:00
Jerry (Xinyu Hou)
72060e59b4 Fixed send clipboard thread time issue #4749 2015-06-12 11:21:05 -07:00
Adam Potolsky
6bb44fbc59 Merge pull request #4228 from galkinvv/fix2866 
High client CPU usage and laggy mouse
 2015-06-11 16:12:40 -07:00
Adam Potolsky
3942dc6ee8 Added stub code for linux/mac builds to match the functional ARCH code for discovering libraris in use #4793 2015-06-11 10:00:45 -07:00
Adam Potolsky
fa0dfa0ded Added ability to query lib locations to windows builds 2015-06-10 13:18:39 -07:00
Adam Potolsky
8366bb6247 Added OpenSSL version and location logging 2015-06-10 10:20:59 -07:00
Jerry (Xinyu Hou)
099c984d7d Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-09 16:05:43 -07:00
Adam Potolsky
0c211e2852 Adding logging output when ssl connects for aid in debugging and support 2015-06-09 14:07:42 -07:00
Jerry (Xinyu Hou)
a21e4cd73b Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-08 13:53:01 -07:00
Adam Potolsky
ed37eeca51 Merge branch '4696' 2015-06-08 13:24:47 -07:00
Adam Potolsky
155a8b70c4 Added version string to plugin and added to plugin loaded message 2015-06-05 17:07:47 -07:00
Jerry (Xinyu Hou)
5c71efebe6 Fixed integtests #4584 2015-06-05 15:23:44 -07:00
Jerry (Xinyu Hou)
756c3b4463 Inserted keep alive msg among data transfer #4584 2015-06-05 15:21:32 -07:00
Jerry (Xinyu Hou)
bbf53bb9b8 Return the same job on retry #4584 2015-06-05 15:21:26 -07:00
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
7795d68c21 Removed magic number #4712 2015-06-04 14:46:47 -07:00
Jerry (Xinyu Hou)
eb3f8aee2a Notified file transmission interrupted #4745 2015-06-04 14:43:49 -07:00
Jerry (Xinyu Hou)
646e1b52eb Interrupted file transfer when cursor move back #4584 2015-06-04 13:09:48 -07:00
Jerry (Xinyu Hou)
e0903983ad Validated file expected size #4584 2015-06-04 10:19:36 -07:00
Jerry (Xinyu Hou)
8c64cbf54e Refactored send drag info on server #4584 2015-06-04 10:04:08 -07:00
Adam Potolsky
78f8fb45ba Fixed Installed Directory in ARCH for MacOS #4696 2015-06-04 09:58:22 -07:00
Jerry (Xinyu Hou)
ee22e688d5 Removed clipboard ignore notification #4745 2015-06-03 17:32:09 -07:00
Jerry (Xinyu Hou)
d9684d44d2 Added fake drag file list #4584 2015-06-03 16:17:26 -07:00
Jerry (Xinyu Hou)
7614a21aac Cleared buffer on send instead of write #4721 2015-06-03 14:45:47 -07:00
Jerry (Xinyu Hou)
c4e8dc7198 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-02 15:30:33 -07:00
Adam Potolsky
0061969cf2 Updating installed dir for Linux and MacOS #4696 2015-06-02 14:28:20 -07:00
Jerry (Xinyu Hou)
8d0fdee5ce Added full stop for notification #4745 2015-06-02 11:18:21 -07:00
Jerry (Xinyu Hou)
f42b756b0e Added clipboard transmission failed notification #4745 2015-06-02 11:17:04 -07:00
Jerry (Xinyu Hou)
f22d9ac477 Added clipboard transmission start notification #4745 2015-06-02 11:14:28 -07:00
Jerry (Xinyu Hou)
d9921c894c Added clipboard transmission notification #4745 2015-06-02 09:48:26 -07:00
Adam Potolsky
98bb9b3fb3 Added getInstalledDir to ToolApp. #4696 2015-06-01 16:43:27 -07:00
Jerry (Xinyu Hou)
4533063768 Fixed compile error on Unix #4745 2015-06-01 16:04:13 -07:00
Jerry (Xinyu Hou)
bfe616eebe Added file transmission started notification for server #4745 2015-06-01 16:00:35 -07:00
Jerry (Xinyu Hou)
d1ca021002 Monitoring log to show notification and made icon change while transfering $4745 2015-06-01 15:59:59 -07:00
Xinyu Hou
5cbcd74028 Fixed using NOTE level logging on Mac #4745 2015-06-01 23:42:58 +01:00
Jerry (Xinyu Hou)
e7f358afb2 Added file transmission started, failed and complete notification #4745 2015-06-01 15:33:06 -07:00
Jerry (Xinyu Hou)
5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou)
d3a4ce1f11 Moved note into either warning or info #4745 2015-06-01 14:31:32 -07:00
Jerry (Xinyu Hou)
ecf0485e8f Removed commented out code #4745 2015-06-01 12:39:30 -07:00
Jerry (Xinyu Hou)
4a27c0b05c Added drop file notification on client #4745 2015-06-01 11:57:43 -07:00
Jerry (Xinyu Hou)
97bac70fae Stop writing into and clear buffer when no GUI #4721 2015-05-29 16:55:22 -07:00
Jerry (Xinyu Hou)
d7063a87c8 Fixed using wrong local variable #4723 2015-05-27 10:32:13 -07:00
Jerry (Xinyu Hou)
aec52c36e6 Added timeout for waiting active destop result #4723 2015-05-27 10:18:45 -07:00
Jerry (Xinyu Hou)
3498d1bc8e Used synergy::string::sprintf instead of append #4690 2015-05-27 09:52:58 -07:00
Jerry (Xinyu Hou)
d83cb23cc7 Reverted 8b9758 #4712 2015-05-26 17:25:18 -07:00
Jerry (Xinyu Hou)
907b02fb09 Used log system instead of stdout (part 2) #4690 2015-05-26 17:18:14 -07:00
Jerry (Xinyu Hou)
3788084e43 Merge branch 'jerry-sandbox' of https://github.com/synergy/synergy into jerry-sandbox 2015-05-26 17:13:09 -07:00
Jerry (Xinyu Hou)
f063b094ec Used log system instead of stdout #4690 2015-05-26 17:12:58 -07:00
Jerry (Xinyu Hou)
dba46707b2 Removed SSL chunk size limitation #4712 2015-05-26 13:31:15 -07:00
Nick Bolton
8b975878c2 Limited clipboard size to 1kb when SSL is enabled #4601 
@XinyuHou I had no choice but to block clipboard data over 1kb in
size... anything over that and you get an access violation.
 2015-05-26 15:04:04 +01:00
Nick Bolton
fd72bf17ce Reworded SSL errors to be more consistent #4650 2015-05-26 14:17:30 +01:00
Nick Bolton
42ed1c2f27 Increased ssl error rate limit from 50k to 100k #4650 
@speaker This is nuts... my mac client now errors 50k times before it
eventually connects.
 2015-05-26 14:14:24 +01:00
Nick Bolton
3dc3d5b309 Increased ssl error rate limit from 60 to 50000 #4650 
@speaker, a 50k limit seems a bit insane, but it seems to be the only
way to get my Mac client to establish a connection :-/
 2015-05-26 14:00:50 +01:00
Nick Bolton
e96cead732 Fixed wrong sprintf specifier used (%s instead of %d) #4650 
My bad, I was being carless in 4aa57cfbdb
 2015-05-26 12:19:13 +01:00
Nick Bolton
4aa57cfbdb Fixed code style, more consistent logging #4650 2015-05-25 20:24:29 +01:00
Nick Bolton
1cea4bb80f Fixed code style, use lower case for logging #4650 2015-05-25 20:20:12 +01:00
Nick Bolton
0fdcfe9b95 Fixed code style, prefer enums over macros #4650 2015-05-25 20:20:12 +01:00
Nick Bolton
14bb44f539 Comment explaining lack of 10.7 support #4695 2015-05-25 17:41:38 +01:00
Nick Bolton
25237a14b7 Revert "Allowed Mac OS X 10.7 to build ns plugin #4695" 
This reverts commit a900543c1d.
 2015-05-25 17:40:36 +01:00
Nick Bolton
a900543c1d Allowed Mac OS X 10.7 to build ns plugin #4695 2015-05-25 16:53:46 +01:00
Nick Bolton
18344e6b52 Copy ns plugin to debug dir when in debug mode #4704 2015-05-25 13:08:47 +01:00
Nick Bolton
f322a79760 Copy plugins to config dir on Mac #4703 2015-05-25 13:07:36 +01:00
Jerry (Xinyu Hou)
b1f2abbaae Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 16:39:33 -07:00
Xinyu Hou
fb3252efef Added a way to interrupt sending clipboard/file #4601 2015-05-23 00:34:00 +01:00
Adam Potolsky
905dbfee90 Fixed order of initializers for mac build #4697 2015-05-22 16:26:40 -07:00
Adam Potolsky
773530506e Merge branch 'master' of https://github.com/synergy/synergy 2015-05-22 16:10:29 -07:00
Adam Potolsky
35e09c46b9 Changed secureSocket routines to return a status, and modify an argument for num of bytes handled #4697 2015-05-22 16:09:59 -07:00
Jerry (Xinyu Hou)
ff9ad5554a Used different chunk size for SSL and non-SSL socket #4601 2015-05-22 13:30:50 -07:00
Jerry (Xinyu Hou)
36ddc4f1c1 Fixed indentation 2015-05-22 13:10:22 -07:00
Jerry (Xinyu Hou)
625feab104 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 12:40:24 -07:00
Jerry (Xinyu Hou)
c1d859e35a Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 11:28:39 -07:00
Jerry (Xinyu Hou)
a81b88c730 Refactored file assemble and send code #4601 2015-05-22 11:27:57 -07:00
Adam Potolsky
7b718dc586 Forgot to change linux specific variable name #4697 2015-05-22 11:17:10 -07:00
Adam Potolsky
5b3fa48902 Made socket self-aware of when it is in a fatal state #4697 
Added code to cleanly terminate connection on fatal socket state #4697
 2015-05-22 10:56:13 -07:00
Jerry (Xinyu Hou)
1df566d241 Refactored duplicated code #4601 2015-05-21 17:50:55 -07:00
Jerry (Xinyu Hou)
1c28444cf6 Refactored duplicated code #4601 2015-05-21 16:04:50 -07:00
Jerry (Xinyu Hou)
342a345d1f Fixed code style 2015-05-21 15:35:36 -07:00
Jerry (Xinyu Hou)
257c19ecc4 Deprecated and moved clipboard functionality into new protocol #4601 2015-05-21 15:34:28 -07:00
Adam Potolsky
e4f86a8934 Adding pass/fail retry logic to connection attempts #4697 #4650 2015-05-21 15:22:39 -07:00
Jerry (Xinyu Hou)
8b49eb6595 Removed unused function #4601 2015-05-21 15:19:00 -07:00
Jerry (Xinyu Hou)
c22e327eed Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-21 11:37:42 -07:00
Adam Potolsky
18d85f1b6b Merge branch 'master' of https://github.com/synergy/synergy 2015-05-20 16:56:32 -07:00
Adam Potolsky
68ecdc0753 Added additional logging to help debug potential problems related to performance and SSL WAIT states #4650 2015-05-20 16:54:42 -07:00
Jerry (Xinyu Hou)
7dbe30cb61 Fixed Linux uses wrong clipboard event #4601 2015-05-20 14:43:58 -07:00
Adam Potolsky
ad86041433 Added code to test for and error out of max retry condition #4650 2015-05-20 14:27:25 -07:00
Adam Potolsky
1af9d58a9b Changed conditional to match coding standard #4650 2015-05-20 14:14:30 -07:00
Adam Potolsky
81a70135bd Added concept of a max retry count to SecureSocket class #4650 2015-05-20 13:50:18 -07:00
Adam Potolsky
994a9433fe Converting retry to a counter #4650 2015-05-20 12:08:25 -07:00
Xinyu Hou
3e9fc89d96 Modified server to use correct clipboard format #4601 2015-05-20 19:54:56 +01:00
Xinyu Hou
490667e21b Used StreamChunker to send clipboard in chunks #4601 2015-05-20 19:54:17 +01:00
Xinyu Hou
cf5347c8f6 Sent clipboard on a thread #4601 2015-05-20 19:53:30 +01:00
Xinyu Hou
49ac320f97 Refactored clipboard event into ClipboardEvent #4601 2015-05-20 19:09:54 +01:00
Nick Bolton
950219b39e Fixed init order warning on Mac #4624 2015-05-20 17:51:52 +01:00
Nick Bolton
561204b2a7 Disabled threading on most IPC logging tests #4624 
Threading was making it very hard to reliably run the IPC logging tests
(many timing issues), so I disabled threading for most of the tests.
 2015-05-20 17:42:07 +01:00