Drop of all the mastercoin-tools changes made for omni#3
Closed
curtislacy wants to merge 45 commits intomastercoin-MSC:masterfrom
curtislacy:master
Closed
Drop of all the mastercoin-tools changes made for omni#3curtislacy wants to merge 45 commits intomastercoin-MSC:masterfrom curtislacy:master
curtislacy wants to merge 45 commits intomastercoin-MSC:masterfrom
curtislacy:master
Conversation
… mastercoin-tools repository.
Bring us up to date with Grazcon's repo.
Changes the output of msc_validate to rename the sell offer files
Add support for some new command line arguments to some of the python tools.
Offers endpoint
Removed /www.
Removed apps directory
Brought back the bootstrap transactions.
…into Graz-Fix Conflicts: www/redirect.js
invalidate multisig inputs
update consensus checker with masterchest and mymastercoins sites fix consensus checker to really cross compare all listed sites add transactionVersion parsing add sell offer sub action parsing skip balance retrieval of unknown addresses update transaction version according to spec v0.4 https://github.com/mastercoin-MSC/spec/#transaction-definitions Conflicts: apps/accept.py apps/send.py www/acceptform.js www/redirect.js www/sellform.js www/selloffer.html www/sendform.js
Merge grazcoin 2 18 2014
updates tools so non-deprecated functions are removed
Conflicts: msc_validate.py www/Address.html www/selloffer.html www/selloffer.js
Better success checking, and logging. Allows multiple submission of tx
Merge graz 2 27 2014
…into Merge-Graz-3-11-2014 Conflicts: apps/accept.py apps/msc_apps.py apps/pushtx.py apps/sell.py apps/send.py apps/validateaddr.py www/404.html www/API.html www/About.html www/Address.html www/License.html www/acceptform.html www/btcpayment.html www/exodus.html www/index.html www/masterPage.js www/professional.html www/sellaccept.html www/sellform.html www/selloffer.html www/sendform.html www/simplesend.html www/wallet.html
…into Merge-16 Conflicts: www/index.html
…into Merge-Graz-3-14
Merge graz 3 14
…s arguments is not a string.
made some debug output in validation not kill everything if one of its a...
Merge in two post-dex-launch fixes from grazcoin's repo
…into Merge-Graz-3-20 Conflicts: www/btcpayment.html www/exodus.html www/sellaccept.html www/selloffer.html www/simplesend.html
… of git, since that can't handle signed commits.
Remove the bit of code that tries to parse the revision timestamp out of...
…into Merge-Graz-3-21 Conflicts: apps/sell.py www/404.html www/API.html www/About.html www/Address.html www/License.html www/acceptform.html www/btcpayment.html www/exodus.html www/index.html www/javascript_required.html www/professional.html www/sellaccept.html www/sellform.html www/selloffer.html www/sendform.html www/simplesend.html www/wallet.html
graz's bugfix: correct expiration of multiple accept offers that expire on a si...
Author
|
I summarized the changes here the I understand Grazcoin to have accepted in grazcoin#20 - I'll deploy an Omniwallet build in a branch based on that PR in my fork, to begin the process of combining and centralizing the repos. Closing this for now, since it will be supplanted by new PRs from me and grazcoin. |
Author
|
Created that branch for testing, it's in https://github.com/curtislacy/mastercoin-tools/pull/33 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Let's see how much it'll take to get all the repos normalized.