Commit Graph

2287 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou)
57f6022382 Revert "Added additional SSL logging abotu connection information as well as client and server cipher availability #4793"
This reverts commit 16a2815504.
2015-07-09 16:34:53 -07:00
Jerry (Xinyu Hou)
fe010b35ab Revert "Added log level protection, changed log levels for some logging #4793"
This reverts commit afb0e2a2ea.
2015-07-09 16:32:07 -07:00
Jerry (Xinyu Hou)
19fb63314f Revert "Added plugin version output to unix builds #4793"
This reverts commit d7043ef84b.
2015-07-09 16:31:54 -07:00
Jerry (Xinyu Hou)
cecb623849 Revert "Fixed misplaces statis string in windows code #4793"
This reverts commit 4569de5413.
2015-07-09 16:31:42 -07:00
Jerry (Xinyu Hou)
8bc76ed6f2 Revert "Removed mutex locking from get and set of log level #4809"
This reverts commit 3eef49d5c9.
2015-07-09 16:24:34 -07:00
Jerry (Xinyu Hou)
c739b53bae Used static variable than define #4750 2015-07-09 15:02:55 -07:00
Jerry (Xinyu Hou)
5998b5c2de Removed redundant log #4858 2015-07-09 14:29:23 -07:00
Jerry (Xinyu Hou)
b348eb0b81 Shorten data transfer log #4858 2015-07-09 14:10:52 -07:00
Jerry (Xinyu Hou)
cbc75ff20d Reverted Notify back to note #4855 2015-07-09 13:52:36 -07:00
Jerry (Xinyu Hou)
11361f0f08 Revert "Added symbolic link creation to linux and macos #4696"
This reverts commit ad9cfd64af.

Conflicts:
	src/gui/src/PluginManager.cpp
2015-07-09 13:46:17 -07:00
Jerry (Xinyu Hou)
46e23d63fe Revert "Changed note to notify #4745"
This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
2015-07-09 13:34:49 -07:00
Jerry (Xinyu Hou)
5430838388 Revert "Moved note into either warning or info #4745"
This reverts commit d3a4ce1f11.
2015-07-09 13:28:47 -07:00
Jerry (Xinyu Hou)
f9b596aa6d 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-09 13:26:31 -07:00
Jerry (Xinyu Hou)
fcdcaeff3a Revert "Added warning for enable encryption #4584"
This reverts commit 8e15b77db3.
2015-07-08 17:04:44 -07:00
Jerry (Xinyu Hou)
2ba7ddd8eb 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-08 15:46:13 -07:00
Jerry (Xinyu Hou)
c057cfaeda Revert "Replaces plugin download with install and copy functionality #4696"
This reverts commit 8d70075171.

Conflicts:
	src/gui/gui.pro
	src/gui/src/FileSysClient.cpp
	src/gui/src/PluginWizardPage.cpp
2015-07-08 15:02:47 -07:00
Jerry (Xinyu Hou)
5cd87e92a4 Revert "Fixed name for Mac and Linux Build #4696"
This reverts commit e35fd80cef.
2015-07-08 15:00:22 -07:00
Jerry (Xinyu Hou)
4cdc5619f9 Revert "Removed unnecessary method and static data #4696"
This reverts commit 4bf1eeb065.
2015-07-08 15:00:15 -07:00
Jerry (Xinyu Hou)
c74993ae21 Revert "Added getInstalledDir to ToolApp. #4696"
This reverts commit 98bb9b3fb3.
2015-07-08 15:00:07 -07:00
Jerry (Xinyu Hou)
61382c6eb1 Revert "Added getInstallDir to Core Interface #4696"
This reverts commit 5d770d4204.
2015-07-08 14:59:58 -07:00
Jerry (Xinyu Hou)
cad8d399b9 Revert "Added Installed Dir to PluginManager #4696"
This reverts commit 4a7fdabd65.
2015-07-08 14:59:43 -07:00
Jerry (Xinyu Hou)
0d35e51cc7 Revert "Removed speaker and system hard coded locations from code #4696"
This reverts commit c1158ea7f9.
2015-07-08 14:59:34 -07:00
Jerry (Xinyu Hou)
c1990cb107 Revert "Added use of Installed Dir for finding plugin install directory #4696"
This reverts commit e784b48711.

Conflicts:
	src/gui/src/FileSysClient.cpp
2015-07-08 14:59:14 -07:00
Jerry (Xinyu Hou)
bf2c06b985 Revert "Adding plugin to install for deb builds. #4696"
This reverts commit 2d5ad45e08.
2015-07-08 14:57:34 -07:00
Jerry (Xinyu Hou)
9fb9a65847 Revert "changed synergy-plugins directory to synergy with the sub directory plugins #4696"
This reverts commit ee2ed0a31c.
2015-07-08 14:57:24 -07:00
Jerry (Xinyu Hou)
7dffec8f96 Revert "Updating installed dir for Linux and MacOS #4696"
This reverts commit 0061969cf2.
2015-07-08 14:57:02 -07:00
Jerry (Xinyu Hou)
02e161d8c3 Revert "Added symbolic link creation to linux and macos #4696"
This reverts commit ad9cfd64af.
2015-07-08 14:56:46 -07:00
Jerry (Xinyu Hou)
cdaa9eed74 Revert "Fixed Installed Directory in ARCH for MacOS #4696"
This reverts commit 78f8fb45ba.
2015-07-08 14:56:21 -07:00
Jerry (Xinyu Hou)
1cb2f70818 Revert "Adding install of plugins for rpm based systems #4696"
This reverts commit f230ae734e.
2015-07-08 14:55:57 -07:00
Jerry (Xinyu Hou)
444204cea7 Revert "Adding Windows Plugins Directory to install #4696"
This reverts commit 2db2ffac84.
2015-07-08 14:55:48 -07:00
Jerry (Xinyu Hou)
aab0da3292 Revert "Added copying of MacOS plugins to Synergy bundle #4696"
This reverts commit c8740a4971.
2015-07-08 14:55:25 -07:00
Jerry (Xinyu Hou)
a3250d98d9 Revert "Added code to throw an error if the plugin can't be deleted or written to #4696"
This reverts commit 5696497bc0.
2015-07-08 14:53:12 -07:00
Nick Bolton
432a7541b4 Update ChangeLog 2015-07-07 16:39:41 -07:00
Nick Bolton
6e39e50964 Update ChangeLog 2015-07-07 16:38:10 -07:00
Jerry (Xinyu Hou)
88f27e65fe Limited retry on timeout instead of maximum retry #4750 2015-07-07 14:24:43 -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