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
|
9893a018b1
|
Merge pull request #4634 from sparrowt/sparrowt-issue3774-fix-missing-dlls
Fix missing DLLs after install #3774
|
2015-06-12 16:14:15 -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
|
ad37db13a9
|
Merge branch 'adam-sandbox' of https://github.com/synergy/synergy into adam-sandbox
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
|
2015-06-12 14:45:29 -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 |
Jerry (Xinyu Hou)
|
1e89aa37c5
|
Merge pull request #4382 from meowfaceman/master
Make drag and drop optional #4327
|
2015-06-12 19:12:57 +01:00 |
Adam Potolsky
|
5696497bc0
|
Added code to throw an error if the plugin can't be deleted or written to #4696
|
2015-06-11 17:40:26 -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
|
eb84d17725
|
Merge branch '4696' of github.com:synergy/synergy into 4696
|
2015-06-11 10:10:41 -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
|
6b0f02b567
|
Merge branch '4696' of github.com:synergy/synergy into 4696
|
2015-06-10 13:25:33 -07:00 |
Adam Potolsky
|
bfd0a45d59
|
Added version string to plugin and added to plugin loaded message
|
2015-06-10 13:25:20 -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 |
Nick Bolton
|
f94e1e1660
|
Disabled intermittently failing unit test #4651
|
2015-06-10 07:04:58 -07:00 |
Jerry (Xinyu Hou)
|
099c984d7d
|
Merge remote-tracking branch 'origin/master' into jerry-sandbox
|
2015-06-09 16:05:43 -07:00 |
Jerry (Xinyu Hou)
|
f36d257495
|
Updated the comments
|
2015-06-09 15:48:08 -07:00 |
Jerry (Xinyu Hou)
|
81acb96540
|
Tried to fix random unittest fail (part2)
|
2015-06-09 15:33:57 -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)
|
deb3db93e6
|
Tried to fix random unittest fail
|
2015-06-09 13:59:04 -07:00 |
Jerry (Xinyu Hou)
|
7115db1176
|
Merge remote-tracking branch 'origin/master' into jerry-sandbox
|
2015-06-09 10:59:49 -07:00 |
Adam Potolsky
|
e52d21a003
|
Merge branch 'master' of github.com:synergy/synergy
# Conflicts:
# ext/toolchain/commands1.py
|
2015-06-09 10:55:04 -07:00 |
Jerry (Xinyu Hou)
|
552f914549
|
Merge remote-tracking branch 'origin/master' into jerry-sandbox
|
2015-06-09 10:54:33 -07:00 |
Adam Potolsky
|
c8740a4971
|
Added copying of MacOS plugins to Synergy bundle #4696
|
2015-06-09 10:19:27 -07:00 |
Adam Potolsky
|
82f822b51a
|
Added copying of MacOS plugins to Synergy bundle #4696
|
2015-06-08 16:50:50 -07:00 |
Jerry (Xinyu Hou)
|
8e15b77db3
|
Added warning for enable encryption #4584
|
2015-06-08 15:39:33 -07:00 |
Jerry (Xinyu Hou)
|
756000d8a9
|
Removed warning and error logging level in GUI #4745
|
2015-06-08 14:44:31 -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 |
Adam Potolsky
|
2db2ffac84
|
Adding Windows Plugins Directory to install #4696
|
2015-06-05 16:55:36 -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 |
Adam Potolsky
|
f230ae734e
|
Adding install of plugins for rpm based systems #4696
|
2015-06-05 11:20:31 -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 |
Adam Potolsky
|
88e5c6197d
|
Trivial whitespace fix cause by by editor settings
|
2015-06-04 14:06:17 -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 |