Comparing compumatrix:alpha...ElementsProject:alpha · compumatrix/elements · GitHub
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: compumatrix/elements
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: alpha
Choose a base ref
...
head repository: ElementsProject/elements
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: alpha
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 5 files changed
  • 7 contributors

Commits on May 28, 2016

  1. Consolidate settings in constants.py to eliminate redundancies in sid… 

    …echain-manipulation.py

045b310 Import settings from constants.py into sidechain-manipulation.py

b698a88 Restore original value of secondScriptPubKey to sidechain-manipulation.py

7474a1c Update alpha-README.md - edit RPC info in constants.py instead of sidechain-manipulation.py
    @TomMcCabe @gwillen
    TomMcCabe authored and gwillen committed May 28, 2016
    Configuration menu
    Copy the full SHA
    76fdb95 View commit details
    Browse the repository at this point in the history

  2. Create fedpeg-README.md 

    Add detailed build instructions for constructing new fedpeg/sidechain

Update fedpeg-README.md

Add basic instructions for withdrawing from sidechain.

revise/improve fedpeg-readme

Fix typo/syntax error
    @TomMcCabe @gwillen
    TomMcCabe authored and gwillen committed May 28, 2016
    Configuration menu
    Copy the full SHA
    f1b7c36 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. Allow sidechain-manipulation to use RPC_USER and RPC_PASS from enviro… 

    …nment
    @chrisinajar
    chrisinajar committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    c24df53 View commit details
    Browse the repository at this point in the history

  2. Merge pull request ElementsProject#99 from chrisinajar/env-auth 

    Allow sidechain-manipulation to use RPC_USER and RPC_PASS from environment
    @martindale
    martindale authored Jun 16, 2016
    Configuration menu
    Copy the full SHA
    2a2842e View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. remove now-unnecessary fetch-merge that was merged in PR#86

    @TomMcCabe
    TomMcCabe committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    6807bfd View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2016

  1. Merge pull request ElementsProject#101 from TomMcCabe/update_fedpeg_r… 

    …eadme

remove now-unnecessary fetch-merge that was merged in PR#86
    @gwillen
    gwillen authored Sep 9, 2016
    Configuration menu
    Copy the full SHA
    491ef45 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. typographical enhancement

    S. Matthew English authored Oct 19, 2016
    Configuration menu
    Copy the full SHA
    1eed415 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2017

  1. Merge pull request ElementsProject#106 from s-matthew-english/patch-1 

    typographical enhancement
    @instagibbs
    instagibbs authored Apr 11, 2017
    Configuration menu
    Copy the full SHA
    8f83534 View commit details
    Browse the repository at this point in the history
Loading