Commit Graph

70 Commits

Author SHA1 Message Date
JoelKatz
37fe9a6098 Merge branch 'master' into develop
Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
	modules/ripple_websocket/ripple_websocket.cpp
	src/cpp/ripple/NetworkOPs.cpp
	src/cpp/ripple/ripple_Application.cpp
	src/cpp/ripple/ripple_Peer.cpp
2013-07-07 15:28:18 -07:00
Vinnie Falco
6c561fdf96 Update some beast container code 2013-07-03 09:41:44 -07:00
JoelKatz
a912c3012a Try to track down the bug that's causing isEquivalent to return false on a reconstructed transaction. 2013-07-01 11:30:21 -07:00
Vinnie Falco
b52bbccd8a Streamline Log with print() and out() 2013-07-01 09:32:09 -07:00
Vinnie Falco
c35c52ff08 Fix platform and debug macros 2013-07-01 09:32:08 -07:00
Vinnie Falco
b0c1b5834a Refactor TxFormats and fix leak on exit 2013-07-01 09:32:03 -07:00
JoelKatz
b954181372 Typo 2013-07-01 08:45:48 -07:00
JoelKatz
1241260744 Typo 2013-07-01 08:45:28 -07:00
JoelKatz
6514fa0f8e Fix a case that doesn't canonicalize to zero. 2013-07-01 08:43:01 -07:00
JoelKatz
45479728c9 Fix a case that doesn't canonicalize to zero. 2013-07-01 08:42:30 -07:00
Vinnie Falco
122f1c54e2 Uniform include of BeastConfig.h 2013-06-28 17:01:03 -07:00
JoelKatz
ca4a2ad104 Remove the JSONCache. It was basically a failed experiment. 2013-06-28 16:07:32 -07:00
JoelKatz
27c761aa9c Add tecOWNERS. 2013-06-28 13:58:55 -07:00
Vinnie Falco
832f67b35c Roll back 7 commits 2013-06-28 11:48:43 -07:00
Vinnie Falco
443551abe6 Uniform include of BeastConfig.h 2013-06-28 07:02:49 -07:00
Vinnie Falco
6f03efa882 Consolidate includes into group headers 2013-06-27 13:57:30 -07:00
Vinnie Falco
638656a597 Put modules in ripple namespace 2013-06-27 13:41:20 -07:00
Vinnie Falco
905b920e99 Split unit tests to separate files 2013-06-27 10:37:01 -07:00
Vinnie Falco
1dffaf5d57 Use manual method for naming CountedObject classes 2013-06-26 01:10:54 -07:00
Vinnie Falco
fe15cfbf31 Use provided names for CountedObject instead of typeid() 2013-06-26 00:19:41 -07:00
Vinnie Falco
ffdfb59564 Fix some warnings 2013-06-24 18:26:57 -07:00
Vinnie Falco
0a358ded7a Tidy up ripple modules for namespace support 2013-06-23 11:12:39 -07:00
Vinnie Falco
0907065412 Tidy up LevelDB support into ripple_leveldb 2013-06-23 11:09:54 -07:00
Vinnie Falco
d26fa0446f Strip includes from ripple_data and ripple_basics 2013-06-20 15:21:35 -07:00
Vinnie Falco
2abec05b5b Replace InstanceCounter with CountedObject 2013-06-19 16:23:03 -07:00
JoelKatz
421388d4a7 Finish SetFlag/ClearFlag 2013-06-18 09:56:34 -07:00
JoelKatz
8e2c65d4e0 Start moving to SetFlag/ClearFlag 2013-06-17 18:53:42 -07:00
JoelKatz
36a84484e0 Implement clearing the regular key, setting and clearing the no master
flag and enforcing the no master flag.
2013-06-17 18:53:42 -07:00
JoelKatz
1886283244 Define flags for disabling the master key. 2013-06-17 18:53:42 -07:00
JoelKatz
c91cdbeff1 Merge branch 'feature-optional-cancel-pr' of https://github.com/ahbritto/NewCoin into develop 2013-06-17 11:37:53 -07:00
Vinnie Falco
326ff5a205 Tidy up LedgerEntrySet 2013-06-16 16:57:51 -07:00
Arthur Britto
475ce2b899 Implement optional offer cancel on offer_create. 2013-06-15 22:10:15 -07:00
JoelKatz
7347ad1693 This code is now ready for prime time. 2013-06-15 20:06:39 -07:00
Vinnie Falco
00a7cbf610 Update copyright notice and 80 column separators 2013-06-15 18:20:59 -07:00
Vinnie Falco
8a6ce5de68 Rename Wallet to LocalCredentials 2013-06-15 18:20:59 -07:00
Vinnie Falco
8aab3645cb Tidy up TxFormat and create TxFormats, TxFlags 2013-06-15 18:20:58 -07:00
Vinnie Falco
521e812fc4 Reformatting using AStyle 2013-06-14 08:45:13 -07:00
JoelKatz
111951cc52 Add lsfSell flag to indicate an offer was placed as a sell. 2013-06-13 15:23:38 -07:00
Vinnie Falco
c31e2396f2 Split TransactionAcquire and DisputedTx 2013-06-12 18:21:57 -07:00
Vinnie Falco
12d1117623 Clean up JSONCache 2013-06-12 16:14:34 -07:00
JoelKatz
b5c73c9b04 Merge branch 'rangeset' into develop 2013-06-11 21:13:16 -07:00
JoelKatz
514b4b494f Replace the boost range set code with our own 2013-06-11 21:12:19 -07:00
Vinnie Falco
a70ede6cae Remove unused functions and clean up some comments 2013-06-11 13:21:37 -07:00
Vinnie Falco
e3d844de8f Add IApplication interface and hide the implementation 2013-06-11 09:45:12 -07:00
Vinnie Falco
124c28b0eb Enable SEH exception handling in the VS2012 project 2013-06-11 09:45:12 -07:00
Vinnie Falco
cf3593b01b Tidy up and annotate 2013-06-09 19:25:24 -07:00
Vinnie Falco
0b7e0b132a Clean up STObject::set() for clarity 2013-06-09 14:34:47 -07:00
Vinnie Falco
3273625f61 Split up InfoSub and tidy up various files 2013-06-09 11:26:18 -07:00
Vinnie Falco
b51edb58fc Replace std::vector<unsigned char> with Blob 2013-06-07 15:24:39 -07:00
Vinnie Falco
a6fdabc68a Reformat annotations in preparation for automated extraction 2013-06-07 14:46:09 -07:00