1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-24 23:48:32 +00:00
Commit Graph

606 Commits

Author SHA1 Message Date
Andreas M. Antonopoulos
7a65e9c2dd Merge branch 'chapter/Chapter9' into develop 2014-08-17 18:10:21 -04:00
Andreas M. Antonopoulos
a504a4f093 updated Myriad info 2014-08-17 18:09:48 -04:00
Andreas M. Antonopoulos
605537d1e1 Merge pull request #97 from simondlr/develop
Reworked and added additional information on Namecoin's namespecs.
2014-08-17 18:06:26 -04:00
Simon de la Rouviere
4689a7da17 Reworked and added additional information on Namecoin's namespecs. 2014-08-17 21:56:02 +02:00
Andreas M. Antonopoulos
316e2e096e Merge branch 'chapter/Chapter9' into develop 2014-08-17 15:27:50 -04:00
Andreas M. Antonopoulos
99a4e57be2 PoS description 2014-08-17 15:26:30 -04:00
Andreas M. Antonopoulos
0e942b00c2 chapter 9 end 2014-08-17 15:22:49 -04:00
Andreas M. Antonopoulos
700c7b9f19 alt-chains done, meta-coins started 2014-08-16 23:37:06 -04:00
Andreas M. Antonopoulos
dfa8b2cdfa anonymity alt-coins 2014-08-14 14:05:06 -04:00
Andreas M. Antonopoulos
f08eb048ec multi-purpose mining alt-coins 2014-08-14 11:31:10 -04:00
Andreas M. Antonopoulos
54eff57753 alt-coins pt 1 2014-08-13 22:42:10 -04:00
Minh T. Nguyen
bedd43ad53 Merge pull request #96 from belovachap/develop
Wee typo "is collection" -> "is a collection"
2014-08-12 17:37:07 -07:00
Chapman Shoop
ee130bf277 Wee typo "is collection" -> "is a collection" 2014-08-12 17:00:35 -07:00
Minh T. Nguyen
0283588c75 Changing commutative to associative when discussing properties of addition per issue #95 2014-08-12 08:36:11 -07:00
Minh T. Nguyen
30d6e767aa Fixing decimal calculation of target difficulty per Issue #93 2014-08-12 08:27:18 -07:00
Minh T. Nguyen
8f1eee6309 Removed reference to checklist as that doesn't come until chapter 8. Rewording of sentence per Issue #72 2014-08-12 08:00:25 -07:00
Minh T. Nguyen
4fe0bc317a Update Bloom filter examples 4 and 5 to hash the appropriate inputs X and Y 2014-08-12 07:50:05 -07:00
Minh T. Nguyen
59b4155eba Adding and removing periods to standardize the punctuation in the BitcoinNodeTypes.png 2014-08-12 07:46:48 -07:00
Minh T. Nguyen
90799be2e3 Merge branch 'minh_changes' 2014-08-12 01:33:13 -07:00
Minh T. Nguyen
1f3fc48cad Finish copyediting of chapter 8 2014-08-11 23:08:43 -07:00
Minh T. Nguyen
55bf82cdee Finish copyediting chapter 7 2014-08-11 21:15:47 -07:00
Minh T. Nguyen
ec1d354cc8 Changing direction describing the merkle root. Its the transaction data that forms the 32 bytes of the merkle root. 2014-08-11 21:07:50 -07:00
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