Commit Graph

2260 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou) 392f2904aa Version to v1.8.0-alpha 2015-07-24 15:17:27 -07:00
Jerry (Xinyu Hou) 8ff44d276b Revert "Revert "Add drag and drop enable option to GUI settings""
This reverts commit 8676f64b96.
2015-07-09 17:05:43 -07:00
Jerry (Xinyu Hou) 3eb04d1b4c Revert "Revert "Fix missing DLLs after install #3774""
This reverts commit 7254e621e1.
2015-07-09 17:05:33 -07:00
Jerry (Xinyu Hou) e15b175353 Merge pull request #4864 from synergy/revert-4634-sparrowt-issue3774-fix-missing-dlls
Revert "Fix missing DLLs after install #3774"
2015-07-09 17:00:08 -07:00
Jerry (Xinyu Hou) c2841fcb58 Merge pull request #4863 from synergy/revert-4382-master
Revert "Add drag and drop enable option to GUI settings"
2015-07-09 16:56:27 -07:00
Jerry (Xinyu Hou) 7254e621e1 Revert "Fix missing DLLs after install #3774" 2015-07-09 10:00:02 -07:00
Jerry (Xinyu Hou) 8676f64b96 Revert "Add drag and drop enable option to GUI settings" 2015-07-09 09:54:57 -07:00
Nick Bolton d961106df9 Update ChangeLog 2015-07-07 16:37:30 -07:00
Jerry (Xinyu Hou) 284b2e7f2a Revert "Versioned to 1.7.5"
This reverts commit 6e74655e78.
2015-07-07 12:15:14 -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 6e74655e78 Versioned to 1.7.5 2015-07-06 12:59:57 -07:00
Jerry (Xinyu Hou) 8a026e06bd Merge remote-tracking branch 'origin/v1.7.4-stable' 2015-06-30 15:43:39 -07:00
Jerry (Xinyu Hou) 44fa44fd1b Fixed using non existing function #4745 2015-06-30 15:05:24 -07:00
Xinyu Hou 00734c15b1 Removed notify log level in settings #4745 2015-06-30 22:45:48 +01:00
Xinyu Hou 85dc7a566e Made log consistent #4745 2015-06-30 03:37:36 +01:00
Xinyu Hou 6d5f997a1e Removed notification but use tray icon #4745 2015-06-30 01:42:08 +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 c7a4ab8fb7 Merge branch 'adam-sandbox' of https://github.com/synergy/synergy into adam-sandbox 2015-06-24 11:11:48 -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
Adam Potolsky c9b60eca27 Changed secure connest and accept to match read/write retry logic #4750 2015-06-24 10:34:19 -07:00
Adam Potolsky 6442bcb8f6 Change PluginWizardPage to take and use MainWindow instead of appConfig #4823 2015-06-23 17:11:39 -07:00
Adam Potolsky 19f5ad8cab Add delay routine to MainWindow to allow sleep in a Qt friendly way #4823 2015-06-23 17:10:49 -07:00
Adam Potolsky 415ac8e1dc Updated ChangeLog for 1.7.4 release 2015-06-22 10:19:34 -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 5d399c3e61 Added additional fixes to changelog 2015-06-19 16:44:55 -07:00
Adam Potolsky 121080be74 removed non-existant file from gui.pro to remove warning #4810 2015-06-18 14:45:41 -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) f3472c84e2 Show notification only on Debug level or above #4745 2015-06-18 13:50:38 -07:00
Nick Bolton ebb7edfb0f ChangeLog for v1.7.4-stable 2015-06-17 16:45:15 -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 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