github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-19 05:58:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,786 Commits 6 Branches 150 Tags
37be168579a9ad1b94d73bc383ba003fe4dbca2d
Commit Graph
2786 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr 37be168579 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:23:33 +00:00
Luke Dashjr 747b688b54 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:18:01 +00:00
Luke Dashjr f9d1d13855 Update supported translations 2012-10-15 18:16:24 +00:00
Luke Dashjr a9f8791388 Merge branch '0.6.0.x' into 0.6.x 2012-10-15 18:14:15 +00:00
Luke Dashjr c87919696d Merge branch '0.5.x' into 0.6.0.x 2012-10-15 18:14:05 +00:00
Philip KaufmannandLuke Dashjr 8365992f90 fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cpp 
- also includes the required bitcoinstrings.cpp update
 2012-10-15 14:57:10 +00:00
Luke Dashjr 5dc6be8bba Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:45:19 +00:00
Luke Dashjr 38297ba90a Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:40:25 +00:00
Luke Dashjr 6ec7ac15ff Update supported translations 2012-10-09 23:28:53 +00:00
Luke Dashjr 3241935774 Merge branch '0.6.0.x' into 0.6.x 2012-10-09 23:17:49 +00:00
Luke Dashjr 4cf9b4c6fa Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/transactiondesc.cpp
 2012-10-09 23:17:43 +00:00
Luke Dashjr cef36fad89 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/init.cpp
 2012-10-09 23:16:24 +00:00
Gavin AndresenandLuke Dashjr b3f8f6ab94 Avoid crashes at shutdown due to printf() in global destructors. 2012-10-09 23:12:50 +00:00
Wladimir J. van der LaanandLuke Dashjr d37a2fd808 Send --help message to stdout i.s.o stderr 
This allows fun stuff such as `bitcoin --help | less`, and more
easy piping to files.

Looking at other tools such as bash, gcc, they all send their help
text to stdout.
 2012-10-09 23:04:59 +00:00
Wladimir J. van der LaanandLuke Dashjr 638cecee77 When datadir missing, show messagebox instead of printing error to stderr 2012-10-09 23:01:16 +00:00
Rune K. SvendsenandLuke Dashjr a7642282f6 When encrypting the wallet, warn user that old backups will become useless. 
Don't include HTML in translation strings. Do split the huge message over several lines.

Prettier lines
 2012-10-09 22:57:34 +00:00
kjj2andLuke Dashjr bced903ae5 Add a backup warning to the encryptwallet RPC command 2012-10-09 22:57:11 +00:00
Philip KaufmannandLuke Dashjr 135bee074d Windows: fix URI association setting in registry 
- fix for #1877
- fix was reported to work via
  https://bitcointalk.org/index.php?topic=110243.msg1230418#msg1230418
 2012-10-09 22:55:28 +00:00
xanatosandLuke Dashjr cc57473222 toHTML won't add empty wtx.mapValue elements 
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.

Removed a duplicated identical if

There are two equal ifs, one inside another. If the first one is true, then the second one is true.
 2012-10-09 22:52:35 +00:00
Philip KaufmannandLuke Dashjr 6a9a280ec7 change last occurance of mac to macx in Qt project-file 2012-10-09 22:38:28 +00:00
Gavin AndresenandLuke Dashjr d1b7590911 Compile/link Bitcoin-Qt.app with -pthread 2012-10-09 22:30:01 +00:00
Philip KaufmannandLuke Dashjr 207ef3008c additional fix for #1843 
- a shortcut on "receive coins" was used twice
 2012-10-09 22:22:07 +00:00
fanquakeandLuke Dashjr e25f0f0e53 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:18:21 +00:00
fanquakeandLuke Dashjr 599ec1e115 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:17:31 +00:00
Philip KaufmannandLuke Dashjr 9769d14f03 Change hotkey for "Send" button to "e" since "S" is already used for "Settings" menu 
Partial of upstream da9413d913
 2012-10-09 18:13:58 +00:00
Gavin AndresenandLuke Dashjr 3d6adbe71a Update gitignore and Makefiles for build.h move from src/ to src/obj 2012-10-09 18:07:44 +00:00
Luke Dashjr fe26948b79 Merge branch '0.6.0.x' into 0.6.x 2012-09-17 02:07:39 +00:00
Luke Dashjr e7770992ab Merge branch '0.5.x' into 0.6.0.x 2012-09-17 02:07:03 +00:00
Luke Dashjr 3a9899f6a8 Merge branch '0.4.x' into 0.5.x 2012-09-17 02:06:27 +00:00
Wladimir J. van der LaanandLuke Dashjr 1d89225320 update comment, secure_allocator is defined in allocators.h 2012-09-17 02:05:15 +00:00
Gregory MaxwellandLuke Dashjr a53b07313f Apply BIP30 checks to all blocks except the two historic violations. 
Matt pointed out some time ago that there existed a minor DOS
attack where a node in its initial block download could be wedged
by an overwrite attack in a fork created between checkpoints before
a time where BIP30 was enforced. Now that the BIP30 timestamp
is irreversibly past the check can be more aggressive and apply to
all blocks except the two historic violations.
 2012-09-17 02:03:44 +00:00
Luke Dashjr 6047902934 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:35:36 +00:00
Luke Dashjr be2e2845ec Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:32:18 +00:00
Luke Dashjr ea3e34dc3d Update supported translations 2012-09-11 00:59:16 +00:00
Luke Dashjr 894ce6d88d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_sv.ts
 2012-09-11 00:02:46 +00:00
Luke Dashjr 6d7b6681b6 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_pt_BR.ts
 2012-09-11 00:02:19 +00:00
Luke Dashjr cae8742130 Apply MIT license to md2k7 art 
[21:48:14] <md2k7> feel free to make it MIT if you like
 2012-09-11 00:00:25 +00:00
fanquakeandLuke Dashjr 82bcb7bf80 Docs Tidy up 
Partial of f00a0dcfed.
 2012-09-10 23:59:42 +00:00
Luke Dashjr 2ff8456c11 Bugfix: Correct doubled-up &amp;amp; in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:53:28 +00:00
Luke Dashjr 4c1bc22013 Bugfix: Correct doubled-up &amp;amp; in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:52:27 +00:00
xanatosandLuke Dashjr 7648cd46a4 Wrong address added to collection in test 
The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless).
 2012-09-10 23:50:18 +00:00
Luke Dashjr cfa880f8e3 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/net.cpp
 2012-09-10 23:48:18 +00:00
Luke Dashjr 9c82c574a0 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/net.cpp
 2012-09-10 23:42:59 +00:00
Luke Dashjr 6321b515f2 Merge branch '0.4.x' into 0.5.x 2012-09-10 23:42:15 +00:00
Jeff GarzikandLuke Dashjr 4ad495c243 select(): Use precise fd presence check, rather than imprecise hSocketMax test 2012-09-10 23:42:06 +00:00
Luke Dashjr 1ce15535f0 Bugfix: Don't consider invalid listening socket in hSocketMax 
Fixed upstream in 8f10a28890.
 2012-09-10 23:40:27 +00:00
Luke Dashjr 8b11bff10a Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-09-07 03:45:21 +00:00
Luke Dashjr 423cece29d Update supported translations 2012-09-07 00:32:15 +00:00
Luke Dashjr 3b5c5b817f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-09-06 23:14:53 +00:00
Luke Dashjr fc1cd74b86 Update supported translations 2012-09-06 22:49:23 +00:00