| 
							
							
								 Nikolay Volf | 0f056f3abb | Merge branch 'master' into clippy-dev Conflicts:
	Cargo.toml | 2016-03-10 02:45:53 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ac42045155 | Merge pull request #639 from ethcore/keys-cli Keys cli | 2016-03-10 00:25:01 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | accc1db43f | chaning docopt config a bit | 2016-03-09 23:39:36 +04:00 |  | 
			
				
					| 
							
							
								 debris | 423dd7e0a9 | updated jsonrpc-core and http-server libs | 2016-03-09 18:04:13 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 7ff4d14544 | adding return to if branch | 2016-03-09 19:27:44 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | f49e32cc79 | Merge branch 'master' into keys-cli | 2016-03-09 19:20:17 +04:00 |  | 
			
				
					| 
							
							
								 debris | bcb9b0e457 | wait_for_exit takes only one input param, which is PanicHandler | 2016-03-09 15:32:27 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6ad0ba8fe2 | basic commands | 2016-03-09 17:11:15 +04:00 |  | 
			
				
					| 
							
							
								 debris | 3655354980 | Merge branch 'master' into jsonrpc_panic_handle | 2016-03-09 13:46:08 +01:00 |  | 
			
				
					| 
							
							
								 debris | a1640dcf72 | jsonrpc panic handle | 2016-03-09 11:38:53 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | b2fc077f8c | Fixing CLI parameters | 2016-03-08 16:42:33 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | cbc2c0cf0c | Fixing clippy warnings. When building on nightly it is required to enable clippy | 2016-03-07 14:34:17 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ec3698066b | Normal CLI options with geth. Support node identity.
Support fine-grained JSONRPC API enabling. | 2016-03-07 12:21:11 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bc2fb14b5d | Add memory usage reports. Update to be similar to master. | 2016-03-06 22:39:04 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 559e01ea84 | Review remarks resolved. | 2016-03-04 22:54:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bbbaffbc53 | "--archive" option for disabling the journal DB Fixes #579 | 2016-03-04 21:06:28 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 48df869202 | --author and --extra-data options. Fixed null parent-hash. | 2016-03-01 16:58:14 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2c32b0fc1c | Merge branch 'master' into mining | 2016-02-29 16:40:57 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 83b8e7df5a | Initial refactor and block closing. | 2016-02-29 14:57:41 +01:00 |  | 
			
				
					| 
							
							
								 debris | 77bfe5ae00 | jsonrpc uses weak pointers to client | 2016-02-29 11:58:33 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b3f09596b1 | Merge pull request #516 from ethcore/sync Better memory management | 2016-02-27 15:54:19 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5d5471f981 | Fix minor typo. | 2016-02-26 22:40:32 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 92625a5095 | Merge branch 'master' of github.com:ethcore/parity | 2016-02-26 22:39:23 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 34bc02af1e | Merge branch 'master' of github.com:ethcore/parity into network | 2016-02-26 14:23:10 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 1b9f428183 | Merge branch 'master' of github.com:ethcore/parity into sync | 2016-02-25 14:20:28 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 781f763f1f | Memory management | 2016-02-25 14:09:39 +01:00 |  | 
			
				
					| 
							
							
								 Marek Kotewicz | ba464bbac4 | Merge pull request #493 from ethcore/jsonrpc_security jsonrpc security, cors headers, fixed #359 | 2016-02-25 14:08:18 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | cb3608c6d3 | Limit download ahead | 2016-02-24 21:23:58 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 40f908a499 | Log formatting | 2016-02-23 20:14:37 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 8beba717f8 | Delayed UPnP initialization | 2016-02-23 19:38:06 +01:00 |  | 
			
				
					| 
							
							
								 Tomusdrw | 07e704c968 | Fixing clippy warnings. Implementing PartialEq for Uints | 2016-02-23 11:40:23 +01:00 |  | 
			
				
					| 
							
							
								 debris | bda778626c | Merge branch 'master' into jsonrpc_security | 2016-02-23 10:28:27 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 72d0719223 | Update docs. | 2016-02-22 18:11:53 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a6c41514d4 | Update docs. | 2016-02-22 18:10:21 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 64d566ff52 | Manage final user-input errors. | 2016-02-22 13:58:41 +01:00 |  | 
			
				
					| 
							
							
								 debris | 90184658a7 | jsonrpc security, cors headers, fixed #359 | 2016-02-22 13:41:38 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 63bbd0ccd8 | Use proper version string. | 2016-02-21 20:00:45 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | dc3ceeb5bb | Use new is_valid_node_url function. | 2016-02-19 20:02:23 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5f164e1c98 | Merge branch 'master' of github.com:ethcore/parity | 2016-02-19 19:55:26 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 6c82e405dd | Remove regex &c., use network code for enode ID. | 2016-02-19 19:42:23 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | d9fec87143 | Merge branch 'master' of github.com:ethcore/parity into discovery | 2016-02-19 13:39:43 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2cc690f31f | Better user errors. Fixed up README. | 2016-02-19 12:54:51 +01:00 |  | 
			
				
					| 
							
							
								 debris | 19a3daf533 | parity compiling fine | 2016-02-19 00:50:23 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | e0623f57f9 | Merge branch 'master' of github.com:ethcore/parity into discovery | 2016-02-18 21:49:11 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ae2ef83f16 | Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional | 2016-02-18 20:59:28 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7d75626e75 | Fix options. | 2016-02-18 14:28:24 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 1447fb9d30 | Switch to using non-macro ready for beta. | 2016-02-18 14:16:55 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 379876341e | Correct alignment. | 2016-02-18 13:56:15 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | c6bcd464c2 | Avoid changing user for daemonize. Just stick to the basics. | 2016-02-18 13:54:18 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7f2acedf9f | Reintroduce daemonize. | 2016-02-18 13:10:04 +01:00 |  |