Commit Graph

69 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) 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) 260a7337d3 Added timestamp in log #4845 2015-07-06 15:50:21 -07:00
Jerry (Xinyu Hou) 3aebb87b37 Fixed using old log level convention #4745 2015-06-25 11:25:58 -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) 0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou) 5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Xinyu Hou 49ac320f97 Refactored clipboard event into ClipboardEvent #4601 2015-05-20 19:09:54 +01:00
Jerry (Xinyu Hou) 2c74a7f5c1 Added stringToSizeType and its unittest #4601 2015-05-19 14:23:43 -07:00
Jerry (Xinyu Hou) 00ceda55dc Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-19 11:37:45 -07:00
Jerry (Xinyu Hou) eaff6f50f8 Added sending clipboard chunks handling #4601 2015-05-19 10:54:02 -07:00
Nick Bolton 46527ded56 Limited Windows service log file size to 1MB #4677
Oversized file is renamed to .1 to keep old log files in case needed,
but the old file will eventually be overwritten on 2nd recycle
2015-05-19 14:04:02 +01:00
Jerry (Xinyu Hou) 70be9cd97f Refactored intToString #4601 2015-05-18 11:27:54 -07:00
Nigel Armstrong d71304ee55 Modified header of every file COPYING to LICENSE
Modified to match the updated name of the license file
2015-05-06 22:12:44 -04:00
Xinyu Hou e6e3eae0a9 Disabled reconnect after fingerprint failed #4527 2015-04-20 14:43:39 +01:00
XinyuHou 28eb85660f Fixed error from merge 2015-04-14 17:51:41 +01:00
Xinyu Hou 39e183da3e Refactored string operations
Conflicts:
	src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
Xinyu Hou 141b778477 refactored SecureSocket to use interface #4313 2015-01-14 17:25:53 +00:00
XinyuHou 1d7eb3f5cb updated pluging loader for Windows #4313 2015-01-09 13:46:35 +00:00
Xinyu Hou 1aaa55163c Fixed "c" prefix compile error on Windows 2014-11-11 14:50:09 +00:00
Nick Bolton 41d6080028 changed company name in copyright notice 2014-11-11 13:52:03 +00:00
Nick Bolton e8e156f0e2 dropped "c" prefix from class names 2014-11-11 13:51:47 +00:00
Xinyu Hou 6756296d85 Made daemon take full responsibility for logging #4128 2014-10-27 14:11:43 +00:00
Xinyu Hou d2814a423c Parse arg refactoring #4124
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
jerry 507abdcbfb issue #4072 Carbon loop not ready within 5 sec
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry 9feaa959f1 issue #4072 - Carboon loop not ready within 5 sec
issue solved
2014-06-02 11:04:09 +00:00
jerry 5773ed1ceb made XBase non abstract 2014-04-23 14:15:41 +00:00
jerry 93ebd6a9cc fixed: const type was used in queue 2014-04-17 16:49:19 +00:00
jerry 8482504b65 fixed: assigned const to non const type 2014-04-17 11:26:21 +00:00
jerry 45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton 26d0f59e65 fixed: exception getWhat usage returns garbage. 2014-03-31 13:56:41 +00:00
Nick Bolton 0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton 44a98c6c9d fixed: XArchEval "what" returns garbage (memory deleted). 2014-03-20 10:32:40 +00:00
Nick Bolton 28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +00:00
Nick Bolton d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton abe108195d Task #3953 - Inherit XArch and XBase from std::exception 2014-03-14 18:30:21 +00:00
jerry 77eae25279 fixed code style in Log.cpp 2014-03-14 16:04:21 +00:00
jerry 54b14c439d removed unused variables 2014-03-14 16:03:15 +00:00
Nick Bolton 4675f29a4c code style fixes:
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
2014-02-28 12:36:45 +00:00
Nick Bolton 8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton 75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
jerry ce1b62db14 Feature to drag a file from Windows to Mac:
- On Mac client main thread is used for cocoa application in order to simulate drag.
- Send dragging file dir from Windows server to Mac client while dragging after switching screen.
- Dragging information sending is immature now (need to support multi files dragging in the future).
- Used Cocoa function to monitor dragg pasteboard.
- Changed Mac client to use another thread for event queue instead of the main thread.
- Change fileRecieveComplete to fileRecieveCompleted.
2013-08-30 14:38:43 +00:00
jerry dab838ed14 - renamed synrgyhk.dll to synwinhk.dll and moved lib code to separate folder.
- removed game device support (fallen into significant disrepair).
2013-08-02 13:21:06 +00:00
Nick Bolton 394ece004a Patch by Jerry:
- Fixed line endings
- Integ test for file transfer
- Fixed crashed problem when log info is larger than 2048 bytes
- Fixed compile error caused by std exception (by Feng ye)
- Fixed include path on Mac and linux (by Feng ye)
2013-07-24 16:41:12 +00:00
Nick Bolton c368013f13 Patch by Jerry for issue 46:
- Unit test for sending file data from server to client.
- Removed singleton pattern from CSocketMultiplexer for easier unit testing.
- Incremented protocol version from 1.4 to 1.5 (new file chunk message).
- Storing pointer to CConfig instead of copying in CServer (so we can mock it).
- Created a common event queue for testing (timeout, quit event, etc).
- Fixed code style.
2013-07-16 19:02:30 +00:00
Nick Bolton 6919b68947 patch by Feng Ye - initialize m_typesForCClient 2013-07-01 12:25:04 +00:00
Nick Bolton 18a3db6843 patch by jerry: fixed new event queue on Mac and Linu 2013-06-29 22:02:04 +00:00
Nick Bolton 608074c041 - made unit testing easier by (mostly) removing the event queue singleton.
- fixed code style in many places (mostly indentation).
2013-06-29 14:17:49 +00:00