Commit Graph

12432 Commits

Author SHA1 Message Date
Holger Schinzel
5f1619c298 Merge remote-tracking branch 'remotes/origin/v0.12.0.x' into v0.12.1.x 2016-01-12 12:05:01 +01:00
Holger Schinzel
86d4672936 travis: for travis generating an extra build
see bfadae3374
2016-01-12 12:01:45 +01:00
Holger Schinzel
525eb912f9 Merge pull request #671 from crowning-/v0.12.1.x
Transaction View: LastMonth calculation fixed
2016-01-11 22:21:50 +01:00
crowning-
af4bc47a9b Transaction View: LastMonth calculation fixed 2016-01-11 21:49:42 +01:00
Amir
2491e2af3e Print hash in CMutableTransaction::ToString
Keep in line with CTransaction::ToString. Truncates the hash at 10.
2016-01-10 07:15:11 +01:00
Amir
338f106fe3 Removed Calculate() class methods. Not used.
Both Calculate methods are not implemented in masternode-budget.cpp and not used elsewhere in the code.
2016-01-10 07:12:03 +01:00
Holger Schinzel
0a3142e494 Merge pull request #668 from crowning-/v0.12.1.x
Light theme
2016-01-10 06:53:31 +01:00
crowning-
acd952d18f UI: new wallet theme "DASH-light" (file permissions restored) 2016-01-09 23:25:07 +01:00
crowning-
ee2c595291 UI: new wallet theme "DASH-light" 2016-01-09 23:19:08 +01:00
Jonathan Cross
e380f232de Improving README
Fixing references to bitcoin and minor cleanup.
2016-01-09 20:20:38 +01:00
Luke Dashjr
d570a1f41b doc/bips: Document BIP 125 support 2016-01-09 17:40:39 +00:00
Wladimir J. van der Laan
a344880e6a
Merge pull request #7323
45b8e27 -bytespersigop option to additionally limit sigops in transactions we relay and mine (Luke Dashjr)
2016-01-09 18:17:34 +01:00
Luke Dashjr
5b144b7113 Merge branch bytespersigop 2016-01-09 17:02:35 +00:00
Suhas Daftuar
d513405cb7
[Tests] Eliminate intermittent failures in sendheaders.py
- Add race-condition debugging tool to mininode
- Eliminate race condition in sendheaders.py test

Clear the last block announcement before mining new blocks.

Github-Pull: #7308
Rebased-From: 82a0ce09b4 168915e6de
2016-01-09 16:32:30 +01:00
Alex Morcos
4707797df2
Make sure conflicted wallet tx's update balances
Github-Pull: #7306
Rebased-From: f61766b37b
2016-01-08 17:38:04 +01:00
Wladimir J. van der Laan
9265e89a77
Merge pull request #7318
daa8da2 Backport: quickfix for RPC timer interface problem (Jonas Schnelli)
2016-01-08 17:33:59 +01:00
Wladimir J. van der Laan
1320300ea1
Merge pull request #7319
b1a8374 [qt] Intro: Display required space (MarcoFalke)
2016-01-08 17:32:57 +01:00
MarcoFalke
fa4ba40d8c Expand section "Wallet transaction fees" & fix format and typos 2016-01-08 17:24:25 +01:00
MarcoFalke
b1a8374aaa
[qt] Intro: Display required space
Required space depends on the user's choice:
 -prune=0
 -prune=<n>
2016-01-08 11:22:08 +01:00
Jonas Schnelli
daa8da281b
Backport: quickfix for RPC timer interface problem 2016-01-08 11:09:34 +01:00
Holger Schinzel
920594453e [depends] Fix miniupnpc compilation on osx 2016-01-08 10:43:38 +01:00
MarcoFalke
fabba1c1a4 Update release-notes.md
Transaction memory pool limiting

Priority transactions

Wallet transaction fees
2016-01-07 16:46:03 +01:00
MarcoFalke
ff9b610026
[wallet] Add regression test for vValue sort order
- [wallet] Add regression test for vValue sort order
- [trivial] Merge test cases and replace CENT with COIN

Github-Pull: #7293
Rebased-From: fa3c7e644f faf538bfdb
2016-01-07 09:25:57 +01:00
MarcoFalke
1ed938b5fe
[qa] wallet: Check if maintenance changes the balance
- [qa] Cleanup wallet.py test
- [qa] check if wallet or blochchain maintenance changes the balance
- [walletdb] Add missing LOCK() in Recover() for dummyWallet

