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

Master #654

Merged
merged 61 commits into from
Jan 5, 2016
Merged

Master #654

merged 61 commits into from
Jan 5, 2016

Commits on Aug 22, 2015

  1. treat MN as pre-enabled while there is no legit ping that differ from… 

    … initial one (from mnb)
    @UdjinM6
    UdjinM6 committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    30ab984 View commit details
    Browse the repository at this point in the history

  2. implement bip69

    @UdjinM6
    UdjinM6 committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    9055883 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. translations 20150902

    @UdjinM6
    UdjinM6 committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    2fc5910 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. Sanitize mnbudget prepare|submit names and URLs

    @crowning-
    crowning- committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    5783d5b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into v0.12.1.x

    @schinzelh
    schinzelh committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    435f670 View commit details
    Browse the repository at this point in the history

  3. version bump

    @schinzelh
    schinzelh committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    4a05549 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into v0.12.1.x 

    Conflicts:
	configure.ac
	src/clientversion.h
    @schinzelh
    schinzelh committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    4059322 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2015

  1. UI: theme-dependent icons/images Step 1

    @crowning-
    crowning- committed Sep 5, 2015
    Configuration menu
    Copy the full SHA
    bf52871 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. Merge branch 'master' into v0.12.1.x

    @schinzelh
    schinzelh committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    7a8f73f View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. Merge pull request dashpay#598 from crowning-/v0.12.1.x 

    Security: sanitize mnbudget prepare|submit names and URLs
    evan82 committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    356c616 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dashpay#600 from crowning-/UI_Enhancements 

    UI: theme-dependent icons/images Step 1
    evan82 committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    ee9018a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2015

  1. change threadSafe (i.e. cs_main lock usage) for Dash rpc commands 

    Closes dashpay#604
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    9d7fccf View commit details
    Browse the repository at this point in the history

  2. fix linearization tool to make it work with Dash

    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    a31df6e View commit details
    Browse the repository at this point in the history

  3. fixing reference 

    Closes dashpay#603
    @schinzelh
    schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    c38e523 View commit details
    Browse the repository at this point in the history

  4. remove extra "new line" from some error/log messages 

    Closes dashpay#609
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    d9ff3d7 View commit details
    Browse the repository at this point in the history

  5. remove depreciated dsee/dseep code 

    Closes dashpay#606
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    f68a5d8 View commit details
    Browse the repository at this point in the history

  6. Security: sanitize mnbudget parameters (part 2) DASH-5

    @crowning-
    crowning- committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    afa99c7 View commit details
    Browse the repository at this point in the history

  7. split usage of "masternode" command: "start" for local Hot and "start… 

    …-<mode>" for remote"

Closed dashpay#605
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    02dfe6b View commit details
    Browse the repository at this point in the history

  8. UI: theme-dependent icons/images Step 2

    @crowning-
    crowning- committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    82b25f5 View commit details
    Browse the repository at this point in the history

  9. UI: theme-dependent icons/images Step 2 (permissions restored)

    @crowning-
    crowning- committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    8c33cf2 View commit details
    Browse the repository at this point in the history

  10. UI: theme-dependent icons/images Step 2 (app icons relocated)

    @crowning-
    crowning- committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    dec129d View commit details
    Browse the repository at this point in the history

  11. UI: theme-dependent icons/images Step 2 (Gitian-build fix)

    @crowning-
    crowning- committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    b9bf948 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2015

  1. UI: theme-dependent icons/images Step 3 (CSS changes)

    @crowning-
    crowning- committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    39ac400 View commit details
    Browse the repository at this point in the history

  2. UI: theme-dependent icons/images (error fix)

    @crowning-
    crowning- committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    0a036e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2015

  1. Merge pull request dashpay#611 from crowning-/v0.12.1.x 

    Security: sanitize mnbudget parameters (part 2) DASH-5
    evan82 committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    f36e28e View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2015

  1. Slight budgets refactor: 

    - cleaner blockchain-like rpc / moved logic to proposal class / cleaned help messages and redundant
