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 #1599

Merged
merged 226 commits into from
Feb 19, 2019
Merged

merge release to master #1599

merged 226 commits into from
Feb 19, 2019

Conversation

oxarbitrage
Copy link
Member

Notes are here: #1565

oxarbitrage and others added 30 commits August 22, 2018 13:26
@oxarbitrage
refactor get_assets to accept id or name
78a6fa5
@oxarbitrage
change argument name
8a5fae4
@oxarbitrage
keep get_assets with vector of ids for internal use
90bd426
@oxarbitrage
refactor get_limit_orders to accept asset symbol or id
ee0a8ce
@oxarbitrage
apply some changes from @abit review
80a5624
@oxarbitrage
add const to new reference arguments
482f72c
@oxarbitrage
get_call_orders asset symbol or id support
b1d6a97
@oxarbitrage
get_settle_orders asset symbol or id support
82c4fb1
@oxarbitrage
get_collateral_bids asset symbol or id support
fc6cec0
@oxarbitrage
subscribe_to_market and unsubscribe_from_market asset symbol or id su…
ce849a4 
…pport
@oxarbitrage
get_requiered_fees asset symbol or id support
9e0fa4f
@pmconrad
Ported network mapper from old bitshares
6d274b3
@pmconrad
Adapted to lastest fc, ported parallel execution from muse
0e412c5
@jmjatlanta
initial fix for verify_account_authority
7d44c3a
@cogutvalera
Capture Ctrl+C in cli_wallet when not in daemon mode #1193
7dc0de7
@jmjatlanta
improved way to verify account and keys
824ed4f
@jmjatlanta
Removed unneeded method definition
48fa400
@pmconrad
Merge pull request #1232 from cogutvalera/issue_1193
0eebc1e 
Capture Ctrl+C in cli_wallet when not in daemon mode #1193
@jmjatlanta
Added multiple signatures to test
c2b63f5
@jmjatlanta
shorten line length
5db31f5
@jmjatlanta
add test for multisig
7e4e033
@jmjatlanta
improved multisig test
e03d329
@jmjatlanta
fix short line
673ac2b
@jmjatlanta
moved tests, fixed comments
f523ad6
@jmjatlanta
clarify comment
b078310
@oxarbitrage
Merge pull request #1395 from bitshares/release
8d09a46 
Merge release back to develop
@pmconrad
Merge pull request #1384 from bitshares/jmj_1366
2e15e77 
have verify_account_authority check passed-in keys
@oxarbitrage
bump fc and fix node
c293b40
@oxarbitrage
try to fix dockercloud
3fb6c44
@oxarbitrage
remove DGRAPHENE_DISABLE_UNITY_BUILD
3e1de10 
from cmake command in dockerfile as it will not fix the dockercloud issue.
pmconrad and others added 26 commits January 31, 2019 21:09
@pmconrad
Merge pull request #1547 from bitshares/build_simplification
5503152 
Build simplification
@oxarbitrage
refactor get_top_markets
052531b
@jmjatlanta
Moved impl to fee_schedule.hpp
c0ac898
@oxarbitrage
Merge pull request #4 from bitshares/oxarbitrage-issue1051
2efac1f 
Implement API changes
@oxarbitrage
refactor for in-place construction
04f20af
@oxarbitrage
rename name_or_id with symbol_or_id
18ac80a
@oxarbitrage
expose get_asset_id_from_string
d256af6
@oxarbitrage
change asset id or name to asset id or symbol in descriptions of api.hpp
9eab093
@oxarbitrage
change some more docs
a38b558
@pmconrad
Fixed crash on empty/invalid node pubkey
21a4d76
@oxarbitrage
Merge pull request #1272 from oxarbitrage/issue1051
5b4e51a 
refactor get_assets to accept id or name
@jmjatlanta
Merge pull request #1516 from bitshares/jmj_1504
f1e4480 
refactor template instantiation
@oxarbitrage
add network_mapper
82baee3
@oxarbitrage
Merge pull request #1549 from oxarbitrage/issue842_2
c539336 
refactor get_top_markets issue #842
@oxarbitrage
Merge pull request #1555 from pmconrad/network_mapper
cd26cad 
Add network mapper from bitshares-1
@oxarbitrage
change status of network mapper
5cefa46
@jmjatlanta
bump FC for std::min macOS
f66c9a5
@oxarbitrage
Merge pull request #1559 from bitshares/oxarbitrage-patch-4
487bdcc 
add network_mapper to programs README for issue #1558
@jmjatlanta
Merge pull request #1561 from bitshares/jmj_1560
c9b3751 
bump FC for std::min macOS
@oxarbitrage
Merge pull request #1562 from bitshares/develop
d7ca28e 
merge develop to release
@oxarbitrage
add default empty result to get_ticker
2d5eb6c
@oxarbitrage
Merge pull request #1579 from bitshares/oxarbitrage-patch-1
359e199 
add default empty result to get_ticker
@oxarbitrage
update full node specs
05233f0
@oxarbitrage
add note to clarify new full node requirements
8806e6f
@oxarbitrage
update full nodes setup notes
27de122
@oxarbitrage
Merge pull request #1583 from bitshares/oxarbitrage-patch-2
a75531e 
update full node specs
jmjatlanta
jmjatlanta approved these changes Feb 18, 2019
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiled on Ubuntu 18.10 / Boost 1.67 / OpenSSL 1.1.0. chain_test ran with no errors detected.

@oxarbitrage oxarbitrage merged commit 319d7b9 into master Feb 19, 2019
@abitmore abitmore added this to the 201902 - Feature Release milestone Mar 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmjatlanta jmjatlanta jmjatlanta approved these changes

@pmconrad pmconrad pmconrad approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
201902 - Feature Release
Development

Successfully merging this pull request may close these issues.
7 participants
@oxarbitrage @jmjatlanta @pmconrad @cogutvalera @abitmore @HarukaMa @nathanielhourt