Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
1304 commits 435 branches 47 tags 121 MiB
Commit graph

1304 commits

This branch
This branch
All branches
Author SHA1 Message Date
SynaptiCAD User
2d4f18280f [DLN] implement list_betting_market_groups(event_id) 2017-03-19 22:12:31 -04:00
SynaptiCAD User
20a64be400 [DLN] implement list_event_groups(sport_id) 2017-03-19 20:40:17 -04:00
Eric Frias
db6b312784 Stub out the bet object and the operation for placing it (currently breaks 
json_serializer builds, until I port over some code into fc)
 2017-03-16 19:37:26 -04:00
Eric Frias
5aedb65e5c Implement the apparently-unused feature allowing later operations in a transaction to 
reference objects created by earlier operations.  Change all betting operations
to allow use of this feature, and test it in operation_tests2
 2017-03-16 18:38:35 -04:00
SynaptiCAD User
43f91d83fc [DLN] implement list_sports() API call 2017-03-15 19:06:39 -04:00
Eric Frias
2470af6eb9 Initial work on creating blockchain objects for sports betting 2017-03-15 17:04:27 -04:00
Eric Frias
27b0b2febb Update fc submodule 2016-08-16 14:20:52 -04:00
Eric Frias
bb5ea158a1 Update submodule 2016-04-11 15:15:54 -04:00
Eric Frias
0ff7b32aea Update fc submodule 2016-04-11 15:10:13 -04:00
Eric Frias
295984e884 Update fc submodule 2016-04-06 10:23:42 -04:00
Eric Frias
a7f84df957 Allow disabling building test executables 2016-02-26 13:38:11 -05:00
Eric Frias
81b1a49fbf Update fc 2016-02-26 11:43:17 -05:00
Eric Frias
14295772f0 Merge branch 'bitshares-2-bitshares' 
# Conflicts:
#	libraries/fc
 2016-02-26 11:29:25 -05:00
theoreticalbts
4096d34f88 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 8dd7dbc5b8 2016-02-23 13:40:26 -05:00
theoreticalbts
8dd7dbc5b8 Merge branch '592-get_ticker' into develop 2016-02-23 13:39:54 -05:00
theoreticalbts
52c0b31bcf Merge remote-tracking branch 'graphene/develop' into bitshares at commit e3478d2338 2016-02-23 12:10:40 -05:00
theoreticalbts
e3478d2338 Default initialize output in extension<T>'s from_variant and stream extraction #594 2016-02-23 12:00:40 -05:00
Daniel Larimer
0159297fa8 fix linking errors on OS X 2016-02-23 10:52:44 -05:00
theoreticalbts
76de1f8f0b Merge branch '593-bugfix-ext-json-serializer' into develop at commit 53699a9d27 2016-02-23 10:51:11 -05:00
Eric Frias
567a40170e Fix gcc/clang builds broken by d3c6cbf4de (breaking circular dependency) 2016-02-22 19:34:16 -05:00
Michael Vandeberg
a675023b9f #592 Fixes ticker except for percent change of market 2016-02-22 14:02:20 -05:00
theoreticalbts
53699a9d27 ext.hpp: Accept null and empty array for extensions #593 2016-02-22 12:00:51 -05:00
Daniel Larimer
2a5c6a3b40 fix linking errors on OS X 2016-02-19 15:12:53 -05:00
Eric Frias
d3c6cbf4de Compile fixes for win32 and out-of-source builds 2016-02-17 09:17:00 -05:00
theoreticalbts
e34b83c872 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 2f941c718f 2016-02-16 12:19:59 -05:00
theoreticalbts
f62e7311c2 Fix compile, add hardfork definition for #385 2016-02-16 12:08:36 -05:00
Daniel Larimer
2f941c718f Fix #586 - decoding memo for sender in CLI wallet 2016-02-16 12:07:24 -05:00
theoreticalbts
fac1284f77 Prepare for release 
- Bump FC
- Bump GRAPHENE_CURRENT_DB_VERSION to force re-index
- Set hardfork date
- Set GRAPHENE_FBA_STEALTH_DESIGNATED_ASSET
 2016-02-16 11:57:45 -05:00
theoreticalbts
4f9bf7cc21 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba 
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
 2016-02-16 11:32:14 -05:00
theoreticalbts
a1d0339ccf Merge remote-tracking branch 'graphene/549-fork-cancel-order' into bitshares 2016-02-16 11:29:32 -05:00
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
theoreticalbts
1153d77dba Update documentation of updating active key to match implementation #556 2016-02-15 22:48:47 -05:00
theoreticalbts
d280a57af0 js_operation_serializer: Add missing include #561, broken by #563 2016-02-15 21:30:00 -05:00
theoreticalbts
32f07de4e2 Fix unit test failure due to skip_flags changes caused by #492 fix 2016-02-15 21:02:20 -05:00
theoreticalbts
4a6de2fba7 Merge branches '492-bugfix-close-logic', '550-cleanup-remove-evaluation-observer' and '581-cleanup-object-operators' into develop 2016-02-15 16:01:27 -05:00
Daniel Larimer
c63b624caf fix build errors and warnings 
This commit was rebased by theoreticalbts and assigned issue #581
Conflict with 146c0c4d8e was resolved, minor improvements.
 2016-02-15 16:01:13 -05:00
theoreticalbts
fe0920ddc8 Merge branches '538-fork-buyback', '562-util-check-reflection' and '575-bugfix-settle-reflect' into develop 
Fix reflection bugs and enhance check_reflect.py
 2016-02-15 15:37:50 -05:00
theoreticalbts
92685af364 Merge branch '563-fork-stealth-fee-routing' into develop 
Includes dependency '572-fork-reenable-asset-perms'
 2016-02-15 15:37:22 -05:00
theoreticalbts
36a8c3d6f1 Unit test for STEALTH fee routing #563 2016-02-15 15:33:21 -05:00
theoreticalbts
5dd56bd824 Implement FBA fee routing for STEALTH #563 2016-02-15 15:33:21 -05:00
Daniel Larimer
89fbb11bb6 Fix #492 - database corruption when closing 
The database was attempting to pop blocks for which there was no undo
history. These changes make it impossible to pop blocks if there isn't
a fork db history.
 2016-02-15 15:18:44 -05:00
abitmore
3fa79740df Reflect ID of force_settlement_object, fix #575 2016-02-15 15:13:25 -05:00
theoreticalbts
1f910e765d Merge branch '572-fork-reenable-asset-perms' into 563-fork-stealth-fee-routing 2016-02-14 20:45:46 -05:00
theoreticalbts
4e9e3ae054 Allow asset to update permission flags when no supply exists #572 2016-02-14 20:39:33 -05:00
theoreticalbts
b1f8c8f291 buyback_object.hpp: Don't FC_REFLECT buyback_object, FC_REFLECT_DERIVED it instead #538 #575 2016-02-14 17:26:35 -05:00