1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-25 07:58:15 +00:00
Commit Graph

2049 Commits

Author SHA1 Message Date
Andreas M. Antonopoulos
141ec45838 Merge branch 'develop' 2017-04-03 12:15:56 -07:00
Andreas M. Antonopoulos
e70bff35b9 chanelog for second edition 2017-04-03 12:14:01 -07:00
Matthew Hacker
b90b59a573 Fixing some markup that stops Asciidoctor conversions and running intake script 2017-03-29 16:40:18 -04:00
mhacker@oreilly.com
354e05afb0 Updated atlas.json 2017-03-29 13:32:20 -07:00
Will Binns
f3b980953e Merge pull request #292 from cherouvim/patch-1
Fix alphabetical order of wallets.
2017-03-29 14:02:52 -06:00
Will Binns
4f66d027a8 Merge pull request #291 from francyi/patch-2
Fix link to coloredcoins.org
2017-03-29 14:01:58 -06:00
Will Binns
c73913b50f Merge pull request #295 from michaelcippolito/develop
Update Contributor Full Name
2017-03-29 14:01:11 -06:00
Will Binns
753aa8dd52 Merge pull request #296 from dindinw/develop
Update ch04.asciidoc, no RPC client functionality in bitcoind
2017-03-29 14:00:41 -06:00
Alex Wu
c9da42069e Update ch04.asciidoc
no RPC client functionality in bitcoind anymore. Use the bitcoin-cli utility instead.
2017-03-29 22:42:33 +08:00
Michael C. Ippolito
d66f6c5e72 Update Contributor Full Name
Requesting update to include full name.

Respectfully,
Michael C. Ippolito
2017-03-26 18:15:02 -04:00
dfauxsmith@oreilly.com
639ceed12d Updated atlas.json 2017-03-24 12:47:20 -07:00
Ioannis Cherouvim
3be8de6b40 Fix alphabetical order of wallets.
Copay was before Breadwallet.
2017-03-24 07:20:30 +02:00
Frank Höger
73df222580 Fix link to coloredcoins.org
It seems coloredcoins.org doesn't support https
2017-03-23 00:03:24 +01:00
tmcgovern@oreilly.com
80773b8c5c Edited ch09.asciidoc with Atlas code editor 2017-03-22 10:24:28 -07:00
tmcgovern@oreilly.com
f949b0b39b Updated atlas.json 2017-03-22 10:18:05 -07:00
Will Binns
83eab4bb87 Merge pull request #288 from dimitris-t/patch-4
bitcoinj moved from Google Code -> Github
2017-03-20 16:53:24 -06:00
Dimitris Tsapakidis
4e689dc92b bitcoinj moved from Google Code -> Github
https://code.google.com/p/bitcoinj/ now redirects to https://bitcoinj.github.io, hence the URL change in ch03.asciidoc
2017-03-21 01:04:21 +04:00
Will Binns
a7ac8915ab Merge pull request #286 from dimitris-t/patch-2
Bitcoins -> bitcoin in glossary.asciidoc
2017-03-20 11:01:52 -06:00
Will Binns
012fa60719 Merge pull request #285 from dimitris-t/patch-1
Typo in glossary.asciidoc
2017-03-20 11:01:30 -06:00
Will Binns
9d2555e7b7 Merge pull request #284 from dimitris-t/patch-13
Typo in appdx-future-segwit.asciidoc
2017-03-20 11:00:50 -06:00
Will Binns
fa7149a15a Merge pull request #287 from dimitris-t/patch-3
bitcointrezor.com -> trezor.io in ch11.asciidoc
2017-03-20 10:59:51 -06:00
Will Binns
bdffc64ce5 Merge pull request #283 from dimitris-t/patch-12
Typo in appdx-future-segwit.asciidoc
2017-03-20 10:59:05 -06:00
Dimitris Tsapakidis
98a370e947 bitcointrezor.com -> trezor.io in ch11.asciidoc
Updates http://bitcointrezor.com/ to https://trezor.io/ per announcement in https://blog.trezor.io/new-trezor-io-55cf687c88d5#.tz5fabret
2017-03-20 01:24:17 +04:00
Dimitris Tsapakidis
1cf2ed93a5 Bitcoins -> bitcoin in glossary.asciidoc
Changes multiple instances of "bitcoins" into "bitcoin" in glossary.asciidoc. Per Pull Request #218 all instances of "bitcoins" in the book got replaced with "bitcoin".
2017-03-20 00:51:00 +04:00
Dimitris Tsapakidis
fc0928acb3 Typo in glossary.asciidoc
3 instances of "akka" turned into "aka" (also known as).
2017-03-20 00:47:16 +04:00
Dimitris Tsapakidis
78ca00b533 Typo in appdx-future-segwit.asciidoc
All headings in this appendix have the the first letter for each word capitalized. Except for this heading. 

