Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release to master #617

Merged
merged 72 commits into from
Feb 1, 2018
Merged

Merge release to master #617

merged 72 commits into from
Feb 1, 2018

Conversation

abitmore
Copy link
Member

@abitmore abitmore commented Feb 1, 2018

No description provided.

takaaki7 and others added 30 commits July 24, 2017 01:16
@takaaki7
fix vote_id_type might be uninitialized #25
b4b8dfd
Add get_account_history_by_operations
55e5276
no message
f6e0e7d
@oxarbitrage
move version command code
03bf95a
@abitmore
Fix windows build issue due to PERLLIB #532
a2c3756
update document for get_account_history_by_operations
63da266
@oxarbitrage
Merge pull request #536 from oxarbitrage/issue535
7a88cdb 
move version command code
@abitmore
Merge pull request #538 from bitshares/532-win-build-perllib
3e0ef5b 
Fix windows build issue due to PERLLIB #532
Update parameter name and document for get_account_history_by_operations
46e115b
Update get_account_history_by_operations, return limit operation history
84ddcce
update while condition
9b47aa5
Fix an error for get_account_history_by_operations
e4fb550
add a counter to stop infinite loop
a42779c
update get_account_history_by_operations
a5222aa 
delete log
remove the counter ilog
7caec24
remove counter, use start for loop condition
b136e81
@oxarbitrage
Merge pull request #430 from zhuliting/develop
f9af1b5 
add wallet api get_account_history_by_operations for exchanges
@pmconrad
Added unit test to reproducee the OP in issue #338
72032c6
@pmconrad
Added log message for bad order matching in margin calls
3ce2a38
@oxarbitrage
Merge pull request #547 from pmconrad/issue_338_test
f4e8207 
Unit test for issue #338
@oxarbitrage
Merge pull request #546 from pmconrad/issue_453_log
10a15ca 
Log message for issue #453
@oxarbitrage
change proposal index from non unique to unique composite key in by_e…
f170f52 
…xpiration
@oxarbitrage
Merge pull request #551 from oxarbitrage/change-proposal-index
bb275db 
change proposal index from non unique to unique composite key
update assert log for transfer
de76b16
@oxarbitrage
Merge pull request #557 from zhuliting/develop
a6d24bc 
update assert log for transfer
@oxarbitrage
Update Readme
23c10e8 
replace #548
@pmconrad
Log when #531b413 happens
f64c7e3
@pmconrad
Remove obsolete pre-hf protection from #531b413
1bee14a
@pmconrad
Revert "Prevent bid_collateral from executing through proposal before…
ccbca02 
… hardfork"

This reverts commit a605c5f.
@xeroc
[docker] also build other binaries, not just witness_node
a0c7d1c
abitmore and others added 25 commits January 14, 2018 21:38
@abitmore
get_required_authorities: active -= owner. #197
066eb48
@abitmore
Tests for #200 get sigs for partially signed trx
87cb344
@abitmore
get_required_sigs: don't return signed keys. #200
97fe720
@abitmore
Test case for #584: parent owner key can not auth
ba18ff4
@abitmore
More tests for #584: parent owner key can not auth
08cbaf3
fix db_notify.cpp not included in GRAPHENE_DISABLE_UNITY_BUILD set
d53279b
@abitmore
Change assert() to FC_ASSERT in db_block.cpp, #511
68996fb
@oxarbitrage
bump fc to last version
744a2d7
@abitmore
Merge pull request #593 from oxarbitrage/fc-9_2
4076fe7 
bump fc to last version
@oxarbitrage
Merge pull request #574 from pmconrad/cleanup_353
10bb3a3 
Cleanup for issue 353
@oxarbitrage
Merge pull request #591 from abitmore/511-assert-db-block
02a4499 
Partially fix #511 assert() issue
@abitmore
Change doubles in market API to string. #144
c55ee9b
@abitmore
Change CLI to adapt market API change. #144
d0297ee
@abitmore
Remove buy and sell (with doubles) from CLI. #544
4621473
@abitmore
Merge pull request #578 from abitmore/577-vote-id-exception
7c45b52 
Capture exceptions when initializing `vote_id_type` with a string
@oxarbitrage
Merge pull request #589 from ihla/fix_disable_unity_build
197ceca 
fix db_notify.cpp not included in disable unity build db set
@abitmore
Merge pull request #595 from abitmore/544-remove-buy-sell-cmd
496ab0f 
Remove buy and sell (with doubles) from CLI. #544
@abitmore
Replace pays.asset_id with current_asset. #563
ad8b503
@abitmore
Refactor to_string functions, add unit tests. #144
25000ab
@abitmore
Merge pull request #571 from abitmore/563-settle-fill-price
d4ae6ec 
Add fill_price for settlement order matching, #563
@abitmore
Merge pull request #570 from abitmore/567-required-sigs
6c86cc8 
`get_required_signatures` API returns owner keys, don't return active if also requires owner, don't return signed keys.
@oxarbitrage
Merge pull request #594 from abitmore/144-fix-api-uses-doubles
774054e 
Fix market API uses doubles
@oxarbitrage
bump database
6c81fdc
@oxarbitrage
Merge pull request #602 from bitshares/oxarbitrage-patch-1
1dc5939 
bump database
@oxarbitrage
Merge pull request #603 from bitshares/develop
c570a73 
update release
@pmconrad pmconrad self-requested a review February 1, 2018 17:05
@oxarbitrage oxarbitrage self-requested a review February 1, 2018 17:25
@oxarbitrage oxarbitrage merged commit 1d0b859 into master Feb 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pmconrad pmconrad pmconrad approved these changes

@oxarbitrage oxarbitrage oxarbitrage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@abitmore @pmconrad @oxarbitrage @takaaki7 @xeroc