DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
15,613 Commits 6 Branches 7 Tags
479f8ea9b8e96978e9a9decd0a15cdaa90dd6724
Commit Graph
15613 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Grigg 2857f6960d Regenerate miner tests 
Closes #2271.
 2017-05-16 22:38:07 +12:00
Homu 38684e4c42 Auto merge of #2293 - daira:alerts-for-2017-04-11.a, r=nathan-at-least 
Alerts for 2017-04-11.a security issue (fixed in 1.0.8-1)

Alert 1002 (versions 1.0.0-1.0.2 inclusive).
Alert 1003 (versions 1.0.3-1.0.8 inclusive).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-05-15 16:08:29 -07:00
Homu 2adeb3948b Auto merge of #2369 - nathan-at-least:build-toolchain-logging, r=nathan-at-least 
Print toolchain versions before making depends, autoconf, or main build.

Closes #2218.

Note: I spent a half hour attempting to have make do this so that people not using `build.sh` would get the same output. There's no easy way I found to ensure that output occurs first and regardless of the result of other build rules.
 2017-05-15 13:12:05 -07:00
Homu 0d77ed35ae Auto merge of #2340 - ioptio:master, r=nathan-at-least 
wallet backup instructions

closes #2178
 2017-05-15 11:19:40 -07:00
Homu e209ba4951 Auto merge of #2338 - amgadabdelhafez:patch-1, r=nathan-at-least 
Update timedata.cpp to fix error message string from bitcoin core to zcash

Changing error message string from bitcoin core to zcash. fixes issue #2336
 2017-05-15 09:42:19 -07:00
Homu 3a98e3b4c2 Auto merge of #2297 - str4d:2274-apoptosis, r=nathan-at-least 
Implement automatic shutdown of deprecated Zcash versions

Closes #2274.
 2017-05-14 18:39:14 -07:00
Homu 01bc99205a Auto merge of #2251 - str4d:2210-tor-quotedstring-escapes, r=nathan-at-least 
Handle escapes in Tor QuotedStrings

Also adds a missing copyright header.

Closes #2210.
 2017-05-13 15:24:58 -07:00
Homu 2869db7993 Auto merge of #2362 - daira:2361.disable-proton-by-default, r=nathan-at-least 
Disable building Proton by default

fixes #2361

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-05-12 18:07:58 -07:00
Nathan Wilcox 867d3e344f Show toolchain versions in build.sh. 2017-05-11 22:02:00 -07:00
Paige Peterson 4088ac68db specify exportdir being within homedirectory 2017-05-11 22:43:01 -04:00
Jack Grigg b4f861d191 Wrap messages nicely on metrics screen 2017-05-12 14:41:50 +12:00
Jack Grigg 5b3bc9716e Implement automatic shutdown of deprecated Zcash versions 
Closes #2274.
 2017-05-12 14:41:46 +12:00
Paige Peterson 56dbd7b564 str4d and Ariel's suggestions 2017-05-11 19:51:21 -04:00
emilrus bcbcf1437e Replace bitcoind with zcashd 2017-05-11 11:41:13 +03:00
Daira Hopwood 1e9db0b38a Remove an unneeded version workaround as per @str4d's review comment. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-05-11 07:27:43 +01:00
Daira Hopwood b04529fefd Disable building Proton by default. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-05-10 16:54:58 +01:00
Amgad Abdelhafez 8dafb9c6ce Update timedata.cpp 
Capitalizing the 'z' in "Zcash" string
 2017-05-05 11:24:48 -04:00
Paige Peterson 8e27d624aa typo and rewording edits 2017-05-03 21:49:19 -04:00
Paige Peterson d5cdb0519a wallet backup instructions 2017-05-03 21:25:06 -04:00
ca333 ac5a09a1b9 Merge pull request #12 from jl777/beta 
beta update
 2017-05-03 11:34:30 +02:00
Amgad Abdelhafez bed9dd2cd2 Update timedata.cpp 
Changing error message string from botcoin core to zcash
 2017-05-02 19:33:52 -04:00
jl777 35c052a8ca Merge pull request #424 from jl777/dev 
Dev
 2017-05-02 17:08:43 +03:00
jl777 0cba06b6e7 Test 2017-05-01 23:56:06 +03:00
Simon b9f6e40c9c Patch to build Proton with minimal dependencies. 
Closes #2279.  Configures CMake to enable C++11, build static libaries
and only build cpp bindings with minimal dependencies. Documentation,
examples, tests and other language bindings are no longer built.
CMake will no longer try to find commands and packages which are not
required for building the target.
 2017-04-28 12:03:37 -07:00
jl777 403044796e Remove print 2017-04-28 15:16:39 +03:00
jl777 5a3e1d41fa Merge pull request #421 from jl777/dev 
new MESH
 2017-04-27 13:43:40 +03:00
jl777 8415ccaaae Test 2017-04-27 13:41:28 +03:00
jl777 9ad4422c3d Merge pull request #420 from jl777/dev 
new MESH
 2017-04-27 11:07:10 +03:00
jl777 021c85c329 Test 2017-04-27 11:02:29 +03:00
jl777 5908165a3d Test 2017-04-27 09:33:10 +03:00
jl777 e0440cc39c Test 2017-04-27 09:27:22 +03:00
jl777 ab49ccacba Test 2017-04-27 09:21:53 +03:00
jl777 e2398ee80f Test 2017-04-27 09:20:57 +03:00
jl777 1066247f1f Test 2017-04-26 23:26:14 +03:00
jl777 de939fbb37 Test 2017-04-26 23:24:49 +03:00
jl777 4c73b58b83 Test 2017-04-26 23:21:53 +03:00
jl777 438ba9c17d Test 2017-04-26 23:14:14 +03:00
jl777 1e3f8b44fe Test 2017-04-26 23:10:31 +03:00
jl777 d1d08494e9 Test 2017-04-26 23:06:33 +03:00
jl777 952b990570 Test 2017-04-26 23:00:30 +03:00
jl777 4212100ea1 Test 2017-04-26 22:54:12 +03:00
jl777 3e5136cee9 Test 2017-04-26 22:52:10 +03:00
jl777 763b14572a Test 2017-04-26 22:40:39 +03:00
jl777 b7ba6413b6 Test 2017-04-26 22:34:31 +03:00
jl777 cc83230c1c Test 2017-04-26 22:32:29 +03:00
jl777 4e624c0452 Test 2017-04-26 19:29:36 +03:00
jl777 edfca062df Test 2017-04-26 19:24:27 +03:00
jl777 45a93b635e Test 2017-04-26 19:20:43 +03:00
jl777 59e66272c8 Test 2017-04-26 19:05:57 +03:00
jl777 1a31463b3d Test 2017-04-26 19:00:44 +03:00