Commit Graph

1617 Commits

Author SHA1 Message Date
Nick Bolton e555d5d651 Merge branch 'v1.x' into v1.10.1 2018-07-30 12:44:56 +01:00
Nick Bolton 7aa0553b57 Revert "Merge pull request #6358 from jpwhiting/build_with_newer_cmake"
This reverts commit 2b79608c44, reversing
changes made to 183403ceb7.
2018-07-30 12:27:51 +01:00
Nick Bolton 6d57630746 Revert "#6375 Add missing headers needed for Qt 5.11"
This reverts commit 85a8080339.
2018-07-30 12:27:35 +01:00
Nick Bolton 0ae87852e5 Merge branch 'v1.x' into v1.10.1 2018-07-29 18:05:03 +01:00
Nick Bolton 85a8080339 #6375 Add missing headers needed for Qt 5.11 2018-07-29 18:04:36 +01:00
Nick Bolton 683039c9cc Merge branch 'v1.10.1' of github.com:symless/synergy-core into v1.10.1 2018-07-28 15:35:22 +01:00
Nick Bolton fd0cb228ee #6374 Remove file logging for service; sharing a log file is probably not a brilliant idea 2018-07-28 15:34:44 +01:00
Nick Bolton 2cde78ff54 #6372 More logging around client disconnect to make TLS state more clear 2018-07-28 03:11:45 +01:00
Nick Bolton 5f3dce8379 #6372 Make TLS UX more user friendly 2018-07-28 02:54:11 +01:00
Nick Bolton 555090c7d2 #6372 Make service messages more user friendly 2018-07-28 02:53:45 +01:00
Nick Bolton 0e0c701b61 #6372 Only show padlock when TLSv1.2 is detected
This is really crude and probably a bit fragile, but patches welcome! I also made the fingerprint dialog a bit friendlier while I was poking around.
2018-07-28 01:52:56 +01:00
Nick Bolton 60c0df5984 #6372 Remove log levels that can break log reader behavior 2018-07-28 01:35:10 +01:00
Nick Bolton 89cc8a8daa #6372 More user friendly and current logging for SecureSocket 2018-07-28 01:19:23 +01:00
Nick Bolton 46a5166fba #6372 Force TLS 1.2 only in secure connection code 2018-07-27 09:20:20 +01:00
Jeremy Whiting f9b83f9516 Use target_link_libraries instead of qt5_use_modules.
Since qt5_use_modules is deprecated in newer cmake versions
use target_link_libraries with Qt5:: targets instead.
see: http://doc.qt.io/qt-5/cmake-manual.html
2018-07-09 10:30:31 -06:00
Sarah Hebert 0f2306c9ac #6318 Hack to ignore TIS/TSM log line on macOS 2018-07-08 16:51:57 +01:00
Sarah Hebert 9b4d14e085 #4991 Removed Zeroconf string suffix from Zeroconf service name 2018-07-08 16:51:55 +01:00
Sarah Hebert 21edf3e7f4 #6319 Disabled default Bonjour auto-config setting 2018-07-08 16:51:53 +01:00
Sarah Hebert 491bb2de00 #6312 Removed CURL dependency and all code that uses it 2018-07-08 16:51:50 +01:00
Sarah Hebert 71953b5af8 #6306 Updated GUI title 2018-07-08 16:51:40 +01:00
Andrew Nelless 458d8e4778 #6301 Disable zeroconf for Enterprise builds 2018-07-08 16:51:38 +01:00
Andrew Nelless b396b1092d #6301 Disable activation for Enterprise builds 2018-07-08 16:51:34 +01:00
Xinyu Hou 6c5c55a564 #6301 Set page 1 as default on server config dialog 2018-07-08 16:50:37 +01:00
Andrew Nelless c3a4fe7f2b #6344 Don't send clipboards over size limit 2018-07-08 16:50:34 +01:00
Andrew Nelless 14343fa7e1 #6344 Don't send clipboards over size limit to server 2018-07-08 16:50:31 +01:00
Andrew Nelless 953e829562 #6344 Clarify on client who disabled clipboard sharing 2018-07-08 16:50:23 +01:00
Andrew Nelless 7c29d8e704 #6344 Fix logic error displaying clipboard sharing status 2018-07-08 16:50:16 +01:00
Andrew Nelless 3cb7a5c101 #6345 Convert MainWindow::saveSettings to a slot 2018-07-08 16:50:09 +01:00
Andrew Nelless 88bf4b2e47 #6344 Restore default clipboard sharing size
When clipboard sharing is re-enabled, and the current size limit is 0,
make sure that the default size limit is restored
2018-07-08 16:50:05 +01:00
Andrew Nelless 8054bc51a5 #6344 Ensure setting clipboard size limit to 0 disables clipboard sharing 2018-07-08 16:50:01 +01:00
Andrew Nelless 3c133380f8 #6344 Auto Enable/disable clipboard size spinner 2018-07-08 16:49:54 +01:00
Andrew Nelless 36c81480d7 #6344 Fix clipboard size limit initialization order
Setting the clipboard sharing size to a value > 0 enables clipboard
sharing. Make sure we do this before applying the users actual
preference.
2018-07-08 16:49:50 +01:00
Andrew Nelless dfcac4e90b #6344 Persist clipboard sharing size settings 2018-07-08 16:49:46 +01:00
Andrew Nelless 358641e58e #6344 Enable the clipboard size combobox 2018-07-08 16:49:42 +01:00
Andrew Nelless 828ad24820 #6344 Fix use of std::max 2018-07-08 16:49:38 +01:00
Andrew Nelless 8af215364f #6344 Make client recognise clipboard size limit 2018-07-08 16:49:33 +01:00
Andrew Nelless 01109e0499 #6344 Make server recognise clipboard size limit 2018-07-08 16:49:27 +01:00
Andrew Nelless 7e7760668a #6344 Add clipboard sharing size limit config option 2018-07-08 16:49:16 +01:00
Xinyu Hou 682fe1cfa3 #6301 Add clipboard size limit option to GUI 2018-07-08 16:49:12 +01:00
XinyuHou 1852f7477c #6346 Don't add scrlk as a hotkey to lock screen if it's disabled 2018-07-08 16:48:54 +01:00
XinyuHou 6ccd4d71b8 #6346 Fix disable lock to screen was always set to true 2018-07-08 16:48:25 +01:00
XinyuHou 84dfeec2ed #6346 Make server bypass lock to screen if it's disable from config option
# Conflicts:
#	src/lib/server/Server.cpp
#	src/lib/server/Server.h
2018-07-08 16:48:16 +01:00
XinyuHou 535627c871 #6346 Add disable lock to screen in server config and output it to config file 2018-07-08 16:48:07 +01:00
XinyuHou 46a5b7f9ae #6345 Let Mainwindow save settings before program quits
# Conflicts:
#	src/gui/src/main.cpp
2018-07-08 16:47:56 +01:00
XinyuHou 7da1d4f9cc #6347 made log to home directory by default 2018-07-08 16:47:32 +01:00
Andrew Nelless fb3de294ec Merge branch 'v0.9-macsleep' into v1.9 2018-04-10 11:12:51 +01:00
Steve Williams 67c7d0993f #5964 Fix multiplatform sleep 2018-03-29 10:08:48 +01:00
Steve Williams eb4047b9fb #5964 Can't click on client after sleep 2018-03-29 09:54:53 +01:00
Andrew Nelless 35fb8c3389 Make macOS screen shape detection code more robust 2018-03-23 14:05:49 +00:00
Jerry (Xinyu Hou) 5697da164b #6178 Check if we should use secure socket for listening 2018-03-21 11:26:06 +00:00