Commit graph

765 commits

Author SHA1 Message Date
Daniel Larimer
0c3a7c4bc4 Fix Issue #324 - getKeyRefs now returns for memo and active keys 2015-10-27 13:54:15 -04:00
Daniel Larimer
3273d1f7b6 fetching up to 200 items 2015-10-26 09:52:40 -04:00
Daniel Larimer
a4d4ab0108 Merge branch 'master' into bitshares 2015-10-26 09:45:35 -04:00
Daniel Larimer
2adbe53714 Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-26 09:45:13 -04:00
Daniel Larimer
867e87196b update fill order history 2015-10-26 09:44:49 -04:00
Daniel Larimer
05f05c18ba Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares 2015-10-23 18:14:40 -04:00
Daniel Larimer
6336a2bc1a fix conflicts 2015-10-23 18:14:35 -04:00
Daniel Larimer
7378fb80bc adding API call for market fill history 2015-10-23 18:13:33 -04:00
theoreticalbts
7aa33928f8 Merge branch 'master' into bitshares 2015-10-23 17:39:25 -04:00
theoreticalbts
4fa0f182ec cli_wallet: Print operation results 2015-10-23 15:00:31 -04:00
theoreticalbts
0d55541682 object_id.hpp: Implement std::string() conversion for object_id_type 2015-10-23 15:00:31 -04:00
theoreticalbts
57969d5018 cli_wallet: Show txid's for transactions in blocks 2015-10-23 15:00:31 -04:00
Daniel Larimer
0ef59f6165 fix build 2015-10-23 13:34:08 -04:00
Daniel Larimer
32d6b22b7b Merge branch 'master' into bitshares
Added a hardfork that is scheduled to happen years in the future after
this change has been reviewed and approved.
2015-10-23 13:30:42 -04:00
Daniel Larimer
6e554260e5 Issue #393 - HARDFORK to give cash back upon canceling an order 2015-10-23 13:26:18 -04:00
Daniel Larimer
a1640abf81 Merge branch 'master' into bitshares 2015-10-22 10:51:00 -04:00
Daniel Larimer
44b2198f97 normalize blinded_balance reflection 2015-10-22 10:50:51 -04:00
Daniel Larimer
eb105f1065 Merge branch 'master' into bitshares 2015-10-22 10:28:19 -04:00
Daniel Larimer
9b0abe2790 adding api to get recent transactions by id 2015-10-22 10:27:49 -04:00
Daniel Larimer
9afe3420d8 Merge branch 'master' into bitshares 2015-10-22 10:08:16 -04:00
Daniel Larimer
1ff46f0b29 adding api to get trx id from trx 2015-10-22 10:08:07 -04:00
Daniel Larimer
63c286a769 adding transfer2 API that also returns the transaction id 2015-10-22 10:05:34 -04:00
Daniel Larimer
6418f819fd Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-22 09:59:03 -04:00
Daniel Larimer
ddd58e946a Fix #385 - HARDFORK to expand valid names 2015-10-21 09:29:13 -04:00
Daniel Larimer
3bc8832dde Merge branch 'master' into bitshares 2015-10-21 08:54:53 -04:00
Daniel Larimer
4e443bded5 Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares 2015-10-20 13:41:16 -04:00
Daniel Larimer
1c9d5c602c update signature of transfer_to_blind 2015-10-20 13:41:14 -04:00
theoreticalbts
8488731e37 Merge branch 'master' into bitshares 2015-10-20 13:27:57 -04:00
theoreticalbts
4c09d6b8ed cli_wallet: Implement worker creation and voting 2015-10-20 13:26:25 -04:00
theoreticalbts
5cd73f5683 account_object.cpp: Get rid of no-ops 2015-10-20 12:36:47 -04:00
theoreticalbts
0e41933003 asset_evaluator.cpp: Implement TODO, move feed validation checks from evaluate() to validate() 2015-10-20 12:36:47 -04:00
theoreticalbts
704f943181 address.cpp: Don't special-case BTS prefix 2015-10-20 12:36:47 -04:00
Daniel Larimer
6b469528a1 remove all hardfork checks leftover from testnet 2015-10-20 12:36:47 -04:00
Daniel Larimer
29aec3c28c remove print spam 2015-10-19 16:48:30 -04:00
Daniel Larimer
af589b2287 cleanly handle db upgrade 2015-10-19 16:48:14 -04:00
Daniel Larimer
fc48ecbfc1 HARDFORK - Enforce asset domains 2015-10-19 16:46:26 -04:00
Daniel Larimer
487046e375 Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-19 16:46:05 -04:00
theoreticalbts
66c18c6932 Merge master into bitshares 2015-10-15 13:59:37 -04:00
theoreticalbts
9870b5db0a reflect_util.hpp: Fix reflection, make propose_fee_change work as intended 2015-10-15 13:52:50 -04:00
Daniel Larimer
546755484a Fix bug where updated DB version causes crash on restart 2015-10-15 13:52:29 -04:00
Daniel Larimer
6b1b794ff4 prevent excessive saving of wallet backups 2015-10-15 13:52:28 -04:00
Daniel Larimer
ab0d789d72 Fix bug where updated DB version causes crash on restart 2015-10-15 12:07:44 -04:00
Daniel Larimer
c528ea1ff3 update DB VERSION to force replay 2015-10-15 11:40:48 -04:00
Daniel Larimer
aa9ca16cb3 HARDFORK - Change initial permissions for assets created in genesis 2015-10-15 11:08:01 -04:00
Daniel Larimer
e85949584b Merge branch 'master' into bitshares 2015-10-15 10:27:04 -04:00
Daniel Larimer
e5010aaa5a improve error messages 2015-10-15 10:26:53 -04:00
Daniel Larimer
d083c5c9de Merge branch 'master' into bitshares
Accepted changes from master
2015-10-14 16:22:53 -04:00
Daniel Larimer
f85dec1c23 increasing the maximum undo history 2015-10-14 16:20:29 -04:00
Daniel Larimer
ae4790bcb8 Merge branch 'master' of https://github.com/bitshares/bitshares-2 2015-10-14 16:19:21 -04:00
Daniel Larimer
15e4464300 Merge branch 'master' into bitshares 2015-10-14 14:50:38 -04:00