Commit graph

1193 commits

Author SHA1 Message Date
theoreticalbts
99ca49a7ec Merge branch graphene/develop into bitshares at commit '3646754fe59149ae688f82243b4fe41486c96ba3' 2016-02-16 11:28:47 -05:00
theoreticalbts
d6863a587c Merge branch graphene/develop into bitshares at commit '447018b319668deddf4d55baac168c1afc0a5e21'
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/fc
2016-02-16 11:16:36 -05:00
theoreticalbts
ce8a6ec518 Merge branch graphene/develop into bitshares at commit '399e0ed9f970908ea7c2c5c43a64a28303c143b8' 2016-02-16 11:05:33 -05:00
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
3646754fe5 HARDFORK - auto canceled orders still pay fee 2016-02-02 11:04:35 -05:00
Daniel Larimer
45e717c181 HARDFORK: fix for hung cancel order 2016-02-02 11:04:22 -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
theoreticalbts
447018b319 Tell cmake hardfork.hpp is generated, build hardfork.hpp in binary directory #511 2016-01-22 11:37:28 -05:00
theoreticalbts
d8cd48d6ad Implement by_asset_balance index #529 2016-01-21 11:13:42 -05:00
theoreticalbts
aa6d13b057 Remove by_account index from account_object #529 2016-01-21 10:39:13 -05:00
theoreticalbts
600a06f57e db_balance.cpp: Rename by_balance -> by_account_asset #529 2016-01-21 10:23:07 -05:00
valzav
5c132da795 2.0.160120 gui release tag 2016-01-21 10:22:36 -05:00
theoreticalbts
3edaf15652 Generate hardfork.hpp from hardfork.d directory #511 2016-01-11 10:09:03 -05:00
theoreticalbts
b5480db341 api.cpp: Add break to every case in get_relevant_accounts #513 2016-01-08 14:35:07 -05:00
theoreticalbts
d6878852f0 confidential_object.hpp: Move confidential objects into own header #466 2016-01-08 13:06:14 -05:00
theoreticalbts
e9eb050c1e worker_object.hpp: Move worker objects into own header #466 2016-01-08 11:42:35 -05:00
theoreticalbts
07fb90a7ec market_object.hpp: Move market objects into own header #466 2016-01-08 11:36:32 -05:00
theoreticalbts
61687790e3 wallet: Remove libraries/wallet/cache.cpp #510 2016-01-08 11:29:39 -05:00
theoreticalbts
2da6840405 Optionally disable database unity build #509 2016-01-08 11:29:39 -05:00
theoreticalbts
8c8157e706 Bump fc 2016-01-08 11:22:14 -05:00
Michael Vandeberg
fd09669be3 Merge branch '500-crypto-api' into develop
Closes cryptonomex/graphene#500
2016-01-07 17:24:13 -05:00
Michael Vandeberg
8df58439b1 Opens up cryptographic methods in their own API with serialized wrappers for public and private keys.
Tests for serialization of the wrappers added in serialization_tests.
2016-01-07 17:17:27 -05:00
theoreticalbts
a548217e5c db_update.cpp: Log a lot of information if clear_expired_orders() is iterating too much, maybe useful to diagnose #485 2016-01-07 16:23:50 -05:00
theoreticalbts
c1612a434e db_block.cpp: Disable skip_validate #505 2016-01-07 16:04:52 -05:00
theoreticalbts
399e0ed9f9 db_update.cpp: Take mia as reference, not copy, in clear_expired_orders(), maybe fix #485 2016-01-07 16:04:16 -05:00
theoreticalbts
3c7a4525d7 Merge branch '503-api-new-market-api' into develop 2016-01-07 14:23:24 -05:00
Michael Vandeberg
f7bfcea355 Implement new market API #503 2016-01-07 14:12:03 -05:00
theoreticalbts
f1b19b1562 Merge branch '496-cleanup-license-header' into develop 2016-01-07 13:38:52 -05:00
Michael Vandeberg
acfbad2cd4 Adds a cryptography API. 2016-01-07 12:57:29 -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