Evan Duffield
e26d300a13
Merge branch 'master-rc4' of https://github.com/darkcoinproject/darkcoin into master-rc4
2014-07-20 10:13:59 -07:00
Evan Duffield
75ca973477
Merge branch 'DeathRay1977-master' into master-rc4
2014-07-20 10:06:40 -07:00
Evan Duffield
af33b18073
Merge branch 'master' of https://github.com/DeathRay1977/darkcoin into DeathRay1977-master
2014-07-20 10:06:17 -07:00
Evan Duffield
598c18038d
fixed GetCurrentMasterNodeConsessus
2014-07-20 10:06:03 -07:00
Darkcoin
2125530190
Merge pull request #26 from nightlydarkcoin/macfontfix
...
Qt: Fix monospace font in osx 10.9
2014-07-20 06:09:21 -10:00
Darkcoin
036648e33e
Merge pull request #27 from nightlydarkcoin/win32compilefix
...
this fixes compilation error on win32
2014-07-20 06:08:49 -10:00
Holger Schinzel
911b66b251
this fixes compilation error on win32
2014-07-20 12:39:24 +02:00
Holger Schinzel
41d165380d
Qt: Fix monospace font in osx 10.9
...
The "Monospace" hint was added in Qt 4.8, and it works as intended as opposed
to "TypeWriter" which fails to load a font.
2014-07-20 11:35:14 +02:00
Evan Duffield
dc4300955a
version bump
2014-07-18 08:44:34 -07:00
Evan Duffield
3ce6e54574
updated POW settings
2014-07-18 08:27:15 -07:00
Evan Duffield
873aa6ad69
initial changes for rc4
2014-07-17 21:50:42 -07:00
Norm Fasey
8d5eca5adc
Merge branch 'master' of https://github.com/DeathRay1977/darkcoin
2014-07-13 00:02:57 +01:00
Norm Fasey
4876caf3b6
Fixes for Keys Unit Tests
2014-07-13 00:01:53 +01:00
Norm Fasey
e6fae1152f
Fixes to Checkpoints Unit Tests
2014-07-12 20:28:35 +01:00
Norm Fasey
2a2d748850
Fixes for bloom filter tests
2014-07-12 17:39:21 +01:00
Norm Fasey
b26c6ab2a5
Fixes for base58 Unit Tests
2014-07-12 14:30:06 +01:00
Norm Fasey
89c669769b
Fixes for Alerts Unit Tests
2014-07-09 19:48:35 +01:00
Evan Duffield
cd9411951e
Merge branch 'master' of https://github.com/darkcoinproject/darkcoin
2014-07-07 08:01:20 -07:00
Evan Duffield
09187d0e4e
version bump
2014-07-07 08:00:36 -07:00
Darkcoin
ad4e2e55eb
Merge pull request #21 from nightlydarkcoin/dnsseed
...
- use of proper darkcoin-seeder nodes
2014-07-06 09:16:18 -07:00
Holger Schinzel
21c4ba6643
- use of proper darkcoin-seeder nodes
...
- source of darkcoin-seeder can be found at https://github.com/nightlydarkcoin/darkcoin-seeder
2014-07-05 15:17:42 +02:00
Darkcoin
a2e69e4cb9
Merge pull request #17 from nightlydarkcoin/gitian
...
fixed contrib/gitian-descriptors for Linux 32, Linux 64, Windows 32 an OSX
2014-07-04 07:29:11 -07:00
Holger Schinzel
c5f9697bfd
fixed typo
2014-07-02 23:10:31 +02:00
Darkcoin
b5ab15d275
Merge pull request #18 from flack/patch-1
...
Fix Tags link to point to the correct repo
2014-07-02 13:42:02 -07:00
flack
f03a1f6355
Fix Tags link to point to the correct repo
...
The "mailing list" link is also wrong, but I don't know what the correct version would be
2014-07-02 21:45:43 +02:00
Evan Duffield
05492ae5d6
Merge branch 'nightlydarkcoin-gitian'
2014-07-01 16:05:08 -07:00
Evan Duffield
4a1e45a1af
Merge branch 'gitian' of https://github.com/nightlydarkcoin/darkcoin into nightlydarkcoin-gitian
2014-07-01 16:04:40 -07:00
Holger Schinzel
716d04ac8d
- fixed contrib/gitian-descriptors for Linux 32, Linux 64, Windows 32 and OSX
...
- updated macdeploy/macdeployqtplus to latest bitcoin upstream
- updated release-process.md
known issues:
- setup.exe for Windows 32 is still branded as Litecoin
- test of upload of signatures to gitian.sigs pendig
- build system (makefile, darkcoin-qt.pro) is outdated and needs update to autotools/autoconf
- Windows 64 build not working due to linker issues
2014-07-02 00:30:40 +02:00
Darkcoin
212015e2e0
Merge pull request #15 from DeathRay1977/master
...
Perfect, thanks!
2014-07-01 13:17:41 -07:00
Norm Fasey
b7764376e5
Unit Tests for CDarkSendPool::set_collateral_address
2014-06-28 13:21:25 +01:00
Darkcoin
97cac8b6c5
Merge pull request #13 from DeathRay1977/master
...
Thanks so much for this, I've been meaning to fix these
2014-06-27 08:15:14 -07:00
Norm Fasey
d90db3a3ef
Fix build of tests. Fix unit tests for darksend and alerts
2014-06-27 14:50:36 +01:00
Norm Fasey
1480ff4397
Fix the build of test code
2014-06-27 13:36:46 +01:00
Evan Duffield
caf32d54b5
Removed misbehaving masternode check due to wrongful banning
2014-06-26 14:17:35 -07:00
Evan Duffield
23563ef25e
merged: Officially launching masternode payments!
2014-06-25 16:49:12 -07:00
Evan Duffield
9ce5ededba
officially launching masternode payments!
2014-06-25 16:42:33 -07:00
Evan Duffield
9c91ddf8a4
compatibility changes
2014-06-25 16:33:08 -07:00
Evan Duffield
dfbd4a7f73
setting masternode start time to now
2014-06-25 13:37:15 -07:00
Evan Duffield
bb7fa4f92d
fixed misbehaving debug
2014-06-25 10:19:04 -07:00
R E Broadley
b7ac800699
Debug when OneShot node is about to disconnect.
2014-06-25 09:48:39 -07:00
R E Broadley
e025fe7934
Add masternodes to address database
2014-06-25 09:48:11 -07:00
R E Broadley
0b86a4da56
Display days instead of hours nodes last seen.
2014-06-25 09:46:51 -07:00
R E Broadley
e4481e2b16
Inform other peers when they are misbehaving.
2014-06-25 09:46:40 -07:00
R E Broadley
1070411a3b
Improved getblocks logging.
2014-06-25 09:46:27 -07:00
R E Broadley
f780f3ae80
Sync from many nodes
2014-06-25 09:46:04 -07:00
R E Broadley
4fcaa57368
Add -proxytoo option, which allows proxy use non-exclusively, unlike the -proxy option.
...
Conflicts:
src/init.cpp
src/netbase.cpp
Conflicts:
.gitignore
src/init.cpp
Conflicts:
src/init.cpp
src/netbase.cpp
2014-06-25 09:42:08 -07:00
R E Broadley
6afc2e7b23
Assign a NodeId to each peer
2014-06-25 09:35:39 -07:00
R E Broadley
5bdb5abb0a
merged: Log NodeIds for easier diagnosis of debug.log
2014-06-25 09:35:29 -07:00
Evan Duffield
3b541724e2
disable mn checks for non-enforcement
2014-06-25 09:12:51 -07:00
Evan Duffield
df7734b684
added non-enforcement masternode payments
2014-06-25 08:43:16 -07:00
