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
theoreticalbts
a58f69a162
Merge remote-tracking branch 'graphene/457-cleanup-remove-full-web-node' into bitshares
2016-02-16 10:55:27 -05:00
valzav
e4082b580e
bump gui version
2016-02-08 17:11:36 -05:00
valzav
ee8e5873f8
gui_version
2016-02-03 18:47:43 -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
valzav
dfb45fb42d
add gui version file
2016-01-27 17:54:55 -05:00
valzav
5c132da795
2.0.160120 gui release tag
2016-01-21 10:22:36 -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
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
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
