rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,257 Commits 20 Branches 42 Tags 86 MiB
Commit Graph

1662 Commits

Author SHA1 Message Date
Andrew Nelless af62174b59 #5707 Only notify activation on user action 2016-10-28 17:45:42 +01:00
Andrew Nelless af9037276c #5707 Prefer 'update' over 'upgrade' 2016-10-28 17:45:35 +01:00
Andrew Nelless fa7daa48f7 Revert "Update buildbot to Qt 4.8.7" 
This reverts commit b7e0473cb4.
 2016-10-28 17:45:34 +01:00
Andrew Nelless 73685c3d92 #5707 Tweak notify url for upgrades 2016-10-28 17:45:30 +01:00
Andrew Nelless 4206799ae3 #5707 Add from and to version numbers to version update notification 2016-10-28 17:45:26 +01:00
Andrew Nelless 2de06b9727 #5707 Add support for upgrade notifications 2016-10-28 17:45:20 +01:00
Andrew Nelless 9f1e91cc76 Remove pointless call to curl_free 2016-10-28 17:45:18 +01:00
Andrew Nelless 906fd15b4a #5707 Store and update last version uses in settings 2016-10-28 17:45:13 +01:00
Jerry (Xinyu Hou) 8d193c76b5 #5186 Apply DPI aware option in local machine rather than current user in registry 2016-10-28 06:00:46 -07:00
Jerry (Xinyu Hou) 0d4fd6dcef #5186 Reorder some functions call to make it clear 2016-10-28 06:00:11 -07:00
Jerry (Xinyu Hou) c2372bc9a8 #5186 Remove accumulate fraction DPI calculation 2016-10-28 05:24:07 -07:00
Jerry (Xinyu Hou) cf397a0d6f #5186 Remove Dpi calculation code 2016-10-28 04:50:06 -07:00
Jerry (Xinyu Hou) c62c4d503d #5186 Remove dpiaware manifest 2016-10-28 03:38:08 -07:00
Jerry (Xinyu Hou) 640262dfff #5186 Only add DPI related registry key on Windows 8 or above 2016-10-26 08:43:55 -07:00
Jerry (Xinyu Hou) 6b0cd35527 #5186 Update registry keys to enable Windows 7 compatibility and disable DPI scaling 2016-10-26 08:10:09 -07:00
Andrew Nelless b7e0473cb4 Update buildbot to Qt 4.8.7 2016-10-26 15:34:36 +01:00
Andrew Nelless f08f0b3f37 #5657 Fix activation dialog tab order 2016-10-25 16:40:33 +01:00
Andrew Nelless 492df1f3fd #5657 Stop service and refresh license when trial expires 2016-10-25 16:27:12 +01:00
Andrew Nelless b66043e000 #5657 Tweak plurality of trial countdown 2016-10-20 17:59:03 +01:00
Andrew Nelless a59c437fd3 Merge icon reversion 2016-10-20 14:55:55 +01:00
Andrew Nelless 1842a68a0e #5657 Always show trial counter, fix plurality 2016-10-20 14:55:21 +01:00
Jerry (Xinyu Hou) e17130f060 Revert "#5640 Update icon to the new hotness" 
This reverts commit 833c73f1bd.
 2016-10-20 14:02:47 +01:00
Jerry (Xinyu Hou) 3048ca5fc6 Revert "#5640 About dialog tweaks" 
This reverts commit 03b8788660.
 2016-10-20 14:02:34 +01:00
Jerry (Xinyu Hou) bdf5546058 Revert "#5640 About dialog tweaks" 
This reverts commit 9837c982cd.
 2016-10-20 14:02:01 +01:00
