Commit graph

5597 commits

Author SHA1 Message Date
langerhans 4717f6c1b6 Merge pull request #436 from langerhans/1.7-dev-shibeface
Bring back the shibeface!
2014-04-09 21:03:22 +02:00
langerhans 5018f6ed55 Merge pull request #437 from rnicoll/1.7-dev-maturity
Corrected coin maturity time shown in UI.
2014-04-09 21:01:45 +02:00
Ross Nicoll 57c02969f1 Corrected coin maturity time shown in UI. 2014-04-09 19:43:01 +01:00
langerhans 31a4a42bf3 s/bit/doge 2014-04-09 20:31:30 +02:00
langerhans c8c45f42a6 Fix intendation
Stupid editor!
2014-04-09 20:19:19 +02:00
langerhans fa33ce9b3b Port custom shibeface from b14d83aabd 2014-04-09 20:14:10 +02:00
langerhans 753eba9753 Bring back the shibeface! 2014-04-09 19:56:38 +02:00
langerhans a7ba819a5c Merge pull request #428 from leofidus/1.7-bitcoin-0.9.1
1.7 bitcoin 0.9.1
2014-04-08 20:24:18 +02:00
Wladimir J. van der Laan 3d7404246c gitian: Version bump for Qt dependency
Bump Qt dependency version after OpenSSL update.
Very important. Thanks @michagogo for noting.

Rebased-From: 178825d
(cherry picked from commit bitcoin/bitcoin@026a939bb6)
2014-04-08 14:23:53 +02:00
Wladimir J. van der Laan 6fa4493539 gitian: upgrade openssl to 1.0.1g for both win and linux
OpenSSL 1.0.1g fixes CVE-2014-0160.

Also bump dependency versions.

Rebased-From: 4a811b0
(cherry picked from commit bitcoin/bitcoin@bfeabe5873)

Conflicts:
	contrib/gitian-descriptors/deps-linux.yml
	contrib/gitian-descriptors/deps-win.yml
	contrib/gitian-descriptors/gitian-linux.yml
	contrib/gitian-descriptors/gitian-win.yml
	contrib/gitian-descriptors/qt-win.yml
	doc/release-process.md
2014-04-08 14:21:03 +02:00
Wladimir J. van der Laan 2fb828aaf2 gitian: add statically built variant of bitcoind/bitcoin-cli
Rebased-From: ddcd1af
(cherry picked from commit bitcoin/bitcoin@6848d180b2)

Conflicts:
	contrib/gitian-descriptors/gitian-linux.yml
2014-04-08 14:11:32 +02:00
langerhans 142489237c Merge pull request #426 from rnicoll/1.7-dev-italian
Corrections to Italian translation
2014-04-08 10:10:32 +02:00
voidref 9bcd81aff4 Merge pull request #425 from langerhans/1.7-dogechain-clean
Cleaned up version of #424

