32188 Commits
Author SHA1 Message Date
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
Homu d5e82d73ac Auto merge of #3287 - str4d:sapling-release-notes, r=str4d
Add Sapling details to release notes
2018-05-24 18:50:50 -07:00
Asher Dawes eb272b0eb6 Cleaned up Travis config 2018-05-24 18:05:13 -07:00
Homu 088353ab02 Auto merge of #3302 - bitcartel:3301_fix_mac_compile_error, r=str4d
Closes #3301. Non-void function should not have empty definition.
2018-05-24 17:03:42 -07:00
jl777 3a2bfec546 Merge pull request #594 from jl777/dev
Dev
2018-05-24 10:33:01 -11: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
Larry Ruane fff031688e (rpc-test) accurately account for fee without rounding error 2018-05-24 11:29:14 -04: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
Simon 47db75426f Closes #3301. Non-void function should not have empty definition. 2018-05-23 21:04:51 -07:00
Simon f9840089db Part of #3277. Add comment about deprecated txdb prefixes. 2018-05-23 20:37:34 -07:00
Homu bae5adf0a4 Auto merge of #3289 - bitcartel:release-v1.1.1-rc2, r=bitcartel
Release v1.1.1 rc2
2018-05-23 11:44:49 -07:00
Simon 5d0172d762 make-release.py: Updated release notes and changelog for 1.1.1-rc2. 2018-05-23 09:28:50 -07:00
Simon 57ef6fba29 make-release.py: Updated manpages for 1.1.1-rc2. 2018-05-23 09:28:49 -07:00
Simon d3ff27c0a6 make-release.py: Versioning changes for 1.1.1-rc2. 2018-05-23 09:27:59 -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 fbe92fcd2f Alloc tx 2018-05-23 00:52:08 -11:00
jl777 bf261fa62d Fix 2018-05-23 00:50:51 -11:00
jl777 4d69af1714 Sync with beta 2018-05-23 00:43:52 -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
Homu 9c55d0b40e Auto merge of #3286 - str4d:3153-gitian-fix, r=str4d
Comment out Gitian library handling while we don't build any libraries

Fixes a Gitian build failure introduced by #3153.
2018-05-22 16:49:51 -07:00
miketout 50ea0c018e Merge pull request #19 from VerusCoin/dev
Master Update From Dev
2018-05-22 16:31:07 -07:00
Jack Grigg bb838a0847 Add Sapling details to release notes 2018-05-23 11:27:13 +12: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