3031 Commits

Author SHA1 Message Date
Dimitri De Jonghe
1f3a8ed3e1 Merge pull request #212 from bigchaindb/fix/update-to-cryptoconditions-0.1.6
update to cryptoconditions 0.1.6
2016-04-22 14:56:58 +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
e92627e447
uncommented example code 2016-04-21 19:02:07 +02:00
diminator
6d99427bc7
hashlocked conditions + tests + docs 2016-04-21 18:59:48 +02:00
troymc
e7483e8853 Added v0.1.5 and more to CHANGELOG.md 2016-04-21 17:32:14 +02:00
Rodolphe Marques
6da2603e28 Merge pull request #208 from bigchaindb/feat/204/print-version-number
Feat/204/print version number
2016-04-21 17:04:47 +02:00
troymc
b9b7f0d9d4 Updated docs on installng to AWS (new arg for startup.sh) 2016-04-21 16:36:59 +02:00
troymc
a7eca58ad8 Add ability to install to AWS from local Git branch 2016-04-21 16:36:04 +02:00
Ryan Henderson
1d50c8965d Merge pull request #181 from bigchaindb/feat/156/refactor-monitoring-code
Move monitoring code from the main class to processes
2016-04-21 16:22:07 +02:00
vrde
d9da8dc17c
Set logging level for requests to WARNING 2016-04-21 16:16:55 +02:00
Rodolphe Marques
9702190516 code cleanup 2016-04-21 16:01:21 +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
8ed76ca234 Import version in bigchaindb.__init__
Print current version with
import bigchaindb
bigchaindb.__version__
2016-04-21 14:40:51 +02:00
Rodolphe Marques
33825ad9dc added short_version field because of readthedocs 2016-04-21 14:13:41 +02:00
Rodolphe Marques
7498fafacc removed unused imports 2016-04-21 13:43:50 +02:00
Rodolphe Marques
b2ad913d82 Merge remote-tracking branch 'remotes/origin/master' into feat/204/print-version-number 2016-04-21 13:43:34 +02:00
Rodolphe Marques
7847dea1cc added version.py 2016-04-21 13:40:57 +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
vrde
592dd04e0b
Merge branch 'master' into feat/156/refactor-monitoring-code 2016-04-20 23:44:27 +02:00
vrde
fdce0d5876
Fix AttributeError in test 2016-04-20 23:23:08 +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
vrde
ed1e71bfec
Add tests to ProcessGroup 2016-04-20 18:18:01 +02:00
vrde
dcd09264d9
Merge branch 'master' into feat/156/refactor-monitoring-code 2016-04-20 16:53:29 +02:00
diminator
9f62cddbaf
bugfix and bump version to 0.1.5 v0.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
Dimitri De Jonghe
4bc81105b0 Merge pull request #188 from bigchaindb/minor-update-to-docs-on-crypto
Revised the Cryptography section of the docs
2016-04-18 17:41:38 +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
troymc
4bfad0bbbc Minor formatting changes suggested by @r-marques 2016-04-18 16:08:25 +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
Rodolphe Marques
7a75dc1700 replace inp with tx_input 2016-04-18 14:55:56 +02:00
Rodolphe Marques
35fc0b5dad remove unnecessary sorts 2016-04-18 14:50:49 +02:00