Commit Graph

3155 Commits

Author SHA1 Message Date
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 Merge core fixes for trial support 2016-10-19 10:46:52 +01:00
Andrew Nelless 47913e57b8 Raise activation dialog when trial expires 2016-10-18 18:45:15 +01:00
Andrew Nelless 02c23905d6 Handle expired keys properly 2016-10-18 17:01:44 +01:00
Jerry (Xinyu Hou) dc4beba9e9 Stop deleting socket twice if it's been adopted by PacketStream 2016-10-18 16:48:32 +01:00
Jerry (Xinyu Hou) dfc7c31d67 Delay auto client adding while activation dialog is shown 2016-10-18 15:43:15 +01:00
Andrew Nelless 020b7974df Fix trial warning label and serial key serialisation 2016-10-18 15:32:59 +01:00
Josh Harris 17961501f6 Update ISSUE_TEMPLATE.md
Moved the 'Server' and 'Client' fields around
2016-10-18 15:26:56 +01:00
Andrew Nelless e5aae66ff7 Don't clear edition when appconfig contains an invalid serial key 2016-10-18 15:13:19 +01:00
Jerry (Xinyu Hou) 880864a249 Version to 1.8.5-rc1 2016-10-18 14:57:34 +01:00
Jerry (Xinyu Hou) 45f37c508c Make serial key argument for server only 2016-10-18 14:56:48 +01:00
Jerry (Xinyu Hou) e48be9099d Remove whitespace for serial key input 2016-10-18 13:05:29 +01:00
Jerry (Xinyu Hou) e65631c451 Fix wrong logic about checking if serial key expired 2016-10-18 13:02:36 +01:00
Andrew Nelless 859608424d Link synergyd against Synergy shared library 2016-10-17 18:06:29 +01:00
Andrew Nelless 98610fabde Remove unused CoreInterfaces 2016-10-17 17:59:01 +01:00
Andrew Nelless fc67cdf56e Rename SubscriptionManager to LicenseManager 2016-10-17 17:57:14 +01:00
Andrew Nelless 5a34da3ce0 Refresh UI when synergys reports trial expired 2016-10-17 17:49:14 +01:00
Andrew Nelless 99dbdc5eb3 Use SerialKey class in ServerArgs 2016-10-17 17:38:05 +01:00
Andrew Nelless 88c59b4ca6 Fix unit tests after SerialKey::isValid removal 2016-10-17 17:37:30 +01:00
Andrew Nelless 599415f047 Only check trial times when using a trial 2016-10-17 17:11:30 +01:00
Andrew Nelless 8b4d7abfb0 Remove SerialKey::m_valid 2016-10-17 17:08:26 +01:00
Andrew Nelless c7dc198d82 Fix SerialKey whitespace 2016-10-17 16:34:44 +01:00
Andrew Nelless b5a6ae0a94 Fix SerialKey expiring unit test 2016-10-17 16:27:40 +01:00
Andrew Nelless 7eefa49c77 Fix SerialKey construction in unit tests 2016-10-17 16:12:33 +01:00
Andrew Nelless 714b2f6440 Make trial expiry notification live 2016-10-17 15:26:42 +01:00
Andrew Nelless e05ced287c Enable external links on trial label 2016-10-17 11:57:32 +01:00
Andrew Nelless e14ff8935b Fix SerialKey unit test 2016-10-15 16:25:04 +01:00
Andrew Nelless 0dd0e65e2a Remove more C++11 enum qualifiers 2016-10-15 16:07:05 +01:00
Andrew Nelless b20d04d80c Add missing include for runtime_error 2016-10-15 15:59:27 +01:00
Andrew Nelless 3ee9ac5d49 Remove C++11 enum qualifier 2016-10-15 15:49:36 +01:00
Andrew Nelless 4ad7c7fe39 Rename edition to activeLicense. WSFs 2016-10-15 15:30:28 +01:00
Andrew Nelless 3b98a7b785 Add trial label to main window 2016-10-15 14:58:03 +01:00
Andrew Nelless 1f93b4a918 Rename dayLeft to daysLeft in unit tests 2016-10-15 12:37:00 +01:00
Andrew Nelless d244683ac4 Merge core changes 2016-10-15 12:03:55 +01:00
XinyuHou dc31f395cc Fixed integtests using the old server constructor 2016-10-14 09:44:02 -07:00
Andrew Nelless 55414e4581 Make SubscriptionManager backward compatible 2016-10-14 17:38:31 +01:00
Jerry (Xinyu Hou) 89851fddc3 Exited server if trial is expired 2016-10-14 17:14:21 +01:00
Jerry (Xinyu Hou) 2b1b0640ea Added serial argument parsing unit test 2016-10-14 13:51:46 +01:00
Jerry (Xinyu Hou) 92b29276d0 Added serial argument in core 2016-10-14 13:51:27 +01:00
Jerry (Xinyu Hou) 1e5dfd3cb5 Added more unit tests for member functions in SerialKey 2016-10-14 12:43:58 +01:00
Jerry (Xinyu Hou) dce4b382e6 Fixed passing in the raw serial key 2016-10-14 12:43:33 +01:00
Jerry (Xinyu Hou) 33ebe61ef2 Counted expiring within 1 day as 1 day left 2016-10-14 12:43:01 +01:00
Andrew Nelless 727fc5c220 Move activation notification to SubscriptionManager 2016-10-14 12:16:23 +01:00
Andrew Nelless 540882056f Create a global SubscriptionManager instance 2016-10-14 11:59:25 +01:00
Andrew Nelless 743e96f277 Don't store activation email 2016-10-14 11:35:33 +01:00
Andrew Nelless fd8e778b2a Fix serial key file path in GUI 2016-10-14 11:35:33 +01:00
Jerry (Xinyu Hou) 719e64dc8f Added missing dependencies on Linux and Windows 2016-10-13 18:07:21 +01:00
Jerry (Xinyu Hou) 235f528dd9 Added unit tests for SerialKey 2016-10-13 17:55:38 +01:00
Jerry (Xinyu Hou) 2a452307cd Fleshed out the implementation of SerialKey 2016-10-13 17:55:09 +01:00
Jerry (Xinyu Hou) 92a885524b Added temporary implementation for SerialKey 2016-10-13 14:00:19 +01:00