No comments for 12 hours = MERGE!
2014-04-07 23:41:59 -07:00
gabriele renzi 9b44ac9ee3
fix typos and bad translations
I feel the translation fileds should be shared betweenm the various *coin forks :(
Conflicts:

	src/qt/locale/bitcoin_it.ts
2014-04-07 21:43:30 +01:00
langerhans 8aee812f8d Notify user about a required restart, when he changes the ZeroConf option. 2014-04-07 19:21:39 +02:00
langerhans a4a8784ce8 Cleaned up version of #424 2014-04-07 18:49:01 +02:00
Alan Westbrook 0f24b826ba Fix header paths.
Add leveldb/helpers/memenv to the system include paths so as not to
break the other platforms.
2014-04-06 16:07:36 -07:00
langerhans a954d3f6bf Merge pull request #423 from rnicoll/1.7-dev-example
Corrected example addresses in UI to match translation files.
2014-04-06 20:04:30 +02:00
langerhans d6df72797a Merge pull request #422 from rnicoll/1.7-dev-cn
Merge Chinese translation changes into 1.7
2014-04-06 20:04:16 +02:00
langerhans 1d7e75ed08 Merge pull request #420 from rnicoll/1.7-dev-change
Add support for sending change to a list of address(es)
2014-04-06 20:03:56 +02:00
langerhans 31385ad552 Merge pull request #419 from rnicoll/1.7-dev-tests
Update tests to reflect Dogecoin rather than Bitcoin
2014-04-06 20:01:06 +02:00
langerhans d7cb887d8b Fix the "other" Mac build... 2014-04-06 19:55:00 +02:00
Ross Nicoll 15bfacfadf
Corrected example addresses in UI to match translation files. 2014-04-06 14:57:54 +01:00
Ross Nicoll a667d0afc1
Attempt to replace "Bitcoin" references with "Dogecoin" in Chinese translation. 2014-04-06 14:35:50 +01:00
Ryan Romanchuk 839be7270f
much 狗狗币. to the moon.
Conflicts:

	src/qt/locale/bitcoin_zh_CN.ts
2014-04-06 14:19:48 +01:00
Ross Nicoll 0282a9e112
Added Dogecoin copyright notice to wallet.cpp and wallet.h as modified files.
Removed comment about coin control from wallet.cpp as out of date.
2014-04-06 11:59:00 +01:00
Ross Nicoll 7b9fd3c025
Reverted accidental change to indentation. 2014-04-06 11:50:02 +01:00
Ross Nicoll 0f1f94b08e
Reworked fixed change address handling to parse addresses on init and store in a vector
within the wallet code.
2014-04-06 11:37:20 +01:00
Alan Westbrook d483617a2b Change sanitizing
Sanitize the type fix changes
Add a couple more while we are in there, really, int is not a size type.
2014-04-05 17:42:29 -07:00
Alan Westbrook 056bf29ce3 Fix 10.9 target vs 10.8 SDK mismatch
Were setting to deploy for 10.9 even though we said use the 10.8 sdk
2014-04-05 17:42:29 -07:00
Chris Moore fa3a670560
Document the -change option.
Conflicts:

	src/init.cpp
2014-04-05 23:46:01 +01:00
Chris Moore 37fd22772f
Allow a fixed list of change addresses.
Conflicts:

	src/wallet.cpp
2014-04-05 23:38:38 +01:00
Sam Garrett 36001b330d
test - fixed tests that were failing because of bit/litecoin cruft
Conflicts:

	src/test/Checkpoints_tests.cpp
	src/test/key_tests.cpp
2014-04-05 23:03:04 +01:00
voidref e9e06e8a03 Merge pull request #411 from jwiechers/patch-3
Update RELEASE_NOTES_1_7_alpha.md
Fix typos, much wow, so appreciate
2014-04-05 13:56:39 -07:00
voidref f06a8eb55a Merge pull request #418 from rnicoll/1.7-dev-readme
Add copyright notices to README.md
2014-04-05 13:55:38 -07:00
Alan Westbrook 33503805ae Hopefully fix ubuntu builds
* Change to run on 10.8 (compile against 10.8 sdk)
 * Make sure we only force boost_for in the mac project file where it’s
known to work.
2014-04-05 13:51:57 -07:00
Alan Westbrook 85774390e1 Fix patch file
Fix the broken patch
2014-04-05 13:24:59 -07:00
Ross Nicoll fcb39bfa7b
Added Litecoin copyright notice to README.md, for Scrypt elements.
Added Dogecoin copyright notice to README.md.
2014-04-05 14:38:03 +01:00
Alan Westbrook 79d8f59a7c update ignore
ignore my user specific project file stuff
2014-04-05 00:17:10 -07:00
Alan Westbrook 3b060c9fea Mac project update
Some missing things, like pre-compiled libs to make our life easier
2014-04-05 00:17:09 -07:00
Alan Westbrook 30053cfaa3 Lets get at least dogecoind building
This is an Xcode project and a script to wrangle boost to work on the
mac.
2014-04-05 00:17:09 -07:00
langerhans 328d280f17 Merge pull request #417 from leofidus/1.7-uritests
unit tests: fix uritests
2014-04-04 20:28:11 +02:00
langerhans 88d29a1d3c Merge pull request #416 from leofidus/patch-1
Correct handling of dogecoin:// URI scheme
2014-04-04 20:27:59 +02:00
langerhans 7c16b0554d Merge pull request #415 from leofidus/1.7-testnetseeds
add testnet seeds
2014-04-04 20:27:09 +02:00
leofidus d08eec3964 fix uri parsing 2014-04-04 19:08:44 +02:00
Jannis Froese 895203e0f6 unit tests: fix uritests 2014-04-04 18:50:59 +02:00
leofidus 9677d928be Correct handling of dogecoin:// URI scheme 2014-04-04 18:29:05 +02:00
Jannis Froese d5b4b85c8e add testnet seeds 2014-04-04 18:03:12 +02:00
jwiechers cfa3dc8f38 Update RELEASE_NOTES_1_7_alpha.md
Fixed a typo and a couple of phrases. :)
2014-04-04 02:13:08 +02:00
langerhans 1c68c4617d Merge pull request #410 from rnicoll/1.7-dev-debian
Replace Bitcoin references in Debian contrib
2014-04-04 01:03:15 +02:00