173 Commits

Author SHA1 Message Date
Rodolphe Marques
521c7e5b0a Merge pull request #222 from bigchaindb/monitor-yml-fix
aws monitor deployment
2016-05-06 10:46:43 +02:00
troymc
4dd4de120f Edits to docs on monitoring 2016-05-04 17:10:27 +02:00
diminator
eab54e1a02
update docs/test file to avoid conflicts between testcases 2016-05-03 20:32:56 +02:00
Rodolphe Marques
389319e497 Added fab task to run monitor
Updated documentation
2016-05-03 17:06:58 +02:00
diminator
db06970b1a
PR comments 2016-05-03 11:18:57 +02:00
diminator
f5f4c17839 Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration-hashlock 2016-05-02 12:13:12 +02:00
diminator
35f16b5d65
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output 2016-05-02 12:06:54 +02:00
vrde
c9773b3f2c
Merge branch 'master' into feature/improve-docker-configuration 2016-04-28 15:48:19 +02:00
troymc
cd6bb18f18 Minor edits to the Docker documentation 2016-04-28 13:32:25 +02:00
diminator
55a2222922 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration-hashlock 2016-04-27 18:07:59 +02:00
vrde
08aaf784e5
Update documentation 2016-04-27 17:14:33 +02:00
troymc
774454e475 Clarified some points in the AWS deployment docs 2016-04-27 09:28:31 +02:00
diminator
e3774bae82
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/crypto.py
	bigchaindb/util.py
	docs/source/python-server-api-examples.md
	setup.py
2016-04-26 17:45:26 +02:00
troymc
7fa8f7e9f0 Updated AWS deployment docs 2016-04-26 16:50:55 +02:00
Rodolphe Marques
1b54a9ca6f run the loader inside a running container 2016-04-26 10:45:05 +02:00
vrde
9d04018533
Update docs 2016-04-26 04:29:32 +02:00
troymc
c7b4b698c3 Updated docs on startup.sh 2016-04-25 13:22:56 +02:00
troymc
4d83ad982f Merge remote-tracking branch 'origin/master' into feat/202/deploy-local-branch-to-AWS 2016-04-25 11:44:53 +02:00
diminator
6fb6138fae removed cryptography refs from docs 2016-04-22 12:50:10 +02:00
diminator
99b2dd2a61
removing libffi-dev and libssl-dev from distro dependencies (only required for cryptography, which was removed)
(cherry picked from commit 11d1482790ac20983a5e7b5145b5487c70694e84)
2016-04-22 12:50:05 +02:00
diminator
2137203366
removed cryptography refs from docs 2016-04-22 12:41:00 +02:00
diminator
11d1482790
removing libffi-dev and libssl-dev from distro dependencies (only required for cryptography, which was removed) 2016-04-22 12:38:41 +02:00
diminator
a6dd9dc1fd
update to cryptoconditions 0.1.6: removes the need of the cryptography dependency 2016-04-22 12:23:51 +02:00
diminator
c928669230
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/201/escrow
Conflicts:
	bigchaindb/util.py
2016-04-21 19:07:56 +02:00
diminator
5cea537143
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/core.py
2016-04-21 19:07:05 +02:00
diminator
6d99427bc7
hashlocked conditions + tests + docs 2016-04-21 18:59:48 +02:00
troymc
b9b7f0d9d4 Updated docs on installng to AWS (new arg for startup.sh) 2016-04-21 16:36:59 +02:00
diminator
51addb9cc9
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	tests/test_util.py
2016-04-21 15:19:23 +02:00
diminator
6630533441
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/201/escrow
Conflicts:
	tests/test_util.py
2016-04-21 14:59:22 +02:00
Rodolphe Marques
33825ad9dc added short_version field because of readthedocs 2016-04-21 14:13:41 +02:00
Rodolphe Marques
dcbaedf7ea Unified place for the version number
added --version to bigchain-cli
2016-04-21 13:38:02 +02:00
Alberto Granzotto
ac47f63b93 Merge pull request #200 from bigchaindb/0.1.5
bugfix and bump version to 0.1.5
2016-04-21 11:00:45 +02:00
Troy McConaghy
e9bc552bb1 Merge pull request #203 from bigchaindb/add-release_eips-script
Put release_eips.py back
2016-04-20 23:08:04 +02:00
diminator
9f62cddbaf
bugfix and bump version to 0.1.5 2016-04-20 15:31:52 +02:00
Troy McConaghy
dadde325b8 Merge pull request #186 from bigchaindb/feat/179/cli-export-import-public-keys
Added CLI command to export public key
2016-04-20 15:15:03 +02:00
diminator
8e5c1133fb
replace markdown json by python 2016-04-20 14:33:02 +02:00
diminator
84d024f3be
replace null by None 2016-04-20 14:28:23 +02:00
diminator
29e13d642e
docs: split code from output and output explicitly 2016-04-19 17:08:10 +02:00
Dimitri De Jonghe
bd24e0d2f9 Merge pull request #183 from bigchaindb/feat/116/more-solid-webserver
More solid webserver
creds to @vrde
2016-04-19 14:22:29 +02:00
diminator
9770785861
models docs update 2016-04-19 14:13:22 +02:00
diminator
37ef8deb5b
docs: MIMO code and explanation 2016-04-19 11:25:29 +02:00
diminator
41dd9276a8
docs: MIMO update (WIP) 2016-04-19 10:38:36 +02:00
troymc
9638a0b733 docs: Added sentence about how crypto keys are represented 2016-04-18 17:36:11 +02:00
diminator
d5923d5c67 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-18 17:19:02 +02:00
diminator
2fdbb5bef8
updated multiple owner docs and cryptoconditions example 2016-04-18 17:18:10 +02:00
troymc
b6fe85526f Revised the Cryptography section of the docs 2016-04-18 16:48:39 +02:00
Rodolphe Marques
b64a39d59a updated documentation 2016-04-18 16:00:51 +02:00
Rodolphe Marques
b8aeb228e8 documented the new transaction structure 2016-04-18 15:24:24 +02:00
vrde
6619036f3d
Add more docs and remove useless code 2016-04-18 12:02:05 +02:00
diminator
079a5296ce Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-18 11:31:33 +02:00