Andrew Nelless 7bae07d34e #5657 Merge trial support 2016-10-20 11:30:25 +01:00
Andrew Nelless 868887155d #5657 Update buy now links 2016-10-20 11:30:02 +01:00
Andrew Nelless ae590907a8 #5657 Remind users to activate all devices if they might be using SSL 2016-10-19 17:50:44 +01:00
Andrew Nelless f2a1d962bc #5657 Fix skip activation loop 2016-10-19 17:40:34 +01:00
Andrew Nelless e01d0ce4c7 #5657 Raise activation dialog when key expires 2016-10-19 16:01:15 +01:00
Andrew Nelless f441c24a23 #5657 Minor activation UI tweaks 2016-10-19 11:36:48 +01:00
Jerry (Xinyu Hou) 984ca48f34 Merge remote-tracking branch 'origin/issue5620-sierra' into v1.8.5 2016-10-19 10:54:31 +01:00
Andrew Nelless 6a7d1dd43c #5657 Merge core fixes for trial support 2016-10-19 10:46:52 +01:00
Andrew Nelless 47913e57b8 #5657 Raise activation dialog when trial expires 2016-10-18 18:45:15 +01:00
Andrew Nelless 02c23905d6 #5657 Handle expired keys properly 2016-10-18 17:01:44 +01:00
Jerry (Xinyu Hou) dc4beba9e9 #5680 Stop deleting socket twice if it's been adopted by PacketStream 2016-10-18 16:48:32 +01:00
Jerry (Xinyu Hou) dfc7c31d67 #5657 Delay auto client adding while activation dialog is shown 2016-10-18 15:43:15 +01:00
Andrew Nelless 020b7974df #5657 Fix trial warning label and serial key serialisation 2016-10-18 15:32:59 +01:00
Andrew Nelless e5aae66ff7 #5657 Don't clear edition when appconfig contains an invalid serial key 2016-10-18 15:13:19 +01:00
Jerry (Xinyu Hou) 45f37c508c #5657 Make serial key argument for server only 2016-10-18 14:56:48 +01:00
Jerry (Xinyu Hou) e48be9099d #5657 Remove whitespace for serial key input 2016-10-18 13:05:29 +01:00
Jerry (Xinyu Hou) e65631c451 #5657 Fix wrong logic about checking if serial key expired 2016-10-18 13:02:36 +01:00
Andrew Nelless 859608424d #5657 Link synergyd against Synergy shared library 2016-10-17 18:06:29 +01:00
Andrew Nelless 98610fabde #5657 Remove unused CoreInterfaces 2016-10-17 17:59:01 +01:00
Andrew Nelless fc67cdf56e #5657 Rename SubscriptionManager to LicenseManager 2016-10-17 17:57:14 +01:00
Andrew Nelless 5a34da3ce0 #5657 Refresh UI when synergys reports trial expired 2016-10-17 17:49:14 +01:00
Andrew Nelless 99dbdc5eb3 #5657 Use SerialKey class in ServerArgs 2016-10-17 17:38:05 +01:00
Andrew Nelless 88c59b4ca6 #5657 Fix unit tests after SerialKey::isValid removal 2016-10-17 17:37:30 +01:00
Andrew Nelless 599415f047 #5657 Only check trial times when using a trial 2016-10-17 17:11:30 +01:00
Andrew Nelless 8b4d7abfb0 #5657 Remove SerialKey::m_valid 2016-10-17 17:08:26 +01:00
Andrew Nelless c7dc198d82 #5657 Fix SerialKey whitespace 2016-10-17 16:34:44 +01:00
Andrew Nelless b5a6ae0a94 #5657 Fix SerialKey expiring unit test 2016-10-17 16:27:40 +01:00
Andrew Nelless 7eefa49c77 #5657 Fix SerialKey construction in unit tests 2016-10-17 16:12:33 +01:00
Andrew Nelless 714b2f6440 #5657 Make trial expiry notification live 2016-10-17 15:26:42 +01:00
Andrew Nelless e05ced287c #5657 Enable external links on trial label 2016-10-17 11:57:32 +01:00
Andrew Nelless e14ff8935b #5657 Fix SerialKey unit test 2016-10-15 16:25:04 +01:00
Andrew Nelless 0dd0e65e2a #5657 Remove more C++11 enum qualifiers 2016-10-15 16:07:05 +01:00
Andrew Nelless b20d04d80c #5657 Add missing include for runtime_error 2016-10-15 15:59:27 +01:00
Andrew Nelless 3ee9ac5d49 #5657 Remove C++11 enum qualifier 2016-10-15 15:49:36 +01:00
Andrew Nelless 4ad7c7fe39 #5657 Rename edition to activeLicense. WSFs 2016-10-15 15:30:28 +01:00
Andrew Nelless 3b98a7b785 #5657 Add trial label to main window 2016-10-15 14:58:03 +01:00
Andrew Nelless 1f93b4a918 #5657 Rename dayLeft to daysLeft in unit tests 2016-10-15 12:37:00 +01:00
Andrew Nelless d244683ac4 #5657 Merge core changes 2016-10-15 12:03:55 +01:00
XinyuHou dc31f395cc #5657 Fixed integtests using the old server constructor 2016-10-14 09:44:02 -07:00
Andrew Nelless 55414e4581 #5657 Make SubscriptionManager backward compatible 2016-10-14 17:38:31 +01:00
Jerry (Xinyu Hou) 89851fddc3 #5657 Exited server if trial is expired 2016-10-14 17:14:21 +01:00
Jerry (Xinyu Hou) 2b1b0640ea #5657 Added serial argument parsing unit test 2016-10-14 13:51:46 +01:00
Jerry (Xinyu Hou) 92b29276d0 #5657 Added serial argument in core 2016-10-14 13:51:27 +01:00
Jerry (Xinyu Hou) 1e5dfd3cb5 #5657 Added more unit tests for member functions in SerialKey 2016-10-14 12:43:58 +01:00
Jerry (Xinyu Hou) dce4b382e6 #5657 Fixed passing in the raw serial key 2016-10-14 12:43:33 +01:00
Jerry (Xinyu Hou) 33ebe61ef2 #5657 Counted expiring within 1 day as 1 day left 2016-10-14 12:43:01 +01:00
Andrew Nelless 727fc5c220 #5659 Move activation notification to SubscriptionManager 2016-10-14 12:16:23 +01:00
Andrew Nelless 540882056f #5657 Create a global SubscriptionManager instance 2016-10-14 11:59:25 +01:00
Andrew Nelless 743e96f277 #5657 Don't store activation email 2016-10-14 11:35:33 +01:00
Andrew Nelless fd8e778b2a #5657 Fix serial key file path in GUI 2016-10-14 11:35:33 +01:00
Jerry (Xinyu Hou) 719e64dc8f #5657 Added missing dependencies on Linux and Windows 2016-10-13 18:07:21 +01:00
Jerry (Xinyu Hou) 235f528dd9 #5657 Added unit tests for SerialKey 2016-10-13 17:55:38 +01:00
Jerry (Xinyu Hou) 2a452307cd #5657 Fleshed out the implementation of SerialKey 2016-10-13 17:55:09 +01:00
Jerry (Xinyu Hou) 92a885524b #5657 Added temporary implementation for SerialKey 2016-10-13 14:00:19 +01:00
Jerry (Xinyu Hou) 92680b2877 #5657 Extracted shared code between GUI and core 2016-10-13 13:53:09 +01:00
Jerry (Xinyu Hou) 82e55702ef #5657 Removed serial key code from syntool 2016-10-13 11:20:43 +01:00
Jerry (Xinyu Hou) 4be9fc1800 Removed unused code 2016-10-13 11:18:03 +01:00
Jerry (Xinyu Hou) d92fcd2453 #5657 Added version 2 trial serial key support 2016-10-13 11:15:38 +01:00
Jerry (Xinyu Hou) c7cd74ab5f Fixed code style 2016-10-13 11:11:56 +01:00
Andrew Nelless 5ea1fdc7c6 #5620 Remove deprecated NXClickTime call 2016-10-12 16:10:57 +01:00
Andrew Nelless df88faaad8 #5620 Convert OSXScreen into Objective C++ 2016-10-12 15:43:01 +01:00
Andrew Nelless 2b9f48602c #5620 Make Xcode 8 happy with null cast 2016-10-12 15:09:29 +01:00
Jerry (Xinyu Hou) a50ae2ad36 Fixed code style 2016-10-12 12:59:38 +01:00
Jerry (Xinyu Hou) fc879323bc #5657 Removed password log in in activation window 2016-10-12 12:56:52 +01:00
Andrew Nelless 964f1aa093 Merge changes made in v1.8.4 2016-10-12 10:41:44 +01:00
Andrew Magill 217eb475de #5183 Accumulate fractional moves across updates. 2016-10-06 15:42:29 +01:00
Andrew Nelless 9ae146add0 Merge branding changes into v1.8.4 2016-10-06 13:04:28 +01:00
Andrew Nelless ef3b79e585 Merge activation dialog branch into v1.8.4 2016-10-06 13:01:18 +01:00
Andrew Nelless 9837c982cd #5640 About dialog tweaks 2016-10-06 12:58:57 +01:00
Andrew Nelless 742cd70f98 #5627 Toggle fingerprint visibility when toggling SSL state 2016-10-06 11:29:34 +01:00
Andrew Nelless 03b8788660 #5640 About dialog tweaks 2016-10-05 21:53:58 +01:00
Andrew Nelless 833c73f1bd #5640 Update icon to the new hotness 2016-10-05 21:53:54 +01:00
Andrew Nelless 6892664f4a Fix cast of XRRNotifyEvent 2016-10-05 15:10:40 +01:00
Andrew Nelless 360d5a7c17 Merge Linux xrandr branch into v1.8.4 2016-10-05 15:05:31 +01:00
Andrew Nelless dd88e324d7 #4420 Send screen shape change event on Linux (xrandr) 2016-10-05 12:54:57 +01:00
Andrew Nelless 26c11ec3c9 Restore horrible reinterpret_casts in OSXUchrKeyResource 2016-10-05 12:46:17 +01:00
Andrew Nelless 602fd3f649 Restore safe reinterpret_casts in OSXKeyState 2016-10-05 12:46:17 +01:00
Andrew Nelless 8072594008 Restore safe reinterpret_casts in OSXClipboardBMPConverter 2016-10-05 12:46:17 +01:00
Andrew Nelless 23cf284a66 Restore safe reinterpret_casts in MSWindowsClientTaskBarReceiver 2016-10-05 12:46:17 +01:00
Andrew Nelless 19b9be4593 Restore safe reinterpret_casts in MSWindowsScreenSaver 2016-10-05 12:46:17 +01:00
Andrew Nelless 788f6eab9f Restore safe reinterpret_casts in MSWindowsScreen 2016-10-05 12:46:17 +01:00
Andrew Nelless 2a5dc62747 Restore safe reinterpret_casts in MSWindowsDesks 2016-10-05 12:46:17 +01:00
Andrew Nelless f7ad162634 Fix up casts in MSWindowsClipboardBitmapConverter 2016-10-05 12:46:17 +01:00
Andrew Nelless 2e30dc2c68 Restore safe reinterpret_cast of Windows thread handle 2016-10-05 12:46:17 +01:00
Andrew Nelless 702f095efd Fix cast in Windows TaskBar 2016-10-05 12:46:17 +01:00
Andrew Nelless 7e386c0bf9 Fix cast of port number in Winsock 2016-10-05 12:46:16 +01:00
Andrew Nelless d77b5f1176 Restore safe reinterpret_casts in Windows TaskBar 2016-10-05 12:46:16 +01:00
Andrew Nelless 5a03e37d15 Restore safe reinterpret_casts in misc Windows code 2016-10-05 12:46:16 +01:00
Andrew Nelless f1cd215f28 Restore safe reinterpret_cast in Synergy GUI 2016-10-05 12:46:16 +01:00
Andrew Nelless 0568271506 Partially remove reinterpret_casts in network tests 2016-10-05 12:46:16 +01:00
Andrew Nelless a13dc92f2e Restore safe reinterpret_casts in SecureSocket 2016-10-05 12:46:16 +01:00
Andrew Nelless 16977788d3 Restore safe reinterpret_casts in XWindowsClipboardBMPConverter 2016-10-05 12:46:16 +01:00
Andrew Nelless 5b8fb69124 Partially de-reinterpret_cast XWindowsClipboard 2016-10-05 12:46:16 +01:00
Andrew Nelless 5272c9dde4 Restore safe reinterpret_casts in XWindowsUtil 2016-10-05 12:46:16 +01:00
Andrew Nelless 50807bfcb6 Restore safe reinterpret_casts in XWindowsScreen 2016-10-05 12:46:16 +01:00
Andrew Nelless 055370412c Restore safe reinterpret_cast in clipboard converter 2016-10-05 12:46:16 +01:00
Andrew Nelless fb5e2bb171 Restore safe reinterpret_cast in readUInt32 2016-10-05 12:46:16 +01:00
Andrew Nelless e81f7ab8c7 Replace unsafe casts with memcpy ops 2016-10-05 12:46:16 +01:00
Andrew Nelless 90c3dd6622 Restore evil-enabling reinterpret_cast in SocketMultiplexer 2016-10-05 12:46:16 +01:00
Andrew Nelless 0371002497 Restore use of reinterpret_cast in unicode routines 2016-10-05 12:46:16 +01:00
Andrew Nelless f174614655 Remove bizarre cast of sockaddr to char* 2016-10-05 12:46:16 +01:00
Andrew Nelless 9ed9bde4e7 Restore use of reinterpret_cast for sockaddr_in 2016-10-05 12:46:16 +01:00
Andrew Nelless f3d1470e58 Brutally replace all reinterpret_casts with static_casts 2016-10-05 12:46:16 +01:00
Andrew Nelless e6a3caaf75 #5628 Fix net lib linkage on Ubuntu 2016-10-04 15:51:07 +01:00
Andrew Nelless 0c76f9feeb Merge DPI scaling branch 2016-10-04 15:29:29 +01:00
Andrew Nelless d99bd8e031 Merge fix for #5329 2016-10-04 15:23:27 +01:00
Andrew Nelless c288918d68 #5629 Fix height of settings dialog 2016-10-04 15:12:27 +01:00
Andrew Nelless 002bcebbd2 #5629 Fix main window AppConfig naming conventions 2016-10-04 13:47:28 +01:00
Andrew Nelless 783056f7cc #5629 Ensure setEdition signals main UI 2016-10-04 13:41:27 +01:00
Andrew Nelless 15f2e27d18 #5629 Show the main window behind the activation dialog 2016-10-04 11:48:47 +01:00
Andrew Nelless 16ef224ba8 #5629 Save activation dialog seen state on reject 2016-10-04 11:15:53 +01:00
Andrew Nelless 603b12dc59 #5629 Trigger main window show event before opening activation dialog 2016-10-04 10:45:27 +01:00
Andrew Nelless 15a6a27dc6 #5629 Show activation dialog only after main window 2016-10-03 19:48:05 +01:00
Andrew Nelless 176d7e4725 #5617 Don't copy plugins directory on Windows 2016-10-03 19:47:55 +01:00
Andrew Nelless 912ed9be9c #5629 Ensure settings are saved when AppConfig updates them 2016-10-03 19:47:45 +01:00
Andrew Nelless d1a180f652 #5627 Automatically generate SSL cert when enabling SSL 2016-10-03 19:47:38 +01:00
Andrew Nelless 32f143f52b #5627 Update Main Window fingerprint after SSL cert gen 2016-10-03 19:47:32 +01:00
Andrew Nelless d6bcdcbea7 #5629 Change activation failure to a QDialog 2016-10-03 19:47:24 +01:00
Andrew Nelless c799041ce8 #5627 Only generate an SSL certificate when it doesn't exist 2016-10-03 19:47:18 +01:00
Andrew Nelless 4924f2faff #5627 Save settings after creating MainWindow 2016-10-03 19:47:06 +01:00
Andrew Nelless d6b7d8e357 #5627 Enable encryption for Pro users 2016-10-03 19:46:52 +01:00
Andrew Nelless 2809530793 #5629 Remove 'Run Wizard' from file menu 2016-10-03 19:46:48 +01:00
Andrew Nelless bcf2d5de0d #5629 Trigger activation dialog if previously unseen 2016-10-03 19:46:43 +01:00
Andrew Nelless 02d75cd370 #5603 Ignore exceptions in getOSInformation() 2016-10-03 19:46:41 +01:00
Andrew Nelless 088ac82e18 #5629 Remove activation from the wizard 2016-10-03 19:46:25 +01:00
Andrew Nelless 6033f0c946 #5629 Minor grammar tweaks 2016-10-03 19:46:20 +01:00
Andrew Nelless 0f95c6e941 #5629 Complete activation support for activation dialog 2016-10-03 19:46:06 +01:00
Andrew Nelless d48f6801f0 Disable DPI scaling on core binaries 2016-10-03 13:44:21 +01:00
Andrew Nelless 60a4e62779 #5629 Enable activation cancellation dialog 2016-09-29 16:17:38 +01:00
Andrew Nelless 0d5d7e11c0 #5629 Simplify Activation dialog 2016-09-29 16:16:49 +01:00
Andrew Nelless d4646b1cc6 #5629 Add activation cancellation dialog 2016-09-29 16:14:09 +01:00
Andrew Nelless 81ae0c211a #5629 Move activation widgets to new activation dialog 2016-09-29 13:53:44 +01:00
Andrew Nelless 663e3f5854 #5629 Add rudimentary activation dialog 2016-09-29 13:45:06 +01:00
Andrew Nelless 45da1dfc7c #5628 Make enableCrypto directly enable SSL 2016-09-29 13:11:09 +01:00
Andrew Nelless 55a2d1231f #5628 Initialize SSL on secure client sockets 2016-09-29 13:11:09 +01:00
Andrew Nelless 0d84e4eed6 #5617 Make PacketStreamFilter adopt all socket types 2016-09-29 13:11:09 +01:00
Andrew Nelless 3b5940ac18 #5628 Restore copying of SSL libs on Windows 2016-09-29 13:11:09 +01:00
Andrew Nelless 964e6d2f12 #5617 Remove PluginManager from SettingsDialog 2016-09-29 13:11:09 +01:00
Andrew Nelless 1fceb2b646 #5617 Remove PluginManager from MainWindow 2016-09-29 13:11:05 +01:00
Andrew Nelless 5db78acab4 #5628 Link Synergy core against OpenSSL 2016-09-29 13:05:04 +01:00
Andrew Nelless 52c8763d97 #5617 Add SecureSocket to TCPSocketFactory 2016-09-29 13:05:04 +01:00
Andrew Nelless 6456271141 #5617 Remove plugin interface from Arch 2016-09-29 13:05:04 +01:00
Andrew Nelless 79fc6239fd #5617 Revert "Remove plugin interface from Arch" 
This reverts commit 4613edc17ced61d6aca80cff661323ede0cb9d30.
 2016-09-29 13:05:04 +01:00
