Skip to content

Merge in BigNumber fixes, intcomma from SpankChain #1

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

Open
wolever wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Merge in BigNumber fixes, intcomma from SpankChain #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64a96cf
Copy SpankChain client at rev: bfc927ac27ae13078b134ddb86cc7539b9248422
wolever Mar 6, 2019
38652ba
Merge branch 'sc-client-sc' into sc-client-fork
wolever Mar 7, 2019
134090a
Add 'copy-sc-client' script
wolever Mar 7, 2019
d3e079e
Merge branch 'sc-connext' (early part) into sc-spank
wolever Mar 7, 2019
bd9483e
Copy from SpankChain client
wolever Mar 7, 2019
b49b3b2
Null merge of branch 'sc-spank' into sc-connext
wolever Mar 7, 2019
c4e9193
Null merge branch 'sc-connext' into sc-spank
wolever Mar 7, 2019
193e6fb
Merge branch 'master' into sc-connext
wolever Mar 7, 2019
e78c565
Merge in BigNumber fixes, intcomma
wolever Mar 7, 2019
2e61120
BigNumber fixes, include comma in currency format
wolever Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/client/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ test/apiRoutes.txt
test/tests.txt
.env
*.sw[opq]
tags
tags
.yalc/
yalc.lock
.env
1 change: 1 addition & 0 deletions modules/client/.sc-from-rev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
310119eb1ee22764b39a0512a44b9b64fbac4022
16 changes: 16 additions & 0 deletions modules/client/.sc-from-rev-pretty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
commit 310119eb1ee22764b39a0512a44b9b64fbac4022
Merge: 7090322c0 6c984b977
Author: David Wolever <david@wolever.net>
Date: Wed Mar 6 19:39:00 2019 -0500

Merge pull request #1385 from SpankChain/bignumber-to-string

Error if BigNumber.toString is used

On branch develop
Your branch is up to date with 'origin/develop'.

You are currently bisecting, started from branch 'develop'.
(use "git bisect reset" to get back to the original branch)

nothing to commit, working tree clean
Loading