theoreticalbts
|
42140fccaa
|
Merge branch graphene/develop into bitshares at commit 'f1b19b15'
|
2016-02-16 11:04:31 -05:00 |
|
theoreticalbts
|
50c06e7e64
|
Merge branch graphene/develop into bitshares at commit '1b8ce8a'
Conflicts:
libraries/chain/include/graphene/chain/hardfork.hpp
|
2016-02-16 11:02:11 -05:00 |
|
Daniel Larimer
|
062ae3fc67
|
validate fixes
|
2016-02-02 16:39:05 -05:00 |
|
Daniel Larimer
|
c1c37df31a
|
HARDFORK - auto canceled orders still pay fee
|
2016-01-28 20:11:46 -05:00 |
|
Daniel Larimer
|
405f81eaf8
|
HARDFORK: fix for hung cancel order
|
2016-01-28 20:02:37 -05:00 |
|
Daniel Larimer
|
d9db27d416
|
extra debug info
|
2016-01-28 19:46:40 -05:00 |
|
theoreticalbts
|
f1b19b1562
|
Merge branch '496-cleanup-license-header' into develop
|
2016-01-07 13:38:52 -05:00 |
|
Fabian Schuh
|
5111084730
|
[License] Modify cpp and hpp headers to MIT #496
|
2016-01-07 11:44:52 -05:00 |
|
theoreticalbts
|
1b8ce8a537
|
Merge branch '498-cleanup-move-options-validate' into develop
|
2016-01-07 11:42:41 -05:00 |
|
theoreticalbts
|
c56cbfe2a7
|
account.cpp: Move account_options::validate() implementation from account_object.cpp #498
|
2016-01-07 11:42:16 -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 |
|
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 |
|
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 |
|
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
|
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
|
b80587e5b5
|
Prevent margin call from being triggered unless feed < call #436
|
2015-12-07 14:59:07 -05:00 |
|
theoreticalbts
|
32f12b9215
|
Refund order creation fee when order is cancelled #445
|
2015-12-03 15:48:52 -05:00 |
|
theoreticalbts
|
498ebf486f
|
account_evaluator.cpp: Set annual referrer to self when upgrading to annual member #455
|
2015-11-20 10:51:59 -05:00 |
|
theoreticalbts
|
084e38753b
|
Hardfork to retroactively correct referral percentages #453
|
2015-11-19 16:35:33 -05:00 |
|
theoreticalbts
|
a96fd62d03
|
fee_schedule.cpp: Use relaxation to set fee #435
|
2015-11-05 15:59:32 -05:00 |
|
theoreticalbts
|
2d6dfd04e4
|
config.hpp: Bump db version to force replay
|
2015-11-02 10:11:42 -05:00 |
|
theoreticalbts
|
e1ba96b524
|
[BTS2] asset_evaluator.cpp: Don't check asset names registered before implementation of hardfork #385
|
2015-11-02 10:09:24 -05:00 |
|
theoreticalbts
|
545fbfe63c
|
Merge branch 'newmaster' into newbitshares
Conflicts:
libraries/chain/asset_evaluator.cpp
libraries/chain/include/graphene/chain/hardfork.hpp
libraries/chain/market_evaluator.cpp
|
2015-11-02 10:06:13 -05:00 |
|
theoreticalbts
|
65003ba06c
|
Merge branch 'fork-413' into develop
Conflicts:
libraries/chain/include/graphene/chain/hardfork.hpp
|
2015-10-31 17:13:15 -04:00 |
|
theoreticalbts
|
3dc58e435f
|
Merge branches 'fork-409' and 'fork-419' into develop
|
2015-10-31 17:12:16 -04:00 |
|
theoreticalbts
|
4fa7443922
|
Merge branches 'history-324', 'bugfix-390', 'wallet-398', 'opt-410', 'script-411', 'bugfix-412', 'bugfix-414', 'bugfix-423' and 'feature-427' into develop
|
2015-10-31 17:11:41 -04:00 |
|
theoreticalbts
|
55fef1b161
|
db_update.cpp: Don't clear expired feeds for non-market-issued assets #410
|
2015-10-31 16:14:25 -04:00 |
|
theoreticalbts
|
a126520fa3
|
HARDFORK Allow creation of sub-assets #409
|
2015-10-31 15:46:53 -04:00 |
|
theoreticalbts
|
dfe228fc85
|
global_property_object.hpp: Reflect last_budget_time #414
|
2015-10-31 14:37:56 -04:00 |
|