"Transaction malleability" -> "Transaction Malleability"
2017-03-19 20:17:56 +04:00
Dimitris Tsapakidis
c6fb9b07a7 Typo in appdx-future-segwit.asciidoc
"that takes into considerations a number of factors" -> "that takes into consideration a number of factors"
2017-03-19 20:12:24 +04:00
Will Binns
c410c568d1 Merge pull request #282 from bitcoinbook/wbnns-misc-fixes
Miscellaneous fixes
2017-03-19 08:51:46 -06:00
Will Binns
c73853572a
ch12: Fix link regarding LN ident and auth
Closes #263
2017-03-19 08:47:01 -06:00
Will Binns
05dae7c2e2
ch12: Fix grammar, 'viable if R is revealed'
Closes #262
2017-03-19 08:42:28 -06:00
Will Binns
3fa3de3818
ch12: Fix grammar, 'elaborate by'
Closes #260
2017-03-19 08:40:30 -06:00
Will Binns
6ba374123c
preface: Update contributors 2017-03-19 08:19:26 -06:00
Will Binns
af0d24f8ed Merge pull request #250 from bitcoinctf/patch-1
Fix two typos/spelling errors
2017-03-19 08:14:15 -06:00
Will Binns
5e42cf0f97 Merge pull request #264 from dimitris-t/patch-1
Typo in ch12.asciidoc
2017-03-19 08:13:46 -06:00
Will Binns
822ad88080 Merge pull request #266 from dimitris-t/patch-3
Typos in ch10.asciidoc
2017-03-19 08:13:12 -06:00
Will Binns
4242ec7f38 Merge pull request #269 from dimitris-t/patch-5
Typo in ch01.asciidoc
2017-03-19 08:10:17 -06:00
Will Binns
24877cea80 Merge pull request #272 from dimitris-t/patch-6
Typo in ch12.asciidoc
2017-03-19 08:07:09 -06:00
Will Binns
fc59ec4cd3 Merge pull request #273 from dimitris-t/patch-7
Typo in ch12.asciidoc
2017-03-19 08:06:17 -06:00
Will Binns
f11f67579e Merge pull request #274 from dimitris-t/patch-8
Typo in ch12.asciidoc
2017-03-19 08:04:29 -06:00
Will Binns
2c5b5b6648 Merge pull request #275 from dimitris-t/patch-9
Typo in ch12.asciidoc
2017-03-19 08:03:54 -06:00
Will Binns
f863406422 Merge pull request #276 from dimitris-t/patch-10
Update ch12.asciidoc
2017-03-19 08:02:20 -06:00
Will Binns
ce20d4814b Merge pull request #277 from dimitris-t/patch-11
Typos in glossary.asciidoc
2017-03-19 08:01:30 -06:00
Will Binns
e48695808e Merge pull request #279 from halseth/develop
Lightning Network announced in 2015
2017-03-19 07:59:45 -06:00
Will Binns
dbab2f368f Merge pull request #280 from bokobza/patch-2
build-msw.md is now called build-windows.md
2017-03-19 07:57:56 -06:00
Jeremy Bokobza
5ae641fce6 build-msw.md is now called build-windows.md 2017-03-16 13:37:24 +00:00
halseth
f24b5cee96 Set first LN draft to Feb 2015 2017-03-16 00:40:20 +00:00
Dimitris Tsapakidis
56326b5154 Typos in glossary.asciidoc
"the the block chain" -> "the blockchain"
spendingy -> spending
commiting -> committing
unlimted -> unlimited
2017-03-15 05:32:07 +04:00
Dimitris Tsapakidis
91590abd8f Update ch12.asciidoc
Fixes #256. Merged these two fragments into a sentence: "The second problem is that" and "Since each subsequent commitment transaction"
2017-03-15 05:12:03 +04:00
Dimitris Tsapakidis
d2b7a90b25 Typo in ch12.asciidoc
Fixes #252. Added full stop at the end of "The output containing the OP_RETURN is called the marker output"
2017-03-15 05:00:25 +04:00
Dimitris Tsapakidis
59a4532f40 Update ch12.asciidoc
Fixes #259. "Anyone who know he secret" -> "Anyone who know the secret"
2017-03-15 04:55:09 +04:00