arno/bitcoinbook
1
0
Fork 0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-26 16:38:31 +00:00
Code Issues Releases Wiki Activity
3,287 Commits 2 Branches 8 Tags 64 MiB
e596e02229
Commit Graph

3287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas M. Antonopoulos
48887a1c0f Merge branch 'chapter/Chapter6' into develop 2014-06-28 12:22:07 -04:00
Andreas M. Antonopoulos
bf5fbb5dd5 into to blockchain and blocks 2014-06-28 12:21:07 -04:00
Minh T. Nguyen
009a1c7e07 Merge pull request #53 from Emzy/develop 
Spelling fix.
 2014-06-26 15:22:14 -07:00
Stephan Oeste
09553e11e9 Spelling fix. 
s/encumberance/encumbrance/
 2014-06-26 19:37:26 +02:00
Minh T. Nguyen
c185a29371 Merge pull request #52 from erikwam/patch-8 
Update ch05.asciidoc
 2014-06-26 07:24:18 -07:00
Minh T. Nguyen
87580891f0 Merge pull request #51 from erikwam/patch-7 
Update ch05.asciidoc
 2014-06-26 07:23:52 -07:00
Erik Wahlström
7335cf8c92 Update ch05.asciidoc 
typo
 2014-06-26 12:49:29 +02:00
Erik Wahlström
aa57657ab6 Update ch05.asciidoc 
typos
 2014-06-26 12:29:41 +02:00
Minh T. Nguyen
e4c1a740c3 Correcting the hexadecimal of the DOCPROOF identifier 2014-06-25 22:46:55 -07:00
Minh T. Nguyen
be23e23bd7 Changing Winter 2012 to late 2012, since Winter has a different time implications in other countries such as Australia 2014-06-25 22:40:59 -07:00
Minh T. Nguyen
53a1a7f17d Light copy-editing in chapter 5 2014-06-25 22:39:27 -07:00
Minh T. Nguyen
17eb6b378f Merge branch 'kargakis-develop' into develop 2014-06-25 21:14:23 -07:00
Minh T. Nguyen
9102c23db6 Merge conflicts from Pull #50 2014-06-25 21:14:09 -07:00
Andreas M. Antonopoulos
6e2caba813 Merge pull request #49 from richardkiss/develop 
First check-in of pycoin.asciidoc.
 2014-06-25 22:32:31 -04:00
amacdonald@oreilly.com
3142a92336 Made changes to ch05.asciidoc 2014-06-25 13:20:00 -07:00
Andreas M. Antonopoulos
141ef6a8bb ch6 outline 2014-06-25 12:44:27 -04:00
andreas@antonopoulos.com
970f0cae10 Updated book.asciidoc 2014-06-25 09:34:05 -07:00
Andreas M. Antonopoulos
3e6388c803 Merge branch 'chapter/Chapter5' into develop 2014-06-25 12:29:56 -04:00
Andreas M. Antonopoulos
81ea186efa clarified P2SH redeemScript requirements of isStandard 2014-06-25 12:29:24 -04:00
Andreas M. Antonopoulos
f4de47a3ac finished P2SH 2014-06-25 12:25:15 -04:00
Michalis Kargakis
503b0553db Minor syntax and grammar fixes 2014-06-25 15:44:30 +03:00
Minh T. Nguyen
69a4ec8ace Actual tiny merge of Issue #44 2014-06-24 23:44:51 -07:00
Minh T. Nguyen
578b3b6c75 Tiny partial merge of Issue #44 2014-06-24 23:31:31 -07:00
Andreas M. Antonopoulos
2c7a197045 updated scriptSig + scriptPubKey diagram 2014-06-24 20:31:18 -04:00
Andreas M. Antonopoulos
70dec1760e Merge branch 'develop' into chapter/Chapter5 2014-06-24 20:27:49 -04:00
Andreas M. Antonopoulos
67a77f49cf p2sh section 2014-06-24 20:27:02 -04:00
Andreas M. Antonopoulos
6ed49d07e7 Eugenia correction and gender pronoun fix 2014-06-24 14:26:33 -04:00
Andreas M. Antonopoulos
c14c56c23d Eugenia corrected gender pronouns 2014-06-24 14:23:10 -04:00
Andreas M. Antonopoulos
18daf24793 one OP_RETURN per Tx, small corrections 2014-06-24 13:06:40 -04:00
Andreas M. Antonopoulos
289523e9aa Corrections and new diagram for part 2 of P2PKH 2014-06-24 13:02:53 -04:00
Andreas M. Antonopoulos
d29c47fc49 Merge branch 'develop' into chapter/Chapter5 2014-06-24 12:43:13 -04:00
Andreas M. Antonopoulos
cf4b8963f1 Add simple match script execution steps 2014-06-24 12:33:35 -04:00
Andreas M. Antonopoulos
fb702a133a pay-to-public-key, op_return, p2sh draft, opcode tables 2014-06-24 12:01:40 -04:00
Andreas M. Antonopoulos
4272b825f8 updated image for script execution example 2014-06-22 12:02:07 -04:00
Andreas M. Antonopoulos
7a2624c76a Standard transaction scripts, P2PKH, Multi-signature 2014-06-20 11:33:01 -04:00
Andreas M. Antonopoulos
1934969b17 locking script, unlocking script and script execution 2014-06-19 21:39:34 -04:00
Steve Klise
c683ca1328 Merge branch 'master' of git.atlas.oreilly.com:oreillymedia/atlas_book_skeleton 
Conflicts:
	atlas.json
 2014-06-19 16:06:10 -07:00
Steve Klise
54a76872eb Merge pull request #6 from oreillymedia/no-title 
Remove "title" attribute from atlas.json
 2014-06-19 11:41:45 -07:00
Steve Klise
08a27f9cfb Update atlas.json 2014-06-19 11:15:39 -07:00
Andreas M. Antonopoulos
9815fbfc20 locktime and sequence # 2014-06-19 11:57:20 -04:00
Andreas M. Antonopoulos
3c7f830264 outputs, inputs and fees 2014-06-18 23:40:12 -04:00
Andreas M. Antonopoulos
1ed0260414 ch5 more 2014-06-18 20:05:23 -04:00
Administrator
3358d1a1e5 Fixing theme 2014-06-13 21:15:10 +00:00
Richard Kiss
47a8c93f4d First check-in of pycoin.asciidoc. 2014-06-11 17:44:48 -07:00
Andreas M. Antonopoulos
34362e9f84 TX and UTXO 2014-06-11 11:29:23 -07:00
Minh T. Nguyen
de7efe9eb9 Changing 'a 50% reductio'n to 'almost 50% reduction' suggested by Issue #43 2014-06-10 22:39:02 -07:00
Minh T. Nguyen
93183b310d Merge pull request #42 from kargakis/develop 
Display header on ch04 correctly
 2014-06-08 22:23:09 -07:00
Michalis Kargakis
0464511207 Display header on ch04 correctly 2014-06-08 03:41:59 +03:00
Andreas M. Antonopoulos
d00b2c921f Merge branch 'chapter/Chapter5' into develop 2014-06-07 12:25:45 -07:00
Minh T. Nguyen
25e32ccbc7 Better wording for 'be they are legitimate governments' from issue #41 2014-06-07 12:22:59 -07:00