486 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
vrde	22923ee9d3	Force a config reset before every test	2016-04-12 16:23:09 +02:00
troymc	3adf62d0f2	Fixed typo	2016-04-12 14:05:21 +02:00
troymc	f8e0c41c9e	CONTRIBUTING.md: a PR should resolve an existing issue	2016-04-12 13:37:45 +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
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
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	d2b44890f2	changed bigchaindb-benchmark to use the new configuration loader	2016-04-08 14:04:17 +02:00
vrde	32e08b7c63	Remove useless func	2016-04-08 10:14:14 +02:00
vrde	1ddfa2becb	Add explicit tests for update_types	2016-04-07 18:06:04 +02:00
vrde	820a14baa7	Merge branch 'develop' into improve-config	2016-04-07 18:05:42 +02:00
vrde	c9cd842151	Avoid loading the config located in the home of the current user	2016-04-07 17:54:36 +02:00
Dimitri De Jonghe	3a057755f5	Merge pull request #152 from bigchaindb/feat/137/crypto-ed25519-compatible-signing-scheme ... Switch to ED25519 signing scheme	2016-04-07 17:10:50 +02:00
diminator	12ce460400	removed ECDSA support in tests config	2016-04-07 17:05:57 +02:00
Dimitri De Jonghe	56a1bb5e1d	Merge branch 'develop' into feat/137/crypto-ed25519-compatible-signing-scheme	2016-04-07 16:11:20 +02:00
vrde	ae641d6a96	Fix tests	2016-04-07 14:31:34 +02:00
vrde	0692fe04d0	Print config using json	2016-04-07 14:16:01 +02:00
vrde	06f45f1dc7	Change server port to 9984	2016-04-07 14:15:29 +02:00
vrde	ac3ce3b6fa	Merge branch 'develop' into improve-config	2016-04-07 11:25:12 +02:00
vrde	aebe179840	Merge branch 'feat/116/more-solid-webserver' into develop	2016-04-07 11:04:49 +02:00
vrde	b11cbce5cd	Merge branch 'develop' into feat/116/more-solid-webserver	2016-04-07 11:00:47 +02:00
vrde	b988b3f6f7	Pin major version for gunicorn	2016-04-07 10:58:29 +02:00
diminator	e1191a8c38	updated documentation	2016-04-07 09:54:25 +02:00
vrde	959320cdb9	Remove CONFIGURED from tests as well 😓	2016-04-06 17:39:44 +02:00
vrde	3c31a8684f	Remove CONFIGURED key from show-config	2016-04-06 16:50:34 +02:00
vrde	a56aa992fa	Do not hide empty privkeys	2016-04-06 16:36:12 +02:00
vrde	2a0598e9f1	Merge branch 'develop' into improve-config	2016-04-06 16:26:50 +02:00
vrde	c5cefd6ad5	Remove useless import	2016-04-06 16:15:38 +02:00
vrde	4b32e8e01a	Use autoconfigure on every command	2016-04-06 16:15:17 +02:00
vrde	aec3b3db6c	Hide private key when showing configuration	2016-04-06 16:14:43 +02:00
diminator	e1d9336803	Merge remote-tracking branch 'remotes/origin/develop' into feat/137/crypto-ed25519-compatible-signing-scheme ... Conflicts: setup.py	2016-04-06 10:52:49 +02:00
Troy McConaghy	ebb6e1a882	Merge pull request #164 from bigchaindb/how-to-handle-pull-requests-md ... Added HOW_TO_HANDLE_PULL_REQUESTS.md	2016-04-05 17:55:06 +02:00
Troy McConaghy	1f677fb4a0	Merge branch 'develop' into how-to-handle-pull-requests-md	2016-04-05 17:43:36 +02:00
Troy McConaghy	cb0944aede	Merge pull request #160 from bigchaindb/feat/151/deploy-cluster-on-AWS ... Feat/151/deploy cluster on aws	2016-04-05 17:42:29 +02:00