Commit Graph

  • 176fea9144 zzzzz ryan 2016-05-30 17:04:07 +02:00
  • a2568127f6 longer sleeps ryan 2016-05-30 16:56:39 +02:00
  • df53b68bd9 Merge branch 'master' into core/195/handle-backlog-deletes ryan 2016-05-30 15:45:50 +02:00
  • bb9cc44e6b tests ryan 2016-05-30 15:44:48 +02:00
  • 776c7a6161 Docs: Added Trasaction Concepts & more to models.md troymc 2016-05-30 13:16:22 +02:00
  • 492f7e4ea3 correct logic ryan 2016-05-30 11:53:58 +02:00
  • ba9885512a Minor edits to cryptography.md troymc 2016-05-29 18:42:06 +02:00
  • 183a928f2f block revert process class ryan 2016-05-27 15:24:43 +02:00
  • 789af4a27e Merge pull request #334 from bigchaindb/add-commit-etc-to-changelog Troy McConaghy 2016-05-27 13:58:33 +02:00
  • 7127586a3b Added v0.4.0 commit hash, time, etc. to CHANGELOG troymc 2016-05-27 13:51:42 +02:00
  • a89399c4f9 Merge pull request #333 from bigchaindb/0.4.0 v0.4.0 Dimitri De Jonghe 2016-05-27 13:42:07 +02:00
  • 5aff88cddc
    bump version diminator 2016-05-27 13:37:53 +02:00
  • a26068893a rearrange queues ryan 2016-05-27 12:04:51 +02:00
  • 8f8df37e4b Merge pull request #326 from bigchaindb/update-changelog Troy McConaghy 2016-05-27 11:51:36 +02:00
  • d2d10f7340 Merge remote-tracking branch 'origin/master' into update-changelog troymc 2016-05-27 11:40:06 +02:00
  • afd5db8802 Merge pull request #329 from bigchaindb/feat/201/escrow Dimitri De Jonghe 2016-05-27 11:35:19 +02:00
  • 5f45afeb17 Merge pull request #328 from bigchaindb/edit-docs-on-tx-block-vote-models Troy McConaghy 2016-05-27 11:26:35 +02:00
  • a9d081176c
    remove duplicate validations diminator 2016-05-26 17:47:25 +02:00
  • f1c9bd54e5 Merge branch 'master' into core/197/revert-bigchain-deletes ryan 2016-05-26 17:10:02 +02:00
  • 207d537ef9 Made edits to models.md suggested by @diminator troymc 2016-05-26 16:53:40 +02:00
  • 3142ea5b76 add tests ryan 2016-05-26 16:33:37 +02:00
  • 0a9c0963ef
    update cc image diminator 2016-05-26 15:57:11 +02:00
  • b21e06d9fe
    minor tweaks diminator 2016-05-26 15:32:46 +02:00
  • 32c6ba3406
    minor tweaks diminator 2016-05-26 15:24:24 +02:00
  • 7602e3550c
    timeout caveat diminator 2016-05-26 15:02:28 +02:00
  • 98d6ef3617 factor out previous vote checking ryan 2016-05-26 14:54:07 +02:00
  • 570e76f587 Added note about escrow to CHANGELOG.md troymc 2016-05-26 14:43:08 +02:00
  • bd23e47e5a block reverter is separate process ryan 2016-05-26 14:29:06 +02:00
  • af421365fc reversions ryan 2016-05-26 14:28:38 +02:00
  • 09615955fc
    img edits diminator 2016-05-26 11:04:07 +02:00
  • c3c71c6d9e Merge remote-tracking branch 'origin/master' into feat/201/escrow diminator 2016-05-26 10:54:31 +02:00
  • 649b1d4697
    tutorial escrow doublespend diminator 2016-05-26 10:41:28 +02:00
  • 19d266df79
    escrow tutorial diminator 2016-05-26 10:33:27 +02:00
  • e0c4827eb3
    doc images diminator 2016-05-26 09:49:12 +02:00
  • 734564c991 Added notes on PR #324 to CHANGELOG troymc 2016-05-25 18:05:27 +02:00
  • 2e7b55fbd6 tests ryan 2016-05-25 17:52:38 +02:00
  • a15fa4f370 poison pill ryan 2016-05-25 17:52:20 +02:00
  • f4286fb025
    Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' vrde 2016-05-25 17:13:39 +02:00
  • fd10e39305
    Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' vrde 2016-05-25 17:12:19 +02:00
  • 37c698529f
    WIP: docs and tutorial diminator 2016-05-25 16:40:47 +02:00
  • 3133978d05
    Merge branch 'core/192/ignore-invalid-blocks' vrde 2016-05-25 16:18:18 +02:00
  • 53b1c2aab5 block num ryan 2016-05-25 16:18:07 +02:00
  • d8b51f904f Merge branch 'core/191/ignore-invalid-blocks' of github.com:bigchaindb/bigchaindb into core/192/ignore-invalid-blocks ryan 2016-05-25 16:16:22 +02:00
  • 56da36e271 block num ryan 2016-05-25 16:15:47 +02:00
  • ab43b30353
    Use constants instead of strings vrde 2016-05-25 15:50:10 +02:00
  • 0de838c40f simplify query ryan 2016-05-25 14:41:01 +02:00
  • 73c778e25f typo ryan 2016-05-25 13:57:43 +02:00
  • cc81e2b8cd skip voting if already voted ryan 2016-05-25 10:54:25 +02:00
  • 8b3129e363 naive revert ryan 2016-05-24 18:00:42 +02:00
  • 9875cab3b3
    cc-based escrow diminator 2016-05-24 17:55:43 +02:00
  • 56efe3ff02 Docs: edited the tx, block and vote models section troymc 2016-05-24 17:38:35 +02:00
  • 51a84d3e93 Omitted mention of PR #266 troymc 2016-05-23 11:14:17 +02:00
  • 5e809a963a Added PR #271 and PR #279 to CHANGELOG.md troymc 2016-05-23 11:10:56 +02:00
  • 003d4b8310 imperative phrasing ryan 2016-05-23 10:27:22 +02:00
  • 30551e5906 Updated CHANGELOG.md in prep for next version release troymc 2016-05-23 10:23:46 +02:00
  • 1b10d11a2c Revert "get_tx_by_payload_hash checks block status (no tests)" ryan 2016-05-23 10:20:33 +02:00
  • 5bc66a28c1 Revert "revert get_tx_by_payload_hash" ryan 2016-05-23 10:17:12 +02:00
  • 2dcc064088 Merge ae44642950a0f4979cd1e43cbd01fbf34adcfe66 into 3daa153878976d73e86e4dd9dc8495a2868ed563 Alberto Granzotto 2016-05-22 23:11:22 +00:00
  • 278fd55ae3 Merge pull request #1 from bigchaindb/master O3 Wallet 2016-05-22 19:49:45 +10:00
  • ddb6403562
    add required diminator 2016-05-20 15:50:47 +02:00
  • 3daa153878
    Merge remote-tracking branch 'origin/update-roadmap' vrde 2016-05-20 15:43:28 +02:00
  • c76e831f15
    Merge remote-tracking branch 'origin/better-newrelic-support' vrde 2016-05-20 15:42:32 +02:00
  • 046f39f715 Use import sys rather than from sys etc. troymc 2016-05-20 13:38:17 +02:00
  • 48325cccb4
    Merge branch 'sbellem-docker-dev' vrde 2016-05-20 11:07:09 +02:00
  • 2948ccdb2a
    Merge branch 'docker-dev' of git://github.com/sbellem/bigchaindb into sbellem-docker-dev vrde 2016-05-20 11:06:50 +02:00
  • 95fe5a77aa
    Merge remote-tracking branch 'origin/feat/317/switch-to-rapidjson' vrde 2016-05-20 10:59:56 +02:00
  • 40d5d90b6c
    Merge remote-tracking branch 'origin/use-pip3-for-setuptools-upgrade' vrde 2016-05-20 10:55:52 +02:00
  • 1c44d669e0 Updated the links to ROADMAP.md in the docs troymc 2016-05-19 19:21:19 +02:00
  • fd4ac0d8e7 Changed ROADMAP.md to link to the new roadmap location troymc 2016-05-19 19:20:48 +02:00
  • 7b9c9d924b
    fix base58 schema diminator 2016-05-19 18:09:32 +02:00
  • 9026c4ece5
    conditions and fulfillments schemas diminator 2016-05-19 18:00:35 +02:00
  • 7834d6bea8
    Merge branch 'master' into add-schema-validation diminator 2016-05-19 17:11:38 +02:00
  • fb2cd532a9 revert get_tx_by_payload_hash ryan 2016-05-19 16:43:04 +02:00
  • 61bae88cdb Merge branch 'master' into core/192/ignore-invalid-blocks ryan 2016-05-19 16:32:46 +02:00
  • 1eaa0ff913 test get_owned on invalid block ryan 2016-05-19 16:27:04 +02:00
  • 9fdc4fc9c2 test for query on spent in invalid block ryan 2016-05-19 15:42:27 +02:00
  • 8d3faec6a7 fix unspent query ryan 2016-05-19 15:42:05 +02:00
  • 9f03b2b771 add election class, process starts (#221) Ryan Henderson 2016-05-19 14:03:52 +02:00
  • 635a416305 test get_transaction on invalid block ryan 2016-05-19 13:54:47 +02:00
  • 07df25ffaf fix typo after merge Rodolphe Marques 2016-05-19 12:36:42 +02:00
  • 925c15e80e Merge remote-tracking branch 'remotes/origin/master' into feat/317/switch-to-rapidjson Rodolphe Marques 2016-05-19 12:01:26 +02:00
  • b420b86d69 fix typo Rodolphe Marques 2016-05-19 11:50:43 +02:00
  • b1a8741c57 Use pip3 instead of pip to upgrade pip, wheel & setuptools troymc 2016-05-19 11:48:11 +02:00
  • b1101747c0
    Merge branch 'more-explicit-error-reporting-for-pkg_resources' vrde 2016-05-19 11:42:03 +02:00
  • dbbdb2f017
    Fix help message vrde 2016-05-19 11:30:58 +02:00
  • 6d4bb7928b updated documentation Rodolphe Marques 2016-05-19 11:28:34 +02:00
  • 248f21d8cd
    Bump to wake up some CI stuff vrde 2016-05-19 11:23:46 +02:00
  • 491dc29b41
    Use more generic and compatible Exception vrde 2016-05-19 11:08:26 +02:00
  • ae44642950
    Use secondary index on get_transaction vrde 2016-05-18 19:47:31 +02:00
  • 814d8a1663 wait for indexes ryan 2016-05-18 17:09:26 +02:00
  • ed0b1965bf Merge pull request #281 from bigchaindb/fix/260/add-output-condition-to-fulfillment-message Dimitri De Jonghe 2016-05-18 16:45:19 +02:00
  • ce86be7747 Merge branch 'master' into core/192/ignore-invalid-blocks ryan 2016-05-18 16:27:59 +02:00
  • 5e3358f278 Merge branch 'core/193/invalid-block-backlog' into core/192/ignore-invalid-blocks ryan 2016-05-18 16:27:15 +02:00
  • 50da984626 replaced json with rapidjson Rodolphe Marques 2016-05-18 15:43:47 +02:00
  • 87275b966c Changed where newrelic_license_key gets set troymc 2016-05-18 14:56:49 +02:00
  • 12567e7f1e Add documentation on how to use New Relic Server Monitoring troymc 2016-05-18 14:32:24 +02:00
  • 937e1a7d65 Tested & improved New Relic installation troymc 2016-05-18 14:31:42 +02:00
  • 8138a4b1c2 Merge pull request #315 from bigchaindb/codecov-yml-changes-suggested-by-stevepeak Troy McConaghy 2016-05-18 10:53:14 +02:00
  • 7ed2de43ef Ignore benchmarking-tests & speed-tests in codecov.yml troymc 2016-05-18 10:44:30 +02:00
  • b38330d0aa codecov.yml changes suggested by stevepeak troymc 2016-05-18 10:43:40 +02:00