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

2018-03-01 MERGE: ZCL-master #3

Merged
merged 34 commits into from
Mar 6, 2018
Merged

2018-03-01 MERGE: ZCL-master #3

merged 34 commits into from
Mar 6, 2018

Commits on Feb 4, 2018

  1. add stopatheight argument

    jc committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    2f3f98b View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. add shutdown hook

    jc committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    f5db492 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #150 from jc23424/stopatheight 

    add stopatheight argument
    @BlueSilver22
    BlueSilver22 authored Feb 11, 2018
    Configuration menu
    Copy the full SHA
    1fb0fca View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Add working dns seeds

    Jon Layton committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    0881e1a View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Merge pull request #153 from ch4ot1c/bugfix/dnsseeds 

    Add working DNS seeds
    @matthewjamesr
    matthewjamesr authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    5e95ef6 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Added seed.zcl.chains.run to dns seeds

    Jon Layton committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    9a10611 View commit details
    Browse the repository at this point in the history

  2. Added six additional default full-nodes 

    Added two additional full-nodes per geographic region (NA/AS/EU) as seeds.
    @matthewjamesr
    matthewjamesr authored Feb 16, 2018
    Configuration menu
    Copy the full SHA
    629b651 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #156 from z-classic/matthewjamesr-patch-1 

    Added six additional default full-nodes
    @BlueSilver22
    BlueSilver22 authored Feb 16, 2018
    Configuration menu
    Copy the full SHA
    bc0e07b View commit details
    Browse the repository at this point in the history

  4. add WSL instructions for build win

    sken committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    9094f9f View commit details
    Browse the repository at this point in the history

  5. fix make files to build for windows

    floreslorca committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    33b4077 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2018

  1. ~/.zcash -> ~/.zclassic, -r

    Jon Layton committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    46ecb8d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #157 from floreslorca/master 

    Allow cross compiling for Windows build
    @ch4ot1c
    ch4ot1c authored Feb 17, 2018
    Configuration menu
    Copy the full SHA
    808743d View commit details
    Browse the repository at this point in the history

  3. .gitignore += *.dSYM

    Jon Layton committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    94202ca View commit details
    Browse the repository at this point in the history

  4. add extra instructions to compile to windows

    sken committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    3d419b2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/floreslorca/zclassic

    sken committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    db0044f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'rizki-dnsseed'

    Jon Layton committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    a17ccae View commit details
    Browse the repository at this point in the history

  7. Merge pull request #158 from floreslorca/master 

    Add extra instructions to compile for Windows
    @ch4ot1c
    ch4ot1c authored Feb 17, 2018
    Configuration menu
    Copy the full SHA
    10a3e44 View commit details
    Browse the repository at this point in the history

  8. zdeveloper.org -> The Zclassic Team

    Jon Layton committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    03eafd6 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. Update README for Zclassic

    Jon Layton committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    3a57637 View commit details
    Browse the repository at this point in the history

  2. Readme, Copying, Install txt

    Jon Layton committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    8897bac View commit details
    Browse the repository at this point in the history

  3. Merge pull request #159 from z-classic/zclify 

    ZCLify
    @ch4ot1c
    ch4ot1c authored Feb 18, 2018
    Configuration menu
    Copy the full SHA
    3aac9ac View commit details
    Browse the repository at this point in the history

  4. read hashreserved

    jc committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    4c19e05 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #160 from jc23424/hashreserved 

    read hashreserved
    @BlueSilver22
    BlueSilver22 authored Feb 18, 2018
    Configuration menu
    Copy the full SHA
    b144de3 View commit details
    Browse the repository at this point in the history

  6. Revert "fix make files to build for windows" 

    This reverts commit 33b4077.
    Jon Layton committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    dc8e0ee View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. multi building

    floreslorca committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    9994f1a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. make file for rust can now build for multiple targets

    sken committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    77b726f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Merge pull request #161 from floreslorca/multi 

    Fix issue with rust makefiles not able to compile in different builds
    @ch4ot1c
    ch4ot1c authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    b077aaa View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. Update chainparams.cpp

    @BlueSilver22
    BlueSilver22 authored Feb 25, 2018
    Configuration menu
    Copy the full SHA
    9f86726 View commit details
    Browse the repository at this point in the history

  2. Update chainparams.cpp

    @BlueSilver22
    BlueSilver22 authored Feb 25, 2018
    Configuration menu
    Copy the full SHA
    273f8b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Implement RPC shield_coinbase zcash#2448.

    @bitcartel
    bitcartel authored and jc committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    7a5ec83 View commit details
    Browse the repository at this point in the history

  2. Closes zcash#2446 by adding generated field to listunspent. 

    If generated is true, the unspent transaction output is from a
coinbase transaction and can only be sent to a shielded address.
    @bitcartel
    bitcartel authored and jc committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    96f4e8c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #166 from jc23424/rpc-calls 

    Merge convenience rpc calls
    @ch4ot1c
    ch4ot1c authored Feb 28, 2018
    Configuration menu
    Copy the full SHA
    b619e7f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. lock when selecting anchor

    jc committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    b5d3a04 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #167 from jc23424/rpc-calls 

    lock when selecting anchor
    @ch4ot1c
    ch4ot1c authored Mar 1, 2018
    Configuration menu
    Copy the full SHA
    16785ae View commit details
    Browse the repository at this point in the history