3031 Commits

Author SHA1 Message Date
vrde
70560408cd
Add new step on how to install the package for dev 2016-04-13 11:16:17 +02:00
troymc
c168c5a5a1 default config file is now .bigchaindb 2016-04-13 11:13:10 +02:00
diminator
565fc8a1f7
fix typo 2016-04-13 11:13:04 +02:00
diminator
197954576f
threshold conditions documentation 2016-04-13 11:10:32 +02:00
vrde
59ae6a230e
Merge remote-tracking branch 'origin/minor-change-to-docs-on-running-unit-tests' 2016-04-13 10:47:03 +02:00
diminator
610715691a Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-13 10:45:25 +02:00
diminator
d92ad44abc Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-13 10:37:21 +02:00
diminator
8775e7e8d7
added get_hash_data() 2016-04-13 10:36:46 +02:00
Troy McConaghy
6fc96c18f7 Merge pull request #172 from bigchaindb/aws-deployment-fabfile-tweaks
Various AWS deployment improvements
2016-04-13 10:23:51 +02:00
troymc
a4cf5500ed Fixed slice range bug in fabfile.py 2016-04-12 17:55:48 +02:00
troymc
2a1892d1f7 Docs: changed instructions for running unit tests 2016-04-12 17:38:17 +02:00
Alberto Granzotto
2d776d26d7 Merge pull request #176 from bigchaindb/feat/175/update-contributing-md
CONTRIBUTING.md: a PR should resolve an existing issue
2016-04-12 17:30:42 +02:00
vrde
6a86873b00
Merge branch 'develop' 2016-04-12 17:03:30 +02:00
Alberto Granzotto
142c833178 Merge pull request #153 from bigchaindb/improve-config
Improve configuration by using env variables correctly
2016-04-12 17:02:34 +02:00
diminator
b2fd909881 Merge branch 'feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 16:38:32 +02:00
vrde
22923ee9d3
Force a config reset before every test 2016-04-12 16:23:09 +02:00
Rodolphe Marques
74a1e14183 fix failing test 2016-04-12 14:51:37 +02:00
troymc
3adf62d0f2 Fixed typo 2016-04-12 14:05:21 +02:00
diminator
923740ee6c Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 13:41:26 +02:00
troymc
f8e0c41c9e CONTRIBUTING.md: a PR should resolve an existing issue 2016-04-12 13:37:45 +02:00
diminator
9912448cb0 Merge branch 'feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-12 13:21:29 +02:00
diminator
61c0da8212
docs with code examples 2016-04-12 13:20:34 +02:00
Rodolphe Marques
66b811b2a2 merge improve-config branch 2016-04-12 12:39:49 +02:00
Rodolphe Marques
43a88142f7 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-12 12:21:17 +02:00
Rodolphe Marques
28656e9544 updated some tests 2016-04-12 12:18:36 +02:00
diminator
5fa12c9744 Merge remote-tracking branch 'remotes/origin/improve-config' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 12:06:49 +02:00
vrde
8716711aaf
Merge branch 'move-badges-to-top' 2016-04-12 09:31:38 +02:00
troymc
e8095849bc Merge remote-tracking branch 'origin/master' into aws-deployment-fabfile-tweaks 2016-04-11 16:53:55 +02:00
vrde
e94dc71c2c
Bump to trigger travis-ci and codecov to update 2016-04-11 16:43:03 +02:00
vrde
708d10e166
Fix badge for RTD 2016-04-11 16:19:20 +02:00
vrde
c73ed7974f
Fix badge for RTD 2016-04-11 16:16:36 +02:00
vrde
4db0c07ea1
Move badges to top 2016-04-11 15:50:30 +02:00
Alberto Granzotto
af4e2790e8 Merge pull request #170 from bigchaindb/move-main-branch-from-develop-to-master
Move refs from develop to master
2016-04-11 15:24:11 +02:00
diminator
32ca586bc8
Added condition/fulfillment tests
isolated get_fulfillment_message(...)
2016-04-11 15:15:47 +02:00
troymc
ff2e36a44e Edits to configuration.md and related docs 2016-04-11 14:51:26 +02:00
vrde
fb6ba30658
Move refs from develop to master 2016-04-11 14:47:16 +02:00
troymc
e09a289649 several AWS deployment improvements 2016-04-11 11:58:14 +02:00
vrde
bdc2cf21c4
Add missing backtick 2016-04-11 11:32:18 +02:00
vrde
ab8113a91c
Use sys.exit instead of exit 2016-04-11 11:29:42 +02:00
vrde
a59797c491
Add more docs to config 2016-04-11 11:27:13 +02:00
Sylvain Bellemare
9e7c55a083 Add docs for config when using docker (#169) 2016-04-11 09:43:17 +02:00
Rodolphe Marques
4936ce6ff4 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-08 16:19:38 +02:00
diminator
7d99bcba7b
merge + fixed tests for get_owned_ids
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration

Conflicts:
	bigchaindb/core.py
2016-04-08 16:08:33 +02:00
diminator
8dc0c48681
fixed tests 2016-04-08 15:56:51 +02:00
vrde
8215576497
Remove exception stacktrace when starting without keypair 2016-04-08 15:56:10 +02:00
vrde
c92d285fa8
Merge branch 'improve-config' of github.com:bigchaindb/bigchaindb into improve-config 2016-04-08 15:16:20 +02:00
vrde
f90254c3c9
Update documentation 2016-04-08 15:14:14 +02:00
Rodolphe Marques
ab8e808ef3 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-08 15:12:08 +02:00
diminator
8b7478365e
fixing tests WIP 2016-04-08 14:43:11 +02:00
Rodolphe Marques
bf2cc89991 Updated get owned ids to also return the cid. 2016-04-08 14:41:20 +02:00