diminator
|
9c0e9f6231
|
updated docs for nested conditions
|
2016-03-21 11:12:40 +01:00 |
|
diminator
|
f733f850a7
|
Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-sha256-fulfillments
|
2016-03-21 10:50:16 +01:00 |
|
diminator
|
bb88279b64
|
fix: use _bitmask for seriallizing thresholdconditions
|
2016-03-21 10:49:39 +01:00 |
|
Alberto Granzotto
|
4dcd25e8ac
|
Merge pull request #139 from bigchaindb/feat/55/more-descriptive-start-message
Added a more descriptive initialization message
|
2016-03-21 10:38:20 +01:00 |
|
Alberto Granzotto
|
a88a20d4cc
|
Merge branch 'develop' into feat/55/more-descriptive-start-message
|
2016-03-21 10:28:43 +01:00 |
|
Alberto Granzotto
|
9425635ad2
|
Merge pull request #147 from bigchaindb/revisions-to-admin-section-of-docs
Revisions to admin section of docs
|
2016-03-21 10:28:32 +01:00 |
|
Alberto Granzotto
|
7c0940b68d
|
Merge branch 'develop' into revisions-to-admin-section-of-docs
|
2016-03-21 10:09:49 +01:00 |
|
Troy McConaghy
|
c1dd009420
|
Merge pull request #144 from bigchaindb/revert-120-develop
Revert "Add missing package bigchaindb.web to setup.py"
|
2016-03-21 10:06:38 +01:00 |
|
vrde
|
d0af0b0a55
|
Merge branch 'develop' into revert-120-develop
|
2016-03-21 10:01:01 +01:00 |
|
diminator
|
892ab74acc
|
fix: resolved merge
|
2016-03-21 09:55:37 +01:00 |
|
diminator
|
2cc5c41c86
|
Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-sha256-fulfillments
Conflicts:
bigchaindb/core.py
|
2016-03-21 09:54:54 +01:00 |
|
diminator
|
c47d6b258c
|
fixed tests by providing abstract methods to ecdsa.py
|
2016-03-19 18:29:20 +01:00 |
|
diminator
|
a852f5f66d
|
- Ed25519: get_verifying_key and to_ascii
- documentation
|
2016-03-19 18:23:29 +01:00 |
|
troymc
|
b12f77edbf
|
Add consensus.md section to docs TOC
|
2016-03-19 11:36:43 +01:00 |
|
troymc
|
39ba990447
|
Revised/renamed admin.md in docs
|
2016-03-19 11:33:29 +01:00 |
|
Troy McConaghy
|
9da2a3c943
|
Merge pull request #143 from bigchaindb/feat/140/add-section-about-running-tests-in-docs
Move info on running all unit tests into the Sphinx docs
|
2016-03-19 10:49:10 +01:00 |
|
Troy McConaghy
|
60e926f7a5
|
Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs
|
2016-03-19 10:37:39 +01:00 |
|
Troy McConaghy
|
63fc86227b
|
Merge pull request #141 from bigchaindb/update-roadmap-md
Updated ROADMAP.md based on March 16 meeting
|
2016-03-19 10:22:51 +01:00 |
|
Troy McConaghy
|
4556cc01f0
|
Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs
|
2016-03-19 10:13:55 +01:00 |
|
Troy McConaghy
|
c75fbb8c24
|
Merge branch 'develop' into update-roadmap-md
|
2016-03-19 10:13:39 +01:00 |
|
Alberto Granzotto
|
adae753e2a
|
Merge pull request #99 from GemHQ/modular-consensus-rules
Modular consensus rules
|
2016-03-19 04:26:07 +01:00 |
|
Matt Smith
|
2aa003578c
|
Typos
|
2016-03-18 16:50:21 -07:00 |
|
diminator
|
4b3e7249ca
|
Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-sha256-fulfillments
|
2016-03-18 22:28:22 +01:00 |
|
diminator
|
f273e48c11
|
- Ed25519 inheritance
- Renamed Private/PublicKey to Signing/VerifyingKey
|
2016-03-18 22:23:32 +01:00 |
|
diminator
|
bdc2475bdd
|
cleanup
|
2016-03-18 20:20:18 +01:00 |
|
diminator
|
9bd1e9ff8b
|
sha256 fulfillment
tests
|
2016-03-18 20:01:47 +01:00 |
|
diminator
|
821ca9f8e6
|
threshold fulfillment
tests
|
2016-03-18 18:46:22 +01:00 |
|
Matt Smith
|
9c9378cf60
|
Merge branch 'develop' into modular-consensus-rules
|
2016-03-18 10:44:12 -07:00 |
|
Troy McConaghy
|
fcfd114644
|
Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs
|
2016-03-18 13:39:14 +01:00 |
|
Troy McConaghy
|
f27da1e39d
|
Merge branch 'develop' into update-roadmap-md
|
2016-03-18 11:56:53 +01:00 |
|
Troy McConaghy
|
2b3f5224d6
|
Merge branch 'develop' into revert-120-develop
|
2016-03-18 11:56:30 +01:00 |
|
troymc
|
cb5c14f9f1
|
Public Testnet --> Public Sandbox Testnet
|
2016-03-18 11:55:20 +01:00 |
|
Troy McConaghy
|
55ad60097d
|
Fixed minor errors in Introduction (in docs)
|
2016-03-18 11:40:30 +01:00 |
|
diminator
|
46cd3323e8
|
ILP conditions and fulfillment basis
ed25519 fulfillment
tests
|
2016-03-18 09:58:54 +01:00 |
|
vrde
|
5d33848319
|
Exclude tests
|
2016-03-17 17:17:27 +01:00 |
|
vrde
|
6e60a38a99
|
Use find_packages
|
2016-03-17 17:03:08 +01:00 |
|
Alberto Granzotto
|
6ea63903cb
|
Revert "Add missing package bigchaindb.web to setup.py"
|
2016-03-17 16:59:56 +01:00 |
|
troymc
|
785ee388fe
|
Move info on running all unit tests into the Sphinx docs
|
2016-03-17 16:20:11 +01:00 |
|
Troy McConaghy
|
678cd2dd29
|
Updated ROADMAP.md based on March 16 meeting
|
2016-03-17 11:05:15 +01:00 |
|
Rodolphe Marques
|
eff33e35f6
|
fixed failing test by joining block processes
|
2016-03-16 17:30:01 +01:00 |
|
Rodolphe Marques
|
33904b6804
|
Added a more descriptive initialization message
|
2016-03-16 17:07:01 +01:00 |
|
diminator
|
8425214c2a
|
reverted bigchaindb/util
|
2016-03-16 16:46:09 +01:00 |
|
diminator
|
828ed4e98b
|
updated tests
|
2016-03-16 16:44:11 +01:00 |
|
diminator
|
fad392a00b
|
Merge branch 'feat/127/crypto-conditions-ilp' of github.com:bigchaindb/bigchaindb into feat/127/crypto-conditions-ilp
|
2016-03-16 16:41:47 +01:00 |
|
diminator
|
4255c1780b
|
renamed crypto.core to crypto.asymmetric
|
2016-03-16 16:40:45 +01:00 |
|
Dimitri De Jonghe
|
6764701ced
|
Merge branch 'develop' into feat/127/crypto-conditions-ilp
|
2016-03-16 16:36:39 +01:00 |
|
diminator
|
9dc767318e
|
- abstracted crypto scheme
- added ED25519
- added tests
|
2016-03-16 16:27:40 +01:00 |
|
Matt Smith
|
3d50459b84
|
Corrected plugin group name in comments
|
2016-03-14 20:02:18 -07:00 |
|
Matt Smith
|
a7b3898b6f
|
Merge remote-tracking branch 'upstream/develop' into modular-consensus-rules
|
2016-03-14 13:29:17 -07:00 |
|
Matt Smith
|
ad535c7895
|
Tests for loading consensus plugins
|
2016-03-14 13:27:17 -07:00 |
|