Commit graph

2197 commits

Author SHA1 Message Date
theoreticalbts
3c4764ce5a Merge branch '457-cleanup-remove-full-web-node' into develop 2016-01-07 11:32:57 -05:00
theoreticalbts
0ccc6722eb Merge branch '483-history-fix-op-numbers' into develop 2016-01-07 11:31:02 -05:00
theoreticalbts
3680b67271 Merge branch '481-history-failed-proposal-ops' into develop 2016-01-07 11:30:50 -05:00
theoreticalbts
84fab61589 Merge branch '480-fork-mia-core-exchange' into develop 2016-01-07 11:30:04 -05:00
Daniel Larimer
dd5b7708b4 potential fix for hung chain 2016-01-07 11:27:50 -05:00
root
33728e3e6a Update bitcube's seed node address 2016-01-05 16:18:17 +08:00
theoreticalbts
3af94b7878 application.cpp: Handle exception in open() by re-indexing #492 2016-01-04 10:38:59 -05:00
Daniel Larimer
7c1c7e8504 removing log 2016-01-03 22:50:07 -05:00
Daniel Larimer
16b59e0b42 adding seed node 2016-01-03 22:10:56 -05:00
Daniel Larimer
dca5c95ab5 potential fix for hung chain 2016-01-03 20:40:21 -05:00
Fabian Schuh
1c99b71a52 [LICENSE] Change to MIT 2015-12-18 16:21:12 +01:00
Fabian Schuh
51c10580fa [LICENSE] Change to MIT 2015-12-18 16:17:40 +01:00
theoreticalbts
dcc0b556ba config.hpp: Bump DB version 2015-12-16 17:55:01 -05:00
theoreticalbts
e4787e431a Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16b 2015-12-16 17:15:00 -05:00
theoreticalbts
d60c8a255e Fix optional dereferences 2015-12-16 17:14:41 -05:00
theoreticalbts
802ca9e613 config.hpp: Bump DB version 2015-12-16 11:52:03 -05:00
theoreticalbts
eaba77b2d6 Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16 2015-12-16 11:46:38 -05:00
theoreticalbts
7cae3501f8 Fix operation history numbering #483 2015-12-16 11:43:45 -05:00
theoreticalbts
0f67fb655b config.hpp: Bump DB version 2015-12-15 14:43:38 -05:00
theoreticalbts
e2c7a946cb Merge branch 'graphene-local/481-history-failed-proposal-ops' into bitshares 2015-12-15 14:42:33 -05:00
theoreticalbts
4d5515702c Merge branch 'graphene/480-fork-mia-core-exchange' into bitshares 2015-12-15 14:42:02 -05:00
theoreticalbts
f42bbcd087 Fix non-BTS MIA core_exchange_rate check #480 2015-12-15 14:20:00 -05:00
theoreticalbts
7e0e58f441 Discard from _applied_ops when proposal fails #481 2015-12-15 14:14:57 -05:00
Fabian Schuh
a2ce86bf4f Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account' 2015-12-10 13:01:53 +01:00
theoreticalbts
844df7a7d4 Merge branch 'graphene/undo-patch' into bitshares 2015-12-09 18:21:57 -05:00
theoreticalbts
e6f8ef1679 Merge commit '5fa123b6d7b64638fd1e93c9530479ed04d56950' into bitshares
This commit merges the Graphene database version bump commit into BitShares (and overrides it with the BitShares version's bump).

Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
2015-12-09 18:19:43 -05:00
theoreticalbts
c2943ee3bb undo_database.cpp: Handle unimplemented upd+del case 2015-12-09 18:16:50 -05:00
theoreticalbts
44db4760a1 undo_database.cpp: Refactor undo_database::merge() code
This commit does not change semantics at all, it just changes the layout of the code and adds comments.
2015-12-09 18:16:50 -05:00
theoreticalbts
f699240e0a config.hpp: Bump db version 2015-12-07 17:53:03 -05:00
theoreticalbts
5fa123b6d7 config.hpp: Bump db version 2015-12-07 17:52:49 -05:00
theoreticalbts
020dc2e789 Merge branch 'graphene/develop' into prerel-2015-12-07 2015-12-07 17:45:45 -05:00
theoreticalbts
2b9876fd98 hardfork.hpp: Set hardfork timestamps 2015-12-07 15:36:52 -05:00
theoreticalbts
7107735e3f Bump fc to enable WEBSOCKETPP_STRICT_MASKING #365 2015-12-07 15:17:23 -05:00
theoreticalbts
725ffd021e Merge branch '455-fork-annual-self-referrer' into develop 2015-12-07 15:15:41 -05:00
theoreticalbts
0735a8722e Merge branch '453-fork-referral-percent' into develop 2015-12-07 15:15:26 -05:00
theoreticalbts
d853aecd3f Merge branch '445-fork-order-create-fee-refund' into develop 2015-12-07 15:14:03 -05:00
theoreticalbts
ac267393fc Merge branch '436-fork-feed-protect' into develop 2015-12-07 15:12:17 -05:00
theoreticalbts
67aa3a4eb1 Merge branches '424-wallet-cancel-order', '437-test-fix-future-genesis', '439-util-js-op-wrapper' and '449-wallet-percent-mult' into develop 2015-12-07 15:11:58 -05:00
theoreticalbts
59d0ddf0f1 operation_tests.cpp: Use BOOST_CHECK instead of BOOST_REQUIRE in margin_call_limit_test 2015-12-07 15:00:52 -05:00
theoreticalbts
15c455dc63 Make margin_call_limit_test pass after hardfork #436 2015-12-07 15:00:46 -05:00
theoreticalbts
b80587e5b5 Prevent margin call from being triggered unless feed < call #436 2015-12-07 14:59:07 -05:00
theoreticalbts
6feadd77a5 Fix GRAPHENE_TESTING_GENESIS_TIMESTAMP behavior of asset_claim_fees_test #413 #437 2015-12-07 14:38:05 -05:00
theoreticalbts
5b99cd4faa Allow zero_second_vbo test to run at any timestamp #437 2015-12-07 14:36:21 -05:00
emfrias
ec876f3def update blocktrades seed node DNS address 2015-12-04 15:24:46 -05:00
theoreticalbts
32f12b9215 Refund order creation fee when order is cancelled #445 2015-12-03 15:48:52 -05:00
theoreticalbts
7a5c5c476d wallet.cpp: Implement propose_builder_transaction2 #467 2015-12-02 16:17:46 -05:00
Daniel Larimer
0b4675354a Merge pull request #462 from wackou/api-339
Api calls for #339: needed api calls (mostly network) for supporting bts_tools
2015-11-25 09:57:38 -05:00
Nicolas Wack
86029542ae Add "about" api call to wallet. Fix #339 2015-11-25 15:26:26 +01:00
theoreticalbts
39220456ce Remove light_client 2015-11-23 10:04:54 -05:00
theoreticalbts
751d68789a Remove full_web_node #457 2015-11-23 10:04:26 -05:00