Commit Graph

6706 Commits

Author SHA1 Message Date
crowning-
35bc99a2a4 Added automake to build requirements
At least Ubuntu >= 14.04 based distributions don't have automake installed by default.
2015-02-21 18:40:33 +01:00
crowning-
4874f00819 Added automake to build requirements
At least Ubuntu >= 14.04 based distributions don't have automake installed by default.
2015-02-21 18:38:49 +01:00
snogcel
99fecc3ce3 CSS WIP v4 2015-02-21 10:18:42 -07:00
snogcel
9ed81b4fef Merge branch 'v0.11.2.x' of http://www.github.com/crowning2/darkcoin into v0.11.2.x 2015-02-20 01:03:30 -07:00
snogcel
91034fdb4f CSS WIP v3 2015-02-20 01:02:38 -07:00
snogcel
d31aef41ea Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-02-19 21:40:36 -07:00
Alex Morcos
9cd1dd9f6b Fix priority calculation in CreateTransaction
Make this projection of priority in 1 block match the calculation in the low priority reject code.

Rebased-From: 2d9b0b7f03
Github-Pull: #5675

Conflicts:
	src/wallet.cpp
2015-02-19 19:20:05 -08:00
crowning2
2babac5087 Daily update from Evan's repository 2015-02-19 21:37:29 +01:00
evan82
d1a22ad9f9 Merge pull request #192 from darkcoin/revert-191-revert-187-devel-0.9-strings
Revert "Revert "Rebrand to darkcoin""
2015-02-19 11:58:50 -07:00
evan82
3bb9ef96f4 Revert "Revert "Rebrand to darkcoin"" 2015-02-19 11:58:38 -07:00
evan82
93efb82ab1 Merge pull request #191 from darkcoin/revert-187-devel-0.9-strings
Revert "Rebrand to darkcoin"
2015-02-19 11:28:58 -07:00
evan82
516f590c65 Revert "Rebrand to darkcoin" 2015-02-19 11:28:40 -07:00
Evan Duffield
8e1eaf983d Enable darksend balance only when LiteMode is disabled 2015-02-19 11:22:00 -07:00
evan82
70a5555dc8 Merge pull request #190 from vertoe/devel-0.9
Check pindexBestForkBase for null
2015-02-19 08:44:31 -07:00
vertoe
08b1667141 merge upstream 0.9 2015-02-19 15:11:06 +01:00
crowning2
f17cba65f2 Daily merge of Evans changes 2015-02-19 14:11:13 +01:00
Evan Duffield
b5f6f0e7a7 minimum collateral amount
In the case where collateral is made as COLLATERAL*5, then
used 4 times, it will result in an input exactly COLLATERAL sized.
When used as a collateral transaction this will result in 1 input of
COLLATERAL and zero outputs (due to collateral being paid solely in fees).
zero output transactions aren't supported, so it'll result in DS failure.
2015-02-18 12:17:45 -07:00
evan82
de3c18cde8 Merge pull request #189 from UdjinM6/v0.11.2.x_clear_out_ds_fee
clear out DS fee / collateral clean up
2015-02-18 12:14:05 -07:00
evan82
52f7828785 Merge pull request #188 from UdjinM6/v0.11.2.x_typo
(v0.11.2.x) typo: succesful->successful
2015-02-18 12:10:55 -07:00
evan82
5c38c69f0c Merge pull request #187 from vertoe/devel-0.9-strings
Rebrand to darkcoin
2015-02-18 12:10:45 -07:00
evan82
8a450f66a2 Merge pull request #186 from vertoe/devel-0.9
Draft release notes for 0.11.2 to include BIP 66.
2015-02-18 12:09:27 -07:00
21E14
74f29c2737
Check pindexBestForkBase for null
Rebased-From: 730b1ed1a0
Github-Pull: #5154
2015-02-18 18:31:41 +01:00
UdjinM6
55faae269c clear out DS fee 2015-02-18 15:31:40 +03:00
snogcel
3e86ce27ae CSS WIP v2 2015-02-17 22:42:30 -07:00
snogcel
d168e605bc Merge branch 'v0.11.2.x' of http://www.github.com/crowning2/darkcoin into v0.11.2.x 2015-02-17 20:23:24 -07:00
snogcel
a78c5e9680 WIP drkblue.css 2015-02-17 20:22:32 -07:00
crowning2
ea0841ae59 Padding for underscores in button added 2015-02-17 21:49:02 +01:00
crowning2
33e3cb08dd CSS updated again 2015-02-17 21:43:25 +01:00
crowning2
3bd87fecaf Recolored "Recent transactions" listbox 2015-02-17 21:12:27 +01:00
crowning2
8a4383ca39 Unused toolbar icon removed 2015-02-17 20:38:37 +01:00
crowning2
79aa755396 Daily merge upstream 2015-02-17 19:59:54 +01:00
Evan Duffield
ecd37e134e Change darksend fee to 0.01DRK and charge in 1 in 10 sessions 2015-02-17 07:04:42 -07:00
UdjinM6
f87ccb1588 typo: succesful->successful 2015-02-17 13:27:47 +03:00
vertoe
a104f2383f Fix windows copyright strings. 2015-02-17 10:53:03 +01:00
snogcel
ac3030cc65 CSS debug override 2015-02-16 20:12:06 -07:00
vertoe
81ab7bec0e Update release notes for 0.11.2. 2015-02-16 23:37:46 +01:00
vertoe
3f0f146258 Update release notes for 0.11.2. 2015-02-16 23:33:51 +01:00
vertoe
277ed42040 Remove obsolete bitcoin resource files for windows. 2015-02-16 23:22:56 +01:00
vertoe
a179777a0a Rename darkcoin config header. 2015-02-16 23:19:42 +01:00
vertoe
97600bbfba Rename darkcoin resource files for windows. 2015-02-16 23:05:58 +01:00
vertoe
6d60156dce Fix darkcoin resource file. 2015-02-16 22:54:26 +01:00
vertoe
b1170309a4 Rename darkcoin resource file. 2015-02-16 22:43:16 +01:00
vertoe
9b730c7826 Pull translations from transifex. 2015-02-16 22:36:58 +01:00
vertoe
dc149f0e78 Update source translation file. 2015-02-16 22:30:17 +01:00
vertoe
91adbde525 Rename darkcoinstrings file. 2015-02-16 22:28:38 +01:00
crowning2
b7db590168 Initial commit 2015-02-16 22:12:13 +01:00
crowning2
52d58c26c9 Initial commit 2015-02-16 22:01:13 +01:00
crowning2
f66c347cb9 Test 2015-02-16 21:59:11 +01:00
crowning2
4eedb11cf6 Initial commit 2015-02-16 21:52:37 +01:00
vertoe
0727222fff merge downstream 0.11.2 2015-02-16 21:09:20 +01:00