Commit Graph

18643 Commits

Author SHA1 Message Date
Michael Toutonghi
6c8e1cdfb7 Restore zcash coinbase rule and launch fix at 10080 2018-05-25 15:10:07 -07:00
Asher Dawes
6dc52f2205 troubleshooting executable copies 2018-05-25 10:55:31 -07:00
Scott Sadler
a748b1a26d recognize btc backnotarisations and include ccid in MoMoMdata rpc 2018-05-25 14:47:54 -03:00
Asher Dawes
4ef743acad troubleshooting executable copies 2018-05-25 01:22:30 -07:00
Asher Dawes
18b0f94780 troubleshooting executable copies 2018-05-25 00:39:44 -07:00
Asher Dawes
476221d4c9 Merge remote-tracking branch 'origin/dev' into dev 2018-05-25 00:00:37 -07:00
Asher Dawes
a23fbff21a removed escape characters 2018-05-25 00:00:22 -07:00
Asherda
b4c47f9e30 Merge pull request #28 from VerusCoin/dev
Dev
2018-05-24 22:33:58 -07:00
David L. Dawes
276a9f4c64 Merge branch 'dev' of github.com:VerusCoin/VerusCoin into dev 2018-05-24 20:58:58 -07:00
Asherda
37c4240ea4 Merge pull request #27 from VerusCoin/conditionalCompilation
Add conditional compilation for Windows fix.
2018-05-24 20:54:53 -07:00
David Dawes
52cf66e138 Add conditional compiulation for Windows fix. 2018-05-24 20:28:26 -07:00
David L. Dawes
d1736416cc Merge branch 'conditional' of github.com:VerusCoin/VerusCoin into dev 2018-05-24 19:48:05 -07:00
David L. Dawes
37bbbc2a43 Conditional compilation so that Windows, Mac and Linux compile from single (messy) file. 2018-05-25 02:33:10 +00:00
Asher Dawes
eb272b0eb6 Cleaned up Travis config 2018-05-24 18:05:13 -07:00
Asherda
a04613f744 Merge pull request #26 from VerusCoin/dev
Fixed AUTH to external storage
2018-05-24 11:14:58 -07:00
Asher Dawes
511c8d24b3 Fixing AUTH to external storage 2018-05-24 10:47:54 -07:00
miketout
85e46dd592 Merge pull request #25 from VerusCoin/dev
Changed 10800 to 10080 to match end of ERA 0
2018-05-24 09:01:39 -07:00
Michael Toutonghi
a65fe46f84 Changed 10800 to 10080 to match end of ERA 0 2018-05-24 08:57:23 -07:00
miketout
d09539ecce Merge pull request #24 from VerusCoin/dev
merge changes into master
2018-05-24 01:28:47 -07:00
Michael Toutonghi
d79c2062af Merge branch 'dev' of https://github.com/veruscoin/veruscoin into dev 2018-05-24 01:14:54 -07:00
Michael Toutonghi
cd9bb53d60 Fix test and make active block for staking change the start of era 1 2018-05-24 01:14:31 -07:00
Asher Dawes
d5e0a087e3 Fixing AUTH to external storage 2018-05-23 22:38:20 -07:00
Asher Dawes
52873f8d6e Fixing AUTH to external storage 2018-05-23 22:31:12 -07:00
Asher Dawes
ad2541d4d4 Adding Slack notifications 2018-05-23 22:11:29 -07:00
Asher Dawes
354eec04e5 Introducing CI/CD configs for Linux and Windows builds. Mac pending. 2018-05-23 22:09:03 -07:00
Alrighttt
9cfe8ac752 Merge pull request #1 from jl777/dev
Dev
2018-05-23 12:11:35 -04:00
jl777
de8834fb9b Merge branch 'beta' into dev 2018-05-23 15:18:21 +03:00
jl777
fea3222946 +comment 2018-05-23 00:55:13 -11:00
jl777
885d458054 Fix syntax 2018-05-23 00:53:43 -11:00
jl777
a6c06faf32 Synchronize with dev 2018-05-23 00:42:21 -11:00
jl777
371c496499 Merge pull request #678 from jl777/jl777
+print
2018-05-23 14:41:20 +03:00
jl777
a035da46d5 +print 2018-05-23 00:39:41 -11:00
jl777
80b0a73a34 Merge pull request #677 from igorvoltaic/dev
lets get rid of this message: 'section __textcoal_nt is deprecated'
2018-05-23 13:18:17 +03:00
igorvoltaic
4543015b01 lets get rid of this message: 'section __textcoal_nt is deprecated' 2018-05-23 11:32:44 +03:00
jl777
53e8e2401c Merge pull request #676 from jl777/jl777
Jl777
2018-05-23 10:06:53 +03:00
jl777
e2d299ee83 GAME freq.5 2018-05-23 10:05:51 +03:00
miketout
f54bbcc272 Merge pull request #23 from VerusCoin/dev
fix build error
2018-05-22 17:45:39 -07:00
Michael Toutonghi
593ef8122b Merge branch 'dev' of https://github.com/veruscoin/veruscoin into dev 2018-05-22 17:41:05 -07:00
Michael Toutonghi
8626f66679 Fix build from some error across source machines 2018-05-22 17:40:24 -07:00
miketout
f456657dd2 Merge pull request #22 from VerusCoin/dev
fix header
2018-05-22 17:15:21 -07:00
Michael Toutonghi
ad262a077f fix header 2018-05-22 17:14:28 -07:00
miketout
94005819f1 Merge pull request #21 from VerusCoin/dev
update readme
2018-05-22 17:10:35 -07:00
Michael Toutonghi
72311c0676 update readme 2018-05-22 17:06:09 -07:00
miketout
50ea0c018e Merge pull request #19 from VerusCoin/dev
Master Update From Dev
2018-05-22 16:31:07 -07:00
Michael Toutonghi
ec872d3a55 Do not resurrect staking transactions and lose stake age when no block won 2018-05-22 15:53:56 -07:00
Michael Toutonghi
cd230e37ff Staking improvement 2018-05-22 13:40:16 -07:00
Scott Sadler
0b485d3c66 rpc methods for cross chain transactions 2018-05-22 15:16:37 -03:00
jl777
bbf29c15e2 Merge branch 'dev' into jl777 2018-05-22 10:50:46 +03:00
jl777
0b72f2e5f5 Merge pull request #675 from Alrighttt/dev
Changed help docs to reflect KMD/assetchains
2018-05-22 10:49:38 +03:00
alrighttt
1333d0d7cf Changed help docs to reflect KMD/assetchains 2018-05-21 18:34:18 -04:00