1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-03 05:18:30 +00:00
Commit Graph

2210 Commits

Author SHA1 Message Date
Minh T. Nguyen
af75efa45e Changin Spring of 2013 to early 2013, since seasons like spring,winter mean different parts of the year in different hemispheres 2014-08-11 20:42:21 -07:00
Minh T. Nguyen
70f6ae21e5 Copyediting of chapter 6, part 1 2014-08-11 19:42:08 -07:00
Minh T. Nguyen
39c3584de9 Merge branch 'EdLeafe-ch05' into develop 2014-08-10 22:26:16 -07:00
Minh T. Nguyen
868576d16e Merge branch 'ch05' of https://github.com/EdLeafe/bitcoinbook into EdLeafe-ch05 2014-08-10 22:24:12 -07:00
Minh T. Nguyen
4869400db4 Merge branch 'erikwam-patch-14' into develop 2014-08-10 22:21:32 -07:00
Minh T. Nguyen
a3daf44a57 Undoing or fixing some of the proposed changes from Issue #90 2014-08-10 22:21:15 -07:00
Minh T. Nguyen
7b665be009 Resolve merge conflicts following pull for issue #90 2014-08-10 22:11:25 -07:00
Minh T. Nguyen
1579482b17 Merge branch 'kargakis-ch08-fixes' into develop 2014-08-10 21:44:25 -07:00
Minh T. Nguyen
4b866d2826 Undoing a comma from Issue #89 as it's not an enumeration of items 2014-08-10 21:43:58 -07:00
Minh T. Nguyen
2c0b6dcd18 Resolving merge conflicts with merge from issue #89 2014-08-10 21:42:31 -07:00
Minh T. Nguyen
de0114f533 Merge pull request #88 from edeykholt/patch-2
grammar and punctuation Chapter 8
2014-08-10 21:15:58 -07:00
Minh T. Nguyen
a6df2c7671 Merge branch 'edeykholt-patch-1' into develop 2014-08-10 21:12:21 -07:00
EdLeafe
7524bd7288 Minor grammar fixes. 2014-08-10 13:56:36 -05:00
Andreas M. Antonopoulos
4d4a5e392e intro ch9 2014-08-10 11:39:56 -05:00
Erik Wahlström
3f12d6703b Update ch08.asciidoc
Proposed changes
2014-08-09 22:42:17 +02:00
Michalis Kargakis
8fc0a6f0f8 Ch.8 first parts fixes 2014-08-09 20:34:06 +03:00
Ed Eykholt
d1f5a6ae67 grammar and punctuation Chapter 8 2014-08-08 21:42:20 -07:00
Ed Eykholt
a45dcc8f04 minor punctuation changes ch07.asciidoc 2014-08-08 20:57:27 -07:00
Minh T. Nguyen
4e400a8cae Merge pull request #83 from kargakis/example
Add websocket example
2014-08-08 07:03:05 -07:00
Andreas M. Antonopoulos
6d94cc2331 first commit of ch9 2014-08-07 17:34:16 -05:00
Andreas M. Antonopoulos
ba54306a8d Merge branch 'develop' 2014-08-07 13:39:42 -05:00
Andreas M. Antonopoulos
1e4501283e Merge branch 'chapter/Chapter8' into develop 2014-08-07 13:38:52 -05:00
Andreas M. Antonopoulos
e173d9e826 mining pools, p2pool, consensus attacks 2014-08-07 13:38:02 -05:00
Michalis Kargakis
db9d1352b1 Add websocket example 2014-08-07 15:01:22 +03:00
Minh T. Nguyen
433381f6a6 Fix spelling of frequency hopping from Issue #82 2014-08-05 23:37:56 -07:00
Minh T. Nguyen
c97ba5a949 Merge branch 'develop' of https://github.com/aantonop/bitcoinbook into develop 2014-08-05 23:33:36 -07:00
Minh T. Nguyen
83f0f8aa5c Resolve merge conflicts in chapter 5 2014-08-05 23:33:20 -07:00
Minh T. Nguyen
d9e0b6911d Resolving merge conflicts 2014-08-05 23:25:43 -07:00
Minh T. Nguyen
3f52762ee4 Merge pull request #79 from kargakis/btcd-info
More info about btcd
2014-08-05 22:57:31 -07:00
Minh T. Nguyen
272f66f167 Merge pull request #77 from kargakis/add-example
Extract info from pk script example
2014-08-05 22:38:06 -07:00
Ed Eykholt
1235ee6b74 Grammar changes for Chapter 6 2014-08-02 09:50:28 -07:00
Ed Eykholt
7e472c28b9 grammar fixes for ch05.asciidoc
This change still reads somewhat ambiguous. Although clearly lightweight clients don't contain a full blockchain, some mining nodes do.
2014-08-02 09:43:52 -07:00
Ed Eykholt
482ca6354e grammar fixes for ch06.asciidoc 2014-08-02 09:33:15 -07:00
Ed Eykholt
f553fdc4ab Update ch06.asciidoc 2014-08-02 07:53:16 -07:00
Michalis Kargakis
ca0b8fd8c9 More info about btcd 2014-08-02 15:12:22 +03:00
Ed Eykholt
02888c1c0b grammar fixes for ch05.asciidoc 2014-08-01 17:46:47 -07:00
andreas@antonopoulos.com
02c6ea5f63 Updated book.asciidoc 2014-08-01 08:15:08 -07:00
Andreas M. Antonopoulos
1d0cf1166d forks, difficulty target, two new diagrams 2014-08-01 11:11:54 -04:00
Andreas M. Antonopoulos
e2d4d7099f Merge branch 'develop' 2014-07-31 18:12:18 -04:00
Andreas M. Antonopoulos
51198bdd99 undo CR/LF line ending 2014-07-31 18:11:11 -04:00
Andreas M. Antonopoulos
d5dd47b7d2 Merge branch 'chapter/Chapter8' into develop 2014-07-31 17:22:39 -04:00
Andreas M. Antonopoulos
c335c1cf6d difficulty targeting, block validation, chain selection 2014-07-31 17:22:08 -04:00
Michalis Kargakis
5da0b85ced Extract info from pk script example
Code example where we extract information from a public key script. Use
go run [filename].go to run every go example instead of go build.
2014-07-31 20:21:26 +03:00
Ed Eykholt
87b5e66dab minor grammar fixes ch05.asciidoc 2014-07-31 09:32:44 -07:00
Ed Eykholt
84ce904466 Grammar changes (mostly) for ch05.asciidoc 2014-07-31 09:15:51 -07:00
Minh T. Nguyen
d5cb6b20b5 Merge branch 'edeykholt-develop' into develop 2014-07-31 00:04:28 -07:00
Minh T. Nguyen
713fe0e562 More revertion to original text or minor text adaptation following the merge from #74 2014-07-31 00:04:13 -07:00
Minh T. Nguyen
55ca4759ab Undoing some merges from #74 where the text changed to drastically from its original 2014-07-30 23:44:12 -07:00
Minh T. Nguyen
3b094972b2 Merge branch 'develop' of https://github.com/edeykholt/bitcoinbook into edeykholt-develop 2014-07-30 23:20:34 -07:00
Minh T. Nguyen
87e7ddcd4a Merge branch 'develop' of https://github.com/aantonop/bitcoinbook into develop 2014-07-30 22:31:58 -07:00