Commit Graph

22197 Commits

Author SHA1 Message Date
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
Simon
c290f8f263 Update release height to block 332000. 2018-05-24 23:09:02 -07:00
Asherda
b4c47f9e30 Merge pull request #28 from VerusCoin/dev
Dev
2018-05-24 22:33:58 -07:00
Jack Grigg
d670db7164 Sapling testnet activation height 2018-05-25 16:05:25 +12: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
Jack Grigg
10faedf758 make-release.py: Updated release notes and changelog for 1.1.1. 2018-05-25 15:49:34 +12:00
Jack Grigg
4ddd873d61 make-release.py: Updated manpages for 1.1.1. 2018-05-25 15:49:33 +12:00
Jack Grigg
40c33db2f4 make-release.py: Versioning changes for 1.1.1. 2018-05-25 15:38:43 +12: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
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