Commit Graph

6408 Commits

Author SHA1 Message Date
evan82
157800109c Merge pull request #160 from UdjinM6/v0.11.1.x_fix
fix log message
2015-02-04 14:18:59 -07:00
evan82
0fe4d6a17c Merge pull request #159 from UdjinM6/v0.11.1.x_fix_ds_anon
use only completely anonymized denoms when sending ds tx
2015-02-04 14:18:28 -07:00
Evan Duffield
6ae98a8790 use authoritive block height for IX 2015-02-04 14:09:50 -07:00
Evan Duffield
2a0d3dfb9d Use hash after transaction was mined
- Prevents an attacker from gaming which masternodes they'll use
2015-02-04 13:25:12 -07:00
Evan Duffield
712eb7e9d9 improved conflict resolution 2015-02-04 13:20:13 -07:00
vertoe
7e8d8c9681 Fix typo in darksend. 2015-02-04 20:55:14 +01:00
UdjinM6
5e73fdb9b1 fix log message 2015-02-04 21:38:40 +03:00
UdjinM6
1583469c49 use only completely anonymized denoms when sending ds tx 2015-02-04 20:37:30 +03:00
Evan Duffield
d13de27d57 implemented txlock conflict resolution 2015-02-04 09:39:45 -07:00
Evan Duffield
6faa140c49 reference node fix 2015-02-04 08:57:09 -07:00
Evan Duffield
65612697ca Added better error messages 2015-02-04 08:37:49 -07:00
Evan Duffield
741f85c358 Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-04 08:24:58 -07:00
Evan Duffield
186699abff Masternode payment improvements / release notes 2015-02-04 08:24:34 -07:00
evan82
a9dfc5846d Merge pull request #158 from vertoe/devel-0.9
Translate untranslated Strings
2015-02-04 07:59:47 -07:00
vertoe
cae07699f2 Pull translations from transifex. 2015-02-04 15:58:34 +01:00
vertoe
6ca5b2cd82 Minor fix for bavarian language. 2015-02-04 15:58:07 +01:00
vertoe
969c768922 merge downstream 0.11.1 2015-02-04 15:45:16 +01:00
vertoe
d9aece309a Pull translations from transifex. 2015-02-04 15:44:59 +01:00
Evan Duffield
5cae323d29 Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-04 07:44:50 -07:00
vertoe
ea48a14424 Merge downstream 0.11.1. 2015-02-04 15:44:38 +01:00
Evan Duffield
efe22ea1ae fixed segfault 2015-02-04 07:44:23 -07:00
vertoe
86ca90d9b3 Translate darksend messages. 2015-02-04 14:24:56 +01:00
Evan Duffield
454154c18f fixed min IX fee 2015-02-04 05:00:17 -07:00
vertoe
ab50ebb7c0 Pull translations from transifex. 2015-02-04 12:49:53 +01:00
vertoe
86db4eb853 Fix project file and update translation source file. 2015-02-04 12:48:39 +01:00
Evan Duffield
f811957208 added release nodes for 11.1 2015-02-04 04:20:37 -07:00
vertoe
aafdd64292 Add qtcreator files to gitignore. 2015-02-04 12:17:42 +01:00
vertoe
23963ba391 merge downstream 0.11.1 2015-02-04 12:06:34 +01:00
vertoe
2a6060467e Pull translations from transifex. 2015-02-04 12:06:21 +01:00
Evan Duffield
470a845c01 added release notes 2015-02-04 04:02:25 -07:00
vertoe
04fdf9d124 Fix untranslated strings and typos. 2015-02-04 12:00:23 +01:00
Evan Duffield
b1c772a190 minimum fees for IX 2015-02-04 03:44:41 -07:00
evan82
8f2aa62fc0 Merge pull request #157 from UdjinM6/v0.11.1.x_explicit_6_ix_confirm
use more common syntax to make it clear that actually 6 block-level confirmations are required for IX to work / +comments
2015-02-04 03:30:16 -07:00
UdjinM6
877405c8fb use more common syntax to make it clear that actually 6 confirmations are required for IX to work / +comments 2015-02-04 13:20:33 +03:00
vertoe
8de2f06884 Pull translations from transifex. 2015-02-04 10:08:59 +01:00
vertoe
498ed85dc5 merge downstream 0.11.1 2015-02-04 10:08:03 +01:00
Evan Duffield
6bd911bfca version bump 2015-02-03 18:36:17 -07:00
Evan Duffield
d4896934e1 add transaction scanning for new transactions 2015-02-03 18:35:29 -07:00
Evan Duffield
e3ef585263 minor changes 2015-02-03 18:19:54 -07:00
Evan Duffield
d912f3466a version bump 2015-02-03 16:00:48 -07:00
Evan Duffield
f4b26d6f10 Enforcing IX locks
- Scan IX locks on new blocks to make sure no conflicting txes are present
- Upon completion of a IX lock, check for conflicts and remove blocks if needed
2015-02-03 15:40:00 -07:00
vertoe
bb746b50bb merge downstream 0.11.1 2015-02-03 23:23:52 +01:00
Evan Duffield
13175a3c52 Fixed minconfirmations for IX 2015-02-03 15:20:13 -07:00
evan82
62bdb540f3 Merge pull request #155 from UdjinM6/v0.11.1.x_fix_conflicted
clear vValue in SelectCoinsMinConf - should fix an issue with conflicted txes
2015-02-03 14:51:12 -07:00
evan82
1f31768d68 Merge pull request #154 from crowning-/patch-3
"Debug window" -> "Tools window" renaming
2015-02-03 14:51:03 -07:00
evan82
f6f0ad4ee2 Merge pull request #153 from crowning-/patch-2
Fixed cut-off strings in overview page
2015-02-03 14:50:47 -07:00
evan82
d0b419cc59 Merge pull request #152 from crowning-/patch-1
"Last Darksend message" text added in overview page
2015-02-03 14:50:33 -07:00
evan82
2b8ceaf0fb Merge pull request #151 from UdjinM6/v0.11.1.x_fix_ds_nonIXdepth
V0.11.1.x fix ds non i xdepth
2015-02-03 14:50:19 -07:00
UdjinM6
1d3e296613 clear vValue in SelectCoinsMinConf - should fix issue with conflicted txes 2015-02-04 00:00:54 +03:00
crowning-
abd16172c0 It's not a debug-only window anymore
Someone (vertoe :-) ) has to add/replace this string in the locale files.
2015-02-03 21:57:47 +01:00