- refactored proposals a bit (more straightforward constructor, IsValid)
(both parts inherit sanitization proposed/made by @crowning earlier)
    @UdjinM6
    UdjinM6 committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    6b35e97 View commit details
    Browse the repository at this point in the history

  2. DS MultiSession cmd-line option (try to mix constantly, few times per… 

    … block)
    @UdjinM6
    UdjinM6 committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    841fc5f View commit details
    Browse the repository at this point in the history

  3. Merge pull request dashpay#595 from UdjinM6/translations20150902 

    translations 20150902
    evan82 committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    fec3d8b View commit details
    Browse the repository at this point in the history

  4. Merge pull request dashpay#614 from UdjinM6/refrpcbudget 

    Slight budgets/rpc refactor
    evan82 committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    14154ad View commit details
    Browse the repository at this point in the history

  5. Merge pull request dashpay#615 from UdjinM6/dsmultisession 

    DS MultiSession cmd-line option
    evan82 committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    e29241b View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2015

  1. UI: theme-dependent icons/images Step 4 (splash + rpcconsole)

    @crowning-
    crowning- committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    1338b64 View commit details
    Browse the repository at this point in the history

  2. UI: theme-dependent icons/images Step 5 (About message)

    @crowning-
    crowning- committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    0b435da View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/v0.12.1.x' into UI_Enhancements

    @crowning-
    crowning- committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    bb49ce8 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. UI: theme-dependent icons/images (Win installer fix)

    @crowning-
    crowning- committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    94a6f12 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. Merge pull request dashpay#561 from UdjinM6/v0.12.1.x_pre_enabled 

    V0.12.1.x pre-enabled status from masternodes
    evan82 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    ddf71c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dashpay#563 from UdjinM6/v0.12.1.x_bip69 

    V0.12.1.x Implement bip69
    evan82 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    acb4146 View commit details
    Browse the repository at this point in the history

  3. Merge pull request dashpay#612 from crowning-/UI_Enhancements 

    UI: theme-dependent icons/images Step 2-5
    evan82 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    e4e1fc9 View commit details
    Browse the repository at this point in the history

  4. merging 0.12.0.x into 0.12.1.x

    @schinzelh
    schinzelh committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    3787421 View commit details
    Browse the repository at this point in the history

  5. Merge pull request dashpay#619 from nightlydash/merge_0.12.0.x 

    Merge 0.12.0.x
    @schinzelh
    schinzelh committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    046c238 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. add mnbudgetvoteraw

    @UdjinM6
    UdjinM6 committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    730c29f View commit details
    Browse the repository at this point in the history

  2. Merge pull request dashpay#621 from UdjinM6/mnbudgetvoteraw 

    add mnbudgetvoteraw
    evan82 committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    a0a2b86 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2015

  1. Update tor nodes 

    Closes: dashpay#622
    @elanaint @schinzelh
    elanaint authored and schinzelh committed Sep 24, 2015
    Configuration menu
    Copy the full SHA
    2fa3615 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2015

  1. huge update for Chinese and Japanese(include it in the list now) 

    Closes: dashpay#625
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    e754c84 View commit details
    Browse the repository at this point in the history

  2. fix LP inter-mixing by not initiating new queues by them 

    Closes: dashpay#623
    @UdjinM6 @schinzelh
    UdjinM6 authored and schinzelh committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    f173a86 View commit details
    Browse the repository at this point in the history

  3. Fixed IX confirmation bug for gettransaction 

    IX confirmations now show up correctly via the RPC interface immediately after IX confirms they are double-spend proof:

gettransaction 64c04e06ac058e572cefb5d98728dba21401cb8826f9688cbaf4270adfc6afb2

{
    "amount" : 0.00000000,
    "fee" : -0.01000000,
    "confirmations" : 5,
    "bcconfirmations" : 0,
    "txid" : "64c04e06ac058e572cefb5d98728dba21401cb8826f9688cbaf4270adfc6afb2",
    "walletconflicts" : [
}

... a moment later ...

gettransaction 64c04e06ac058e572cefb5d98728dba21401cb8826f9688cbaf4270adfc6afb2

{
    "amount" : 0.00000000,
    "fee" : -0.01000000,
    "confirmations" : 6,
    "bcconfirmations" : 1,
    "blockhash" : "00000000000f850e60431a5a88fba1cd8d3868477056f65493664e2d39c1837c",
    "blockindex" : 2,
    "blocktime" : 1443290068,
    "txid" : "64c04e06ac058e572cefb5d98728dba21401cb8826f9688cbaf4270adfc6afb2",
    "walletconflicts" : [
    ],
}
    @schinzelh
    Evan Duffield authored and schinzelh committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    ac3a012 View commit details
    Browse the repository at this point in the history

  4. bumping to v56 for next dev iteration

    @schinzelh
    schinzelh committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    27a4f5e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v0.12.0.x' into v0.12.1.x 

    Conflicts:
	configure.ac
	src/clientversion.h
    @schinzelh
    schinzelh committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    7c288e1 View commit details
    Browse the repository at this point in the history

  6. Edit masternode.conf from within the wallet

    @crowning-
    crowning- committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    eb29c71 View commit details
    Browse the repository at this point in the history

  7. Edit masternode.conf from within the wallet (Menu adjusted)

    @crowning-
    crowning- committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    115bb17 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2015

  1. Merge pull request dashpay#628 from crowning-/v0.12.1.x 

    GUI: Edit masternode.conf from within the wallet
    evan82 committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    0c0cdb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. UI: wrong keypool default value displayed

    @crowning-
    crowning- committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    2a25c8c View commit details
    Browse the repository at this point in the history

  2. -keypool=<n> help text modified

    @crowning-
    crowning- committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    a29e1ce View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. UI: wrong keypool default value displayed part 2

    @crowning-
    crowning- committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    3f378fe View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2015

  1. UI: show complete path to wallet.dat on Wallet-Repait tab

    @crowning-
    crowning- committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    8233135 View commit details
    Browse the repository at this point in the history

  2. UI: show complete path to wallet.dat on Wallet-Repait tab (separator-… 

    …fix)
    @crowning-
    crowning- committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    ba053de View commit details
    Browse the repository at this point in the history

  3. UI: show complete path to wallet.dat on Wallet-Repait tab (Win separa… 

    …tor-fix)
    @crowning-
    crowning- committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    eb5224c View commit details
    Browse the repository at this point in the history

  4. UI: show complete path to wallet.dat on Wallet-Repait tab (Qt5 fix)

    @crowning-
    crowning- committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    dbd1956 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2015

  1. Merge pull request dashpay#641 from crowning-/v0.12.1.x 

    UI: show complete path to wallet.dat on Wallet-Repair tab
    evan82 committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    d29309e View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2015

  1. Merge pull request dashpay#638 from crowning-/UI_Enhancements 

    UI: wrong keypool default value displayed
    evan82 committed Oct 27, 2015
    Configuration menu
    Copy the full SHA
    6df51c9 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2015

  1. Merge remote-tracking branch 'dashpay/v0.12.1.x'

    @salmion
    salmion committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    d17bbd1 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2015

  1. added light theme

    @salmion
    salmion committed Dec 7, 2015
    Configuration menu
    Copy the full SHA
    5fc18dc View commit details
    Browse the repository at this point in the history