Commit Graph

2547 Commits

Author SHA1 Message Date
Xinyu Hou 94664e413b Rename update zeroconf mutex 2015-07-31 13:58:47 -07:00
Jerry (Xinyu Hou) 8a8f3601c4 Deleted accidentally committed file 2015-07-31 13:58:33 -07:00
Xinyu Hou fc600efdfe Restarted process from GUI in desktop mode #4901 2015-07-31 13:58:18 -07:00
Jerry (Xinyu Hou) 86d5567e74 Removed redundant logging #4721 2015-07-31 13:57:18 -07:00
Jerry (Xinyu Hou) 5d61996405 Fixed code style #4712 2015-07-31 13:56:58 -07:00
Xinyu Hou 1659f9f018 Added keep alive massge before each data transfer #4712 2015-07-31 13:56:33 -07:00
Jerry (Xinyu Hou) de49b46edd Expected hasClients at least 3 times #4721 2015-07-31 13:56:19 -07:00
Jerry (Xinyu Hou) 9d44affc89 Fixed Ipc unit test intermittently fail #4721 2015-07-31 13:56:10 -07:00
Jerry (Xinyu Hou) 1369f46cee Show connected message box only when main GUI is visible #4850 2015-07-31 13:55:52 -07:00
Jerry (Xinyu Hou) 7259e71439 Reset thread back to null on finish #4712 2015-07-31 13:55:35 -07:00
Jerry (Xinyu Hou) bfc3ac340f Fixed possible loss of data warning #4677 2015-07-31 13:55:23 -07:00
Jerry (Xinyu Hou) a5c865913f Added expect call time for hasClients #4721 2015-07-31 13:55:09 -07:00
Jerry (Xinyu Hou) c3d38db053 Made buffer thread wait for notify when no gui #4721 2015-07-31 13:55:00 -07:00
Jerry (Xinyu Hou) 18a6f75371 Fixed dialog too big #4852 2015-07-31 13:54:26 -07:00
Jerry (Xinyu Hou) 516c692c94 Removed unused function #4745 2015-07-31 13:54:09 -07:00
Jerry (Xinyu Hou) 5ec9ccc76e Revert "Made buffer thread wait until there is a GUI client #4721"
This reverts commit 9a4327e44236c0ac30809660dc87a97e984dc84f.
2015-07-31 13:52:56 -07:00
Jerry (Xinyu Hou) 01526bbe78 Revert "Removed unrelated checking #4721"
This reverts commit 2de276cfca71a79df31a1d4a89d412212279a1a5.
2015-07-31 13:52:47 -07:00
Xinyu Hou 5a9cbc97e3 Fixed code style
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
2015-07-31 13:51:48 -07:00
Xinyu Hou 88214a0d3c Removed unrelated checking #4721 2015-07-31 13:49:42 -07:00
Xinyu Hou afdcb9cefe Made buffer thread wait until there is a GUI client #4721
Conflicts:
	src/lib/ipc/IpcLogOutputter.cpp
2015-07-31 13:49:17 -07:00
Jerry (Xinyu Hou) cc3dc315f9 Allowed reconnect after SSL fatal error #4857 2015-07-31 13:46:35 -07:00
Jerry (Xinyu Hou) a44e9832c5 Refactored code order to make it more readable 2015-07-31 13:46:23 -07:00
Jerry (Xinyu Hou) 9800bec857 Made clipboard log more consistent #4712 2015-07-31 13:46:11 -07:00
Jerry (Xinyu Hou) c2b96cfbb7 Updated comment #4750 2015-07-31 13:45:46 -07:00
Jerry (Xinyu Hou) d51eb7b8b5 Fixed code style 2015-07-31 13:42:51 -07:00
Jerry (Xinyu Hou) f8bb948776 Removed unused variable #4750 2015-07-31 13:42:41 -07:00
Jerry (Xinyu Hou) 0ddf544efb Used static variable than define #4750
Conflicts:
	src/lib/plugin/ns/SecureSocket.cpp
2015-07-31 13:25:03 -07:00
Jerry (Xinyu Hou) 44966ee17f Removed redundant log #4858 2015-07-31 13:22:50 -07:00
Jerry (Xinyu Hou) 4fe46e117e Shorten data transfer log #4858 2015-07-31 13:20:50 -07:00
Jerry (Xinyu Hou) 485547d6ea Reverted Notify back to note #4855 2015-07-31 13:20:35 -07:00
Jerry (Xinyu Hou) 81649376fa Revert "Added symbolic link creation to linux and macos #4696"
This reverts commit ad9cfd64af.

Conflicts:
	src/gui/src/PluginManager.cpp
2015-07-31 13:20:16 -07:00
Jerry (Xinyu Hou) a8cf9173c8 Revert "Changed note to notify #4745"
This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
2015-07-31 13:19:17 -07:00
Jerry (Xinyu Hou) 69a6038cf9 Revert "Moved note into either warning or info #4745"
This reverts commit d3a4ce1f11.
2015-07-31 13:18:57 -07:00
Jerry (Xinyu Hou) d8582d1093 Revert "Removed warning and error logging level in GUI #4745"
This reverts commit 756000d8a9.

Conflicts:
	src/gui/res/SettingsDialogBase.ui
	src/gui/src/AppConfig.cpp
	src/gui/src/MainWindow.cpp
2015-07-31 13:18:36 -07:00
Jerry (Xinyu Hou) c89dc68cd7 Revert "Added warning for enable encryption #4584"
This reverts commit 8e15b77db3.
2015-07-31 13:17:36 -07:00
Jerry (Xinyu Hou) 9483fecc42 Fixed code style
Revert "Moved note into either warning or info #4745"

This reverts
commit d3a4ce1f11.

Revert "Changed note to notify #4745"

This reverts commit
5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp

Shortened transmission log #4858

Revert "Added code to throw an error if the plugin can't be deleted or
written to #4696"

This reverts commit
5696497bc0.
2015-07-31 13:17:12 -07:00
Jerry (Xinyu Hou) 41c03b8f37 Changed installer filename to use branch, stage and revision #4898 2015-07-24 15:21:57 -07:00
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