Github-Pull: #7229
Rebased-From: fa0765d433 fa14d99484 fa33d9740c
2016-01-07 09:19:25 +01:00
evan82
6ebd5d2090 Merge pull request #659 from thelazier/v0.12.1.x_openssl
Bump openssl to 1.0.1q
2016-01-05 10:41:31 -07:00
evan82
9a4a611b66 Merge pull request #658 from thelazier/v0.12.1.x_boost
Bump boost version to 1.59
2016-01-05 10:41:25 -07:00
evan82
eafba13a2e Merge pull request #657 from thelazier/v0.12.1.x_miniupnpc
Bump miniupnpc version to 1.9.20151026
2016-01-05 10:41:18 -07:00
evan82
1142c8e9ad Merge pull request #656 from thelazier/v0.12.1.x_native_protobuf
Bump native protobuf to 2.6.1
2016-01-05 10:41:08 -07:00
evan82
6939c4946d Merge pull request #655 from thelazier/v0.12.1.x_native_ccache
Bump native ccache to 3.2.4
2016-01-05 10:41:02 -07:00
evan82
54deb1e75b Merge pull request #650 from dashpay/v0.12.0.x
merge missing commits from V0.12.0.x
2016-01-05 10:39:39 -07:00
evan82
ad56d0cf0e Merge pull request #649 from UdjinM6/limitDenoms
Do not create denoms if there are DENOMS_COUNT_MAX (100) of them already
2016-01-05 10:39:26 -07:00
evan82
0616fbe1f9 Merge pull request #648 from UdjinM6/cmdlineDefaults
refactor DS/IX cmd-line params
2016-01-05 10:38:51 -07:00
evan82
ff2837c8e3 Merge pull request #645 from UdjinM6/refDS
fix the way anonymizable balance calculated, fix conditions for DS
2016-01-05 10:37:47 -07:00
evan82
f30a627f8b Merge pull request #640 from crowning-/Crownium
Crownium theme
2016-01-05 10:36:53 -07:00
evan82
b1525ba48e Merge pull request #636 from crowning-/patch-1
Non-critical CSS-error-messages removed from debug.log
2016-01-05 10:33:33 -07:00
MarcoFalke
333e1eaeea
Bump copyright headers to 2015
- Bump copyright headers to 2015
- [devtools] Rewrite fix-copyright-headers.py
- [devtools] Use git pretty-format for year parsing

Github-Pull: #7205
Rebased-From: fa6ad855e9 fa24439ff3 fa71669452
2016-01-05 14:13:33 +01:00
Jonas Schnelli
5cadf3eb60
[Qt] fix coincontrol update issue when deleting a send coin entry
Github-Pull: #7282
Rebased-From: 621bd6919f
2016-01-05 13:08:32 +01:00
MarcoFalke
bfdaa3c87f
[wallet] Adjust pruning test
Github-Pull: #7193
Rebased-From: fafd09375e
2016-01-05 12:57:57 +01:00
Suhas Daftuar
e08b7cb33c
Mark blocks with too many sigops as failed
Github-Pull: #7217
Rebased-From: 5246180f16
2016-01-05 12:05:28 +01:00
Wladimir J. van der Laan
3cb066c62b
Update translations after #7253
Include translations that omit raw number from the singular case.
2016-01-04 12:12:50 +01:00
Luke Dashjr
a75a03a5f2
Bugfix: update-translations: Allow numerus translations to omit %n specifier (usually when it only has one possible value)
Github-Pull: #7253
Rebased-From: 0d595894f0
2016-01-04 12:01:01 +01:00
MarcoFalke
bdd0f9e286
[qa] Move gen_return_txouts() to util.py
Github-Pull: #7250
Rebased-From: fa0a9749eb
2016-01-04 11:58:36 +01:00
MarcoFalke
f6c8c1242b
[gitian] Set reference date to something more recent
Github-Pull: #7251
Rebased-From: fa095622c2
2016-01-04 11:43:06 +01:00
MarcoFalke
e70fc6f842
[debian] Bump manpages and only mention -?
The manpages are outdated and are very rarely updated when changes
to the code happen.

Github-Pull: #7274
Rebased-From: fae7a369cb fa6ce44bf9
2016-01-04 10:05:34 +01:00
Wladimir J. van der Laan
5ba42bad6d
qt: periodic translations pull from transifex 2016-01-04 09:48:18 +01:00
Wladimir J. van der Laan
2d6a493493
Merge pull request #7245
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
2016-01-04 09:44:01 +01:00
Pieter Wuille
76de36fd2e
Report non-mandatory script failures correctly
Github-Pull: #7276
Rebased-From: 7ef8f3c072
2016-01-04 09:13:09 +01:00
Wladimir J. van der Laan
453c56701a
tests: Disable Tor interaction
This is unnecessary during the current tests (any test for Tor
interaction can explicitly enable it) and interferes with the proxy
test.

Github-Pull: #7170
Rebased-From: 4c40ec0451
2015-12-22 16:45:56 +01:00
Jonas Schnelli
9ef7c54ef0 [Tests] Add mempool_limit.py test
- [Tests] Add mempool_limit.py test
- [Tests] Refactor some shared functions

Github-Pull: #7153
Rebased-From: 110ff1142c 7632cf689a
2015-12-22 14:08:22 +01:00
Suhas Daftuar
301f16ad1c
Add more tests to p2p-fullblocktest
Github-Pull: #7226
Rebased-From: 9b41a5fba2
2015-12-22 09:54:52 +01:00