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 latest changes to openledger bsips repository Dec 2018 #1

Merged
merged 50 commits into from
Dec 18, 2018
Merged

merge latest changes to openledger bsips repository Dec 2018 #1

merged 50 commits into from
Dec 18, 2018

Commits on Aug 21, 2018

  1. BSIP41: Reduce MSSR of bitCNY from 1.1 to 1.05

    @abitmore
    abitmore committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    92ec7de View commit details
    Browse the repository at this point in the history

  2. Update format

    @abitmore
    abitmore committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    438b5ed View commit details
    Browse the repository at this point in the history

  3. Fix typo

    @abitmore
    abitmore committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    21b7f0f View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. Merge branch 'master' into bsip41-mssr-change

    @abitmore
    abitmore committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    0782d02 View commit details
    Browse the repository at this point in the history

  2. Hashed Time-Lock Contract

    @ryanRfox
    ryanRfox committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    dca7c12 View commit details
    Browse the repository at this point in the history

  3. Fixup: header

    @ryanRfox
    ryanRfox committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    58eff4b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Fixup: HTLC

    @ryanRfox
    ryanRfox committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    85faf7d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2018

  1. Fixup: Specification

    @ryanRfox
    ryanRfox committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    dc97097 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. BSIP44: Hashed Timelock Contracts

    @ryanRfox
    ryanRfox committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    a1d16d3 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Completion of this BSIP from a formal standpoint and inclustion of a … 

    …clear accepted/rejected state
    Stefan Schießl committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    c297190 View commit details
    Browse the repository at this point in the history

  2. bsip#43 Market fee sharing

    @OpenLedgerApp
    OpenLedgerApp committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    d673e66 View commit details
    Browse the repository at this point in the history

  3. add bitcrabs comment

    Stefan Schießl committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    b2dca44 View commit details
    Browse the repository at this point in the history

  4. Fixup: Specifications

    @ryanRfox
    ryanRfox committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    1961fb9 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Change: Secured Assets, Fixup: Specification

    @ryanRfox
    ryanRfox committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9f36ae2 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Fixup: HTLC Object

    @ryanRfox
    ryanRfox committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    492851e View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Fixup: API and Operations

    @ryanRfox
    ryanRfox committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    d14fad5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. Merge pull request #105 from sschiessl-bcp/patch-2 

    Completion of this BSIP from a formal standpoint
    @abitmore
    abitmore committed Sep 7, 2018
    Configuration menu
    Copy the full SHA
    2520e8d View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. Added summary for tokenholders

    @jmjatlanta
    jmjatlanta committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    5f64cb0 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2018

  1. Refine Summary for Tokenholders

    @ryanRfox
    ryanRfox committed Sep 21, 2018
    Configuration menu
    Copy the full SHA
    3d4383b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Edits based on comments 

    Removed outdated paragraph about user requesting refund after timeout (it is now automatic). Added method to retrieve all HTLC contracts by account.
    @jmjatlanta
    jmjatlanta committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    ed2ff08 View commit details
    Browse the repository at this point in the history

  2. Fixed method name for consistency

    @jmjatlanta
    jmjatlanta committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    79b7340 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. Updated according to the discussions with community members

    Denis Sokolov authored and Denis Sokolov committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    d84c734 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2018

  1. Create bsip 45

    @grctest
    grctest committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    6aa3df5 View commit details
    Browse the repository at this point in the history

  2. bsip 45 added to readme

    @grctest
    grctest committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    c454764 View commit details
    Browse the repository at this point in the history

  3. Fixed formatting

    @grctest
    grctest committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    2a4c2b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. Update bsip-0045.md

    @grctest
    grctest committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    f03f4ce View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. License change 

    MIT -> PD
    @grctest
    grctest committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    ee9ec4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #110 from BTS-CM/master 

    Add BSIP 45 - "Introduce 'allow use as bitasset backing collateral' flag/permission to assets"
    @pmconrad
    pmconrad committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    3c5f73e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Merge branch 'master' into bsip-hashed-timelock-contract

    @jmjatlanta
    jmjatlanta committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    1e02050 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into bsip43-market-fee-sharing

    @OpenLedgerApp
    OpenLedgerApp committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    a0b9dc4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #104 from bitshares/bsip-hashed-timelock-contract 

    BSIP44: Hashed Timelock Contract
    @jmjatlanta
    jmjatlanta committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    c8775c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2018

  1. Merge branch 'master' into bsip43-market-fee-sharing

    @OpenLedgerApp
    OpenLedgerApp committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    7bcffbd View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. rewards issue

    @OpenLedgerApp
    OpenLedgerApp committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    b9a2774 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2018

  1. updated wording

    @OpenLedgerApp
    OpenLedgerApp committed Oct 22, 2018
    Configuration menu
    Copy the full SHA
    298a9a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Merge pull request #107 from openledger/bsip43-market-fee-sharing 

    bsip#43 Market fee sharing
    @ryanRfox
    ryanRfox committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    440f16a View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. update bsip40 status

    Stefan Schießl committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    f79cc75 View commit details
    Browse the repository at this point in the history

  2. Update: Available BSIPs Table

    @ryanRfox
    ryanRfox committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    47ef860 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Update 40 w M1

    @ryanRfox
    ryanRfox committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    203f66f View commit details
    Browse the repository at this point in the history

  2. readme status to accepteed

    Stefan Schießl committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    71427c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. rollback

    Stefan Schießl committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    7adf9b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Fixup: Typo

    @ryanRfox
    ryanRfox committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    8b8cf94 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #117 from sschiessl-bcp/patch-3 

    update bsip40 status
    @pmconrad
    pmconrad committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    78b6be2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #118 from bitshares/update-readme 

    Update: Available BSIPs Table
    @pmconrad
    pmconrad committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    d30cb1c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. add pull request link

    @oxarbitrage
    oxarbitrage committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    185d4b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #121 from bitshares/oxarbitrage-patch-1 

    add pull request link
    @pmconrad
    pmconrad committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    4da6cf3 View commit details
    Browse the repository at this point in the history

  3. add newline to link 

    sorry, need a newline at the link or will look wrong(in the same line)
    @oxarbitrage
    oxarbitrage committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    c4bd215 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #122 from bitshares/oxarbitrage-patch-1 

    add newline to link
    @pmconrad
    pmconrad committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    c4dfb02 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Merge branch 'master' into bsip41-mssr-change

    @xeroc
    xeroc committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    0934b4c View commit details
    Browse the repository at this point in the history

  2. Minor markdown fixes

    @xeroc
    xeroc committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    c245a4c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #98 from bitshares/bsip41-mssr-change 

    BSIP41: Reduce MSSR of bitCNY from 1.1 to 1.05
    @xeroc
    xeroc committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    03a9488 View commit details
    Browse the repository at this point in the history