Andrew Nelless c3889667ba #5617 Remove online check for plugins 2016-09-29 13:05:04 +01:00
Andrew Nelless 5f5153f450 #5617 Remove the plugin wizard from GUI 2016-09-29 13:05:04 +01:00
Andrew Nelless b55b8f0038 #5617 Revert "Remove plugin args from ArgParser" 
This reverts commit cd58a8f0d0abe344d8e31a817386f613c7acde25.
 2016-09-29 13:05:04 +01:00
Andrew Nelless b1a991e8cd #5617 Revert "Remove plugin directory support" 
This reverts commit fc697d2ab79bbd2d607c97658c986b629a1280ed.
 2016-09-29 13:05:04 +01:00
Andrew Nelless 45ef3e1080 #5617 Remove plugin interface from Arch 2016-09-29 13:05:04 +01:00
Andrew Nelless 77d6b83b0c #5617 Remove stray PluginVersion includes 2016-09-29 13:05:04 +01:00
Andrew Nelless aee8e2874e #5617 Remove plugins from Windows installer 2016-09-29 13:05:04 +01:00
Andrew Nelless a2ad4cb0dc #5617 Remove plugin args from ArgParser 2016-09-29 13:05:04 +01:00
Andrew Nelless 011da60cca #5617 Remove plugin infra from ClientApp 2016-09-29 13:05:04 +01:00
Andrew Nelless 85227f41a1 #5617 Remove plugin infra from ServerApp 2016-09-29 13:05:04 +01:00
Andrew Nelless f7e588dfff #5617 Remove plugin directory support 2016-09-29 13:05:03 +01:00
Andrew Nelless dc93b063b7 #5617 Remove plugin infra from TCPSocketFactory 2016-09-29 13:05:03 +01:00
Andrew Nelless 5774f5a291 #5617 Remove plugin infra from Client 2016-09-29 13:05:03 +01:00
Andrew Nelless 27ccddbea4 #5617 Remove plugin infra from ClientListener 2016-09-29 13:05:03 +01:00
Andrew Nelless 76b2558f1a #5617 Delete the plugin infrastructure 2016-09-29 13:05:03 +01:00
Andrew Nelless 665bd91dbd #5628 Move SSL socket code from plugin to lib/net 2016-09-29 13:04:57 +01:00
Andrew Nelless a70a2bf864 #5329 Fix build date in about dialog 2016-09-27 11:37:16 +01:00
Andrew Nelless cb20fdcc97 Merge bonjour branch 2016-09-26 15:39:53 +01:00
Andrew Nelless c7bf59e6c1 Merge changes from v1.8.3 2016-09-26 15:33:57 +01:00
Andrew Nelless c418d66f60 #3305 Rename macOS MediaKeySimulator to MediaKeySupport 2016-09-26 11:58:33 +01:00
Andrew Nelless e76b4a7747 #3305 Send macOS media key events to clients 2016-09-26 11:58:33 +01:00
Andrew Nelless 1b0d4308e2 #3305 Map brightness keys correctly on macOS servers 2016-09-26 11:58:33 +01:00
Andrew Nelless 6294679fcd #3305 Detect media keys on macOS server 2016-09-26 11:58:33 +01:00
Andrew Nelless 6d5b2707c8 #3305 Add logging for unknown macOS events 2016-09-26 11:58:33 +01:00
Xinyu Hou a17779e7fd #123 Disabled clipboard grab mechanism when clipboard is disabled 2016-09-26 11:58:33 +01:00
Xinyu Hou ce4effa2c8 #123 Fixed warning on Linux 2016-09-26 11:58:33 +01:00
Xinyu Hou eafc548b97 #123 Made disable clipboard take effect on client 2016-09-26 11:58:33 +01:00
Xinyu Hou 90673e8b87 #123 Added note about disabling clipboard 2016-09-26 11:58:33 +01:00
Xinyu Hou 59e31c3f05 #123 Made clipboard name convention consistent 2016-09-26 11:58:33 +01:00
Xinyu Hou 673829f511 #123 Made disable clipboard take effect on server 2016-09-26 11:58:33 +01:00
Xinyu Hou 9c0bac7c7d Fixed indentations 2016-09-26 11:58:33 +01:00
Xinyu Hou 3c94310c9e #123 Read clipboard sharing option and pass it to all clients 2016-09-26 11:58:33 +01:00
Xinyu Hou 130458f77a #123 Added enable clipboard option in GUI 2016-09-26 11:58:33 +01:00
Xinyu Hou d78758ab7d Fixed indentation 2016-09-26 11:58:33 +01:00
Xinyu Hou dc80ab4023 #4740 Sent heartbeat message between each chunk message 2016-09-26 11:58:33 +01:00
Xinyu Hou d8ace7fb4a #4740 Used global const rather than macro 2016-09-26 11:58:33 +01:00
Xinyu Hou 8ab69a22ae #4740 Forced delay on heartbeat rather than each clipboard chunk 2016-09-26 11:58:33 +01:00
Xinyu Hou d14d907ac1 #4740 Removed clipboard interrupt code 2016-09-26 11:58:33 +01:00
Andrew Nelless fc6ce84ee4 Don't pollute the log with clipboard data at DEBUG2 2016-09-26 11:58:33 +01:00
Xinyu Hou ceecee0f57 #4740 Used safer static cast 2016-09-26 11:58:33 +01:00
Xinyu Hou 71741da721 #4740 Only adopted non-SSL socket 2016-09-26 11:58:33 +01:00
Xinyu Hou 07f7baf335 #4740 Passed IDataSocket directly 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 61c0bd1910 Removed unused variable 2016-09-26 11:58:33 +01:00
XinyuHou f2846b1586 Remove disconnect on retry exceed 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 16dbb7cd6a Fixed using the wrong variable name 2016-09-26 11:58:33 +01:00
XinyuHou a471bdcea7 Made a own copy of ClientArgs in Client 2016-09-26 11:58:33 +01:00
XinyuHou a12ae98e9f Used parent pointer for socket accept 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e1be5a66b7 Used correct event target 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 6d86a6033f Removed dead code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e0819b86cd Conflicts: 
src/lib/plugin/ns/SecureSocket.cpp
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 07902d623c Removed dead code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 08a73218e6 Refactored secure read and write into SecureSocket 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 61b489ab3d Refactor write and read into functions 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 436e333f6f Fixed indentations 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 3df75f9601 Conflicts: 
src/lib/server/ClientListener.cpp
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e1be67cfb6 Fixed indentations 
Conflicts:
	src/lib/client/Client.h
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 95464d97cf Conflicts: 
src/lib/client/Client.cpp
	src/lib/net/TCPSocketFactory.cpp
 2016-09-26 11:58:33 +01:00
