Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,554 Commits 25 Branches 54 Tags 15 MiB
Commit Graph

1554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Troy McConaghy
77c08fb978 Updated roadmap link in README.md 2016-06-03 11:22:56 +02:00
Ryan Henderson
0f13da59bf Core/197/revert bigchain deletes (#330) 
* naive revert

* skip voting if already voted

* typo

* poison pill

* tests

* reversions

* block reverter is separate process

* factor out previous vote checking

* add tests
 2016-06-02 14:46:32 +02:00
diminator
de17f56ac2
fixed tests 2016-06-01 14:07:03 +02:00
diminator
d082a0fb6a
cc version bump 2016-06-01 13:44:48 +02:00
diminator
58e7f92cde
escrow doc update 2016-06-01 13:39:27 +02:00
Troy McConaghy
3b2b70eb14 Merge pull request #343 from bigchaindb/more-transaction-model-details 
Documentation on Transaction Concepts, and some other stuff
 2016-05-31 17:28:25 +02:00
troymc
776c7a6161 Docs: Added Trasaction Concepts & more to models.md 2016-05-30 13:16:22 +02:00
troymc
ba9885512a Minor edits to cryptography.md 2016-05-29 18:42:06 +02:00
Troy McConaghy
789af4a27e Merge pull request #334 from bigchaindb/add-commit-etc-to-changelog 
Added v0.4.0 commit hash, time, etc. to CHANGELOG
 2016-05-27 13:58:33 +02:00
troymc
7127586a3b Added v0.4.0 commit hash, time, etc. to CHANGELOG 2016-05-27 13:51:42 +02:00
Dimitri De Jonghe
a89399c4f9 Merge pull request #333 from bigchaindb/0.4.0 
v0.4.0
v0.4.0 		2016-05-27 13:42:07 +02:00
diminator
5aff88cddc
bump version 2016-05-27 13:37:53 +02:00
Troy McConaghy
8f8df37e4b Merge pull request #326 from bigchaindb/update-changelog 
Updated CHANGELOG.md in preparation for the next version release
 2016-05-27 11:51:36 +02:00
troymc
d2d10f7340 Merge remote-tracking branch 'origin/master' into update-changelog 2016-05-27 11:40:06 +02:00
Dimitri De Jonghe
afd5db8802 Merge pull request #329 from bigchaindb/feat/201/escrow 
solves #201 Escrow
 2016-05-27 11:35:19 +02:00
Troy McConaghy
5f45afeb17 Merge pull request #328 from bigchaindb/edit-docs-on-tx-block-vote-models 
Docs: edited the tx, block and vote models section
 2016-05-27 11:26:35 +02:00
diminator
a9d081176c
remove duplicate validations 2016-05-26 17:47:25 +02:00
troymc
207d537ef9 Made edits to models.md suggested by @diminator 2016-05-26 16:53:40 +02:00
diminator
0a9c0963ef
update cc image 2016-05-26 15:57:11 +02:00
diminator
b21e06d9fe
minor tweaks 2016-05-26 15:32:46 +02:00
diminator
32c6ba3406
minor tweaks 2016-05-26 15:24:24 +02:00
diminator
7602e3550c
timeout caveat 2016-05-26 15:02:28 +02:00
troymc
570e76f587 Added note about escrow to CHANGELOG.md 2016-05-26 14:43:08 +02:00
diminator
09615955fc
img edits 2016-05-26 11:04:07 +02:00
diminator
c3c71c6d9e Merge remote-tracking branch 'origin/master' into feat/201/escrow 2016-05-26 10:54:31 +02:00
diminator
649b1d4697
tutorial escrow doublespend 2016-05-26 10:41:28 +02:00
diminator
19d266df79
escrow tutorial 2016-05-26 10:33:27 +02:00
diminator
e0c4827eb3
doc images 2016-05-26 09:49:12 +02:00
troymc
734564c991 Added notes on PR #324 to CHANGELOG 2016-05-25 18:05:27 +02:00
vrde
f4286fb025
Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' 2016-05-25 17:13:39 +02:00
vrde
fd10e39305
Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' 2016-05-25 17:12:19 +02:00
diminator
37c698529f
WIP: docs and tutorial 2016-05-25 16:40:47 +02:00
vrde
3133978d05
Merge branch 'core/192/ignore-invalid-blocks' 2016-05-25 16:18:18 +02:00
ryan
53b1c2aab5 block num 2016-05-25 16:18:07 +02:00
ryan
d8b51f904f Merge branch 'core/191/ignore-invalid-blocks' of github.com:bigchaindb/bigchaindb into core/192/ignore-invalid-blocks 2016-05-25 16:16:22 +02:00
ryan
56da36e271 block num 2016-05-25 16:15:47 +02:00
vrde
ab43b30353
Use constants instead of strings 2016-05-25 15:50:10 +02:00
ryan
0de838c40f simplify query 2016-05-25 14:41:01 +02:00
diminator
9875cab3b3
cc-based escrow 2016-05-24 17:55:43 +02:00
troymc
56efe3ff02 Docs: edited the tx, block and vote models section 2016-05-24 17:38:35 +02:00
troymc
51a84d3e93 Omitted mention of PR #266 2016-05-23 11:14:17 +02:00
troymc
5e809a963a Added PR #271 and PR #279 to CHANGELOG.md 2016-05-23 11:10:56 +02:00
ryan
003d4b8310 imperative phrasing 2016-05-23 10:27:22 +02:00
troymc
30551e5906 Updated CHANGELOG.md in prep for next version release 2016-05-23 10:23:46 +02:00
ryan
1b10d11a2c Revert "get_tx_by_payload_hash checks block status (no tests)" 
This reverts commit bb0bb9a1b4f686e2cb042427de1aeb06a002fc14.
 2016-05-23 10:20:33 +02:00
ryan
5bc66a28c1 Revert "revert get_tx_by_payload_hash" 
This reverts commit fb2cd532a9462ae4fc3c50056f01b37467816848.
 2016-05-23 10:17:12 +02:00
vrde
3daa153878
Merge remote-tracking branch 'origin/update-roadmap' 2016-05-20 15:43:28 +02:00
vrde
c76e831f15
Merge remote-tracking branch 'origin/better-newrelic-support' 2016-05-20 15:42:32 +02:00
troymc
046f39f715 Use import sys rather than from sys etc. 2016-05-20 13:38:17 +02:00
vrde
48325cccb4
Merge branch 'sbellem-docker-dev' 2016-05-20 11:07:09 +02:00