smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2317 commits 2 branches 0 tags 101 MiB
Commit graph

954 commits

Author SHA1 Message Date
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)
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)
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
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 (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
Adam Potolsky
d7043ef84b Added plugin version output to unix builds #4793 2015-06-25 09:35:56 -07:00
Adam Potolsky
55a38ff8cc removed unnecessary flag settings, fixed wrong call. #4750 2015-06-24 17:57:22 -07:00
Adam Potolsky
f10f0f13c4 retry case needs to do another job with the same parameters not just a new job #4750 2015-06-24 16:31:47 -07:00
Adam Potolsky
2df88e07c4 fixed retry logic for secure connect and accept #4750 2015-06-24 12:20:25 -07:00
Adam Potolsky
e50b239592 Changed secure connest and accept to match read/write retry logic #4750 2015-06-24 11:11:20 -07:00
Adam Potolsky
6442bcb8f6 Change PluginWizardPage to take and use MainWindow instead of appConfig #4823 2015-06-23 17:11:39 -07:00
Adam Potolsky
19f5ad8cab Add delay routine to MainWindow to allow sleep in a Qt friendly way #4823 2015-06-23 17:10:49 -07:00
kahiroka
267f3ac41f workaround for Fast cursor on any client with Mac server #451 2015-06-19 17:20:26 -07:00
Adam Potolsky
121080be74 removed non-existant file from gui.pro to remove warning #4810 2015-06-18 14:45:41 -07:00
Adam Potolsky
d51e2e4fb1 Merge branch 'v1.7.4-stable' of https://github.com/synergy/synergy into v1.7.4-stable 2015-06-18 14:19:06 -07:00
Adam Potolsky
3eef49d5c9 Removed mutex locking from get and set of log level #4809 2015-06-18 14:18:05 -07:00
Jerry (Xinyu Hou)
f3472c84e2 Show notification only on Debug level or above #4745 2015-06-18 13:50:38 -07:00
Jerry (Xinyu Hou)
14046db32a Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-15 09:59:38 -07:00
Jerry (Xinyu Hou)
667b6f13c7 Enforced secure socket rewrite on the same buffer address #4712 2015-06-12 18:03:28 -07:00
Jerry (Xinyu Hou)
3e32d9fbee Improved secure socket intensive try operations #4796 2015-06-12 16:53:41 -07:00
Adam Potolsky
9893a018b1 Merge pull request #4634 from sparrowt/sparrowt-issue3774-fix-missing-dlls 
Fix missing DLLs after install #3774
 2015-06-12 16:14:15 -07:00
Adam Potolsky
768445816b Merge branch 'adam-sandbox' 2015-06-12 16:03:34 -07:00
Adam Potolsky
efab42962f Merge branch 'master' of https://github.com/synergy/synergy 2015-06-12 16:03:25 -07:00
Adam Potolsky
afb0e2a2ea Added log level protection, changed log levels for some logging #4793 2015-06-12 15:07:53 -07:00
Adam Potolsky
16a2815504 Added additional SSL logging abotu connection information as well as client and server cipher availability #4793 2015-06-12 14:40:15 -07:00
Adam Potolsky
4b0dec69bf Added additional SSL logging abotu connection information as well as client and server cipher availability #4793 2015-06-12 14:33:28 -07:00
Jerry (Xinyu Hou)
72060e59b4 Fixed send clipboard thread time issue #4749 2015-06-12 11:21:05 -07:00
Jerry (Xinyu Hou)
1e89aa37c5 Merge pull request #4382 from meowfaceman/master 
Make drag and drop optional #4327
 2015-06-12 19:12:57 +01:00
Adam Potolsky
5696497bc0 Added code to throw an error if the plugin can't be deleted or written to #4696 2015-06-11 17:40:26 -07:00
Adam Potolsky
6bb44fbc59 Merge pull request #4228 from galkinvv/fix2866 
High client CPU usage and laggy mouse
 2015-06-11 16:12:40 -07:00
Adam Potolsky
3942dc6ee8 Added stub code for linux/mac builds to match the functional ARCH code for discovering libraris in use #4793 2015-06-11 10:00:45 -07:00
Adam Potolsky
fa0dfa0ded Added ability to query lib locations to windows builds 2015-06-10 13:18:39 -07:00
Adam Potolsky
8366bb6247 Added OpenSSL version and location logging 2015-06-10 10:20:59 -07:00
Nick Bolton
f94e1e1660 Disabled intermittently failing unit test #4651 2015-06-10 07:04:58 -07:00
Jerry (Xinyu Hou)
099c984d7d Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-09 16:05:43 -07:00
Jerry (Xinyu Hou)
f36d257495 Updated the comments 2015-06-09 15:48:08 -07:00
Jerry (Xinyu Hou)
81acb96540 Tried to fix random unittest fail (part2) 2015-06-09 15:33:57 -07:00
Adam Potolsky
0c211e2852 Adding logging output when ssl connects for aid in debugging and support 2015-06-09 14:07:42 -07:00
Jerry (Xinyu Hou)
deb3db93e6 Tried to fix random unittest fail 2015-06-09 13:59:04 -07:00
Jerry (Xinyu Hou)
8e15b77db3 Added warning for enable encryption #4584 2015-06-08 15:39:33 -07:00
Jerry (Xinyu Hou)
756000d8a9 Removed warning and error logging level in GUI #4745 2015-06-08 14:44:31 -07:00
Jerry (Xinyu Hou)
a21e4cd73b Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-08 13:53:01 -07:00
Adam Potolsky
ed37eeca51 Merge branch '4696' 2015-06-08 13:24:47 -07:00
Adam Potolsky
155a8b70c4 Added version string to plugin and added to plugin loaded message 2015-06-05 17:07:47 -07:00
Adam Potolsky
2db2ffac84 Adding Windows Plugins Directory to install #4696 2015-06-05 16:55:36 -07:00
Jerry (Xinyu Hou)
5c71efebe6 Fixed integtests #4584 2015-06-05 15:23:44 -07:00
Jerry (Xinyu Hou)
756c3b4463 Inserted keep alive msg among data transfer #4584 2015-06-05 15:21:32 -07:00
Jerry (Xinyu Hou)
bbf53bb9b8 Return the same job on retry #4584 2015-06-05 15:21:26 -07:00
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
7795d68c21 Removed magic number #4712 2015-06-04 14:46:47 -07:00
Jerry (Xinyu Hou)
eb3f8aee2a Notified file transmission interrupted #4745 2015-06-04 14:43:49 -07:00
Adam Potolsky
88e5c6197d Trivial whitespace fix cause by by editor settings 2015-06-04 14:06:17 -07:00
Jerry (Xinyu Hou)
646e1b52eb Interrupted file transfer when cursor move back #4584 2015-06-04 13:09:48 -07:00
Jerry (Xinyu Hou)
e0903983ad Validated file expected size #4584 2015-06-04 10:19:36 -07:00
Jerry (Xinyu Hou)
8c64cbf54e Refactored send drag info on server #4584 2015-06-04 10:04:08 -07:00
Adam Potolsky
78f8fb45ba Fixed Installed Directory in ARCH for MacOS #4696 2015-06-04 09:58:22 -07:00
Jerry (Xinyu Hou)
ee22e688d5 Removed clipboard ignore notification #4745 2015-06-03 17:32:09 -07:00
Jerry (Xinyu Hou)
d9684d44d2 Added fake drag file list #4584 2015-06-03 16:17:26 -07:00
Jerry (Xinyu Hou)
4508e10186 Fixed IpcLogOutputterTest #4721 2015-06-03 15:23:33 -07:00
Jerry (Xinyu Hou)
7614a21aac Cleared buffer on send instead of write #4721 2015-06-03 14:45:47 -07:00
Jerry (Xinyu Hou)
c4e8dc7198 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-02 15:30:33 -07:00
Adam Potolsky
ad9cfd64af Added symbolic link creation to linux and macos #4696 2015-06-02 14:29:01 -07:00
Adam Potolsky
0061969cf2 Updating installed dir for Linux and MacOS #4696 2015-06-02 14:28:20 -07:00
Jerry (Xinyu Hou)
22e8d3d03a Fixed clipboard transmission messing up start/stop $4745 2015-06-02 13:42:27 -07:00
Jerry (Xinyu Hou)
8d0fdee5ce Added full stop for notification #4745 2015-06-02 11:18:21 -07:00
Jerry (Xinyu Hou)
f42b756b0e Added clipboard transmission failed notification #4745 2015-06-02 11:17:04 -07:00
Jerry (Xinyu Hou)
f22d9ac477 Added clipboard transmission start notification #4745 2015-06-02 11:14:28 -07:00
Jerry (Xinyu Hou)
d9921c894c Added clipboard transmission notification #4745 2015-06-02 09:48:26 -07:00
Jerry (Xinyu Hou)
ce2c797f69 Made code more readable #4745 2015-06-01 16:58:21 -07:00
Jerry (Xinyu Hou)
3d55516fdf Removed unused code #4745 2015-06-01 16:56:52 -07:00
Adam Potolsky
e784b48711 Added use of Installed Dir for finding plugin install directory #4696 
Fixed issues with file path creation #4696
 2015-06-01 16:50:05 -07:00
Adam Potolsky
c1158ea7f9 Removed speaker and system hard coded locations from code #4696 
Removed previously commended out code that is unnecessary #4696
 2015-06-01 16:48:12 -07:00
Adam Potolsky
4a7fdabd65 Added Installed Dir to PluginManager #4696 2015-06-01 16:46:33 -07:00
Adam Potolsky
5d770d4204 Added getInstallDir to Core Interface #4696 2015-06-01 16:43:57 -07:00
Adam Potolsky
98bb9b3fb3 Added getInstalledDir to ToolApp. #4696 2015-06-01 16:43:27 -07:00
Jerry (Xinyu Hou)
4533063768 Fixed compile error on Unix #4745 2015-06-01 16:04:13 -07:00
Jerry (Xinyu Hou)
bfe616eebe Added file transmission started notification for server #4745 2015-06-01 16:00:35 -07:00
Jerry (Xinyu Hou)
d1ca021002 Monitoring log to show notification and made icon change while transfering $4745 2015-06-01 15:59:59 -07:00
Xinyu Hou
5cbcd74028 Fixed using NOTE level logging on Mac #4745 2015-06-01 23:42:58 +01:00
Jerry (Xinyu Hou)
e7f358afb2 Added file transmission started, failed and complete notification #4745 2015-06-01 15:33:06 -07:00
Jerry (Xinyu Hou)
5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou)
d3a4ce1f11 Moved note into either warning or info #4745 2015-06-01 14:31:32 -07:00
Jerry (Xinyu Hou)
ecf0485e8f Removed commented out code #4745 2015-06-01 12:39:30 -07:00