XinyuHou e32402b5c6 #4740 Moved clipboard transfering back into main thread on server 2016-09-26 11:58:33 +01:00
XinyuHou 4ad2c6b10d #4740 Moved clipboard transfering back into main thread on client 2016-09-26 11:58:33 +01:00
XinyuHou 82043ca435 #4740 Used the same chunk size for secure and non-secure sockets 2016-09-26 11:58:33 +01:00
XinyuHou 3e1a86c3c1 #5502 Reverted disabled sending clipboard on inactive grab 
This reverts commit 2ad4b896f3.
 2016-09-26 11:58:33 +01:00
Cédric Picard 11d5691bca Fixed memory leak in IpcReader.cpp 2016-09-26 11:58:33 +01:00
Andrew Nelless d34a59a984 Update company name in win32 installer 2016-09-26 11:58:33 +01:00
Andrew Nelless c3c0913633 Update company copyright notice 2016-09-26 11:58:33 +01:00
Andrew Nelless 36be2051c2 Change company domain name 2016-09-26 11:58:33 +01:00
Andrew Nelless 7d11004575 #4768 Expand scope of X display lock in getCurrentTime() 2016-09-26 11:58:33 +01:00
XinyuHou 47ea124c77 #2765 Used EXPECT_FALSE instead of EXPECT_EQ 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) de91be1035 #2765 Added unit tests for KeyMap 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 2ffaf42faa #2765 Made index output 1 based 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) adaf325e6f #2765 Made sure extra sensitive modifier is not down on exact match 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b80760bb2d #2765 Matched exactly only when all required modifiers are ready down 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 178b7cc673 #2765 Made sure required modifiers already down when map command keys 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) bbb652e504 #2765 Added unit test for modifier mapping 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 7a0fae2f6c #2765 Fixed wrong bit shifting to match OSX modifier mask 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 57950d39a3 Revert "Revert "Used input source ID as the key in group map #2765"" 
This reverts commit a70cba80ea.
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) c772a59572 Revert "Revert "Made index 1 based in log #2765"" 
This reverts commit fec53e812f.
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) f4bd2dab82 #3305 Fixed class name convention for Mac and Linux 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) cc10e319d1 #3305 Resolved namespace issue 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b27a59fb0d #3305 Fixed class name convention from porting code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) df8443e795 #3305 Fixed Linux key types incompatible issue 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 1a4a313ece #3305 Added mission control and launchpad support 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) ab4f59eac4 #3305 Made Mac clients aware of brightness keys 2016-09-26 11:58:33 +01:00
Xinyu Hou (Jerry) 67f14da691 #3305 Added brightness up and down support 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b62de406e2 #3305 Refactor MockKeyState into a separate class 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 82d2a9564e #3305 Made mock match to the original KeyState 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) bd0d8e7321 #3305 Added default implementation for fakeMediaKey for Linux and Mac 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) d9a6c14170 #3305 Used Mac native way to simulate media keys 2016-09-26 11:58:33 +01:00
Andrew Nelless e72e86c9b2 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-09-26 11:58:33 +01:00
Andrew Nelless 21df3290c2 #4323 Refactored ElevateMode into its own header 2016-09-26 11:58:33 +01:00
Andrew Nelless 9c26c7ea94 #4323 Implement Elevate tristrate in GUI 2016-09-26 11:58:33 +01:00
Andrew Nelless 3cd58f7c7d #4323 Prepare settings dialog for elevation tristate 2016-09-26 11:58:33 +01:00
Andrew Nelless bb3be59c91 #4978 Link Bonjour statically 2016-08-09 10:04:32 +01:00
Andrew Nelless 342b3d1e8d #4978 Fixed WiX configuration order 2016-08-08 16:42:34 +01:00
Jerry (Xinyu Hou) 4ad8621adc #5389 Added qwindows.dll into installer on Windows 2016-08-08 16:42:34 +01:00
Jerry (Xinyu Hou) 9897711967 #4978 Increased wizard version 2016-08-08 16:42:34 +01:00
Andrew Nelless f7d8ea9686 #5390 Add --skip-tests config option 2016-08-08 16:41:01 +01:00
XinyuHou c5d5d5cba0 #4978 Made VersionHelper Windows specific 2016-08-08 16:41:01 +01:00
Andrew Nelless e1432f670c #4978 Fixed bad casting on 64bit Windows 2016-08-08 16:41:01 +01:00
Andrew Nelless 04184b51ea #4978 Removed deprecated usage of GetVersionEx 2016-08-08 16:41:01 +01:00
Andrew Nelless 3ead310161 #4978 Fixed HANDLE string formatting on 64bit Windows 2016-08-08 16:41:01 +01:00
Andrew Nelless bc24568a6f #4978 Removed deprecated GetVersionEx call when checking Windows version 2016-08-08 16:41:01 +01:00
Andrew Nelless 74c48c6516 #4978 Removed getOSName impl relying on deprecated GetVersionEx 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) cf1e5239cb #5389 Output GUI binary to release folder on Windows 2016-08-08 16:41:01 +01:00
Jake Petroules 433cfc232c #4978 Removed obsolete code for unsupported OS versions. 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 76a776ef86 #4978 Fixed warning 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) d37d3e8944 #4978 Replaced the superseded SetWindowLong API 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 454bf4dc5f #5389 Updated Wix for Qt 5.6 and VS 2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 70bdbe2736 #4978 Removed hack causing problems with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless cd09a36286 #4978 Fixed orphaned appendLogInfo slot 2016-08-08 16:41:01 +01:00
Andrew Nelless 38db630816 #5389 Added missing header under Qt5 2016-08-08 16:41:01 +01:00
Andrew Nelless 79a61b28f4 #5389 Added Qt5 compatibility for default file paths 2016-08-08 16:41:01 +01:00
Andrew Nelless 64dbae8918 #4978 Resolved conflict between interface macro in VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 6c58913899 #5389 Support for building GUI with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 1bb1b21f77 #4978 Renamed conflicting 'Unknown' EditionType 2016-08-08 16:41:01 +01:00
Andrew Nelless 13e8047967 #4978 Conditional linking C runtime lib 2016-08-08 16:41:01 +01:00
Andrew Nelless c2b6b60cec #4978 Compile core on VS2015 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 42494a72a5 #3305 Fixed class name convention for Mac and Linux 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) ba04f2dfc5 #3305 Resolved namespace issue 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 10a1ae8271 #3305 Fixed class name convention from porting code 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) e742269ada #3305 Fixed Linux key types incompatible issue 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 8f99911636 #3305 Added mission control and launchpad support 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 1f78fe6f6d #3305 Made Mac clients aware of brightness keys 2016-08-08 16:41:01 +01:00
Xinyu Hou (Jerry) 8058ed06a1 #3305 Added brightness up and down support 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) ebfe01cb3b #3305 Refactor MockKeyState into a separate class 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) e2459eb1b7 #3305 Made mock match to the original KeyState 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) d3814cc454 #3305 Added default implementation for fakeMediaKey for Linux and Mac 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 9115d5570b #3305 Used Mac native way to simulate media keys 2016-08-08 16:41:01 +01:00
Andrew Nelless e1e1199a57 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-08-08 16:41:01 +01:00
Andrew Nelless d42ea08a1d #4323 Refactored ElevateMode into its own header 2016-08-08 16:41:01 +01:00
Andrew Nelless fa9f30ff81 #4323 Implement Elevate tristrate in GUI 2016-08-08 16:41:01 +01:00
Andrew Nelless d1e80c668e #4323 Prepare settings dialog for elevation tristate 2016-08-08 16:41:01 +01:00
Andrew Nelless f6e1dd51fa #4768 Workaround locking issue in X11 getCurrentTime() 2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 7fa92869a4 #5471 Wrapped skip explanation in wizard activation page 2016-08-08 14:38:26 +01:00