| 
							
							
								 Tomasz Drwięga | 555555e6f7 | Merge branch 'master' into signer-wsnotification Conflicts:
	parity/signer.rs
	rpc/src/v1/helpers/signing_queue.rs
	rpc/src/v1/impls/eth_signing.rs
	rpc/src/v1/impls/personal_signer.rs
	signer/src/ws_server/mod.rs | 2016-06-01 20:00:43 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | c370bcaded | merge fixes | 2016-06-01 19:57:34 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6676c6cf7e | Merge branch 'master' into client-refact | 2016-06-01 19:42:32 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 99e26b8480 | Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) * Splitting methods requiring signing into separate trait
* Single place where RPC apis are created.
* Separating eth_filter
* Separating eth_signing
* Stubs for Personal Signer methods
* Test for EthSigningQueueClient
* TransactionConfirmation API
* Exposing PersonalSigner API
* Defining ApiSets dependent on context
* Removing types
* Fixing default impl
* Fixing un-mocked tests
* Update signing_queue.rs
[ci skip]
* Removing unused import [ci skip] | 2016-06-01 19:37:34 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | a7a2b55362 | Using ethcore http server | 2016-06-01 19:32:05 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | d601e11d59 | Removing typeS | 2016-06-01 19:05:27 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 4742860b2e | Using ethcore http server | 2016-06-01 18:00:40 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 1fd9110829 | Serde bump | 2016-06-01 17:59:21 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | b9b0ce8d65 | Merge pull request #1199 from ethcore/ordered-dapps Using ordered hashmap to keep the order of dapps on home screen | 2016-06-01 16:19:00 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 1ef4db82e8 | doctest fixes | 2016-06-01 14:50:06 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | ae572cb8f5 | Using ordered hashmap to keep the order of dapps on home screen | 2016-06-01 13:25:20 +02:00 |  | 
			
				
					| 
							
							
								 Marek Kotewicz | ee77fc3bc3 | Merge pull request #1197 from ethcore/x-frame Disabling `ethcore` by default, adding x-frame-options header to dapps. | 2016-06-01 13:20:46 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 985d412c48 | fix merges again | 2016-06-01 13:03:26 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | c00b84e10b | merge fixes | 2016-06-01 12:54:47 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0c782bf34b | Merge branch 'master' into client-refact | 2016-06-01 12:45:04 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | f41466c8b5 | Merge pull request #1196 from rphmeier/rpc-tests transaction count verifier tests | 2016-06-01 12:44:51 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | db749dc564 | fix remaining tests  & doctest | 2016-06-01 12:44:11 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | e743972102 | Merge pull request #1192 from rphmeier/x_macros expunge x! and xx! from the codebase | 2016-06-01 12:43:15 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | cee31f9e8d | fix travis | 2016-06-01 03:19:20 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | d45a676dc0 | all tests fixed | 2016-05-31 22:24:32 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 67421fc69e | Adding explanatory comment for safe_to_embed | 2016-05-31 21:56:41 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | ae1bcd6a5b | Disabling ethcore APIs for RPC and IPC | 2016-05-31 21:53:20 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 5fd4b9d7bd | formatting fix | 2016-05-31 21:50:25 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | dad61bb7cf | test and travis fix for absent crate | 2016-05-31 21:40:26 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 9957328607 | DENY frames from other origins to prevent clickjacking | 2016-05-31 21:39:11 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | c33b1caf21 | executable all issues resolved | 2016-05-31 21:38:07 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | bbb858b386 | address small syntax breakages | 2016-05-31 21:38:05 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 77cef76518 | rpc bindings resolved | 2016-05-31 21:31:42 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 4146e1f02b | add empty rule to map macros | 2016-05-31 21:18:54 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 2a08fb8fe3 | and conditional dispatch | 2016-05-31 21:17:46 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 495e7feb62 | dispatching message return | 2016-05-31 21:13:32 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 34edecd59d | State diffing, exposed through JSONRPC. | 2016-05-31 21:03:44 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | ec7af964ab | correct map macro invocation | 2016-05-31 21:01:47 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 10d914d6c6 | restored chain_new_blocks | 2016-05-31 20:58:33 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | f5ed31792f | fixed sync with client only | 2016-05-31 20:54:02 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | a845e08bc6 | rename of the trait | 2016-05-31 20:33:26 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | ed0d60bc16 | Fixing clippy warnings | 2016-05-31 20:21:46 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 4d29508b4c | Minimal System UI | 2016-05-31 20:12:47 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 8e252d5f1b | refactored to merge client & client | 2016-05-31 19:52:53 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | c81e4e24b3 | add ability to have heavy tests | 2016-05-31 19:51:24 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 4ccaabde40 | add transaction count verifier tests | 2016-05-31 19:30:40 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 4f732972bc | refactoring to hold miner within the client | 2016-05-31 19:01:37 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | da9d6bf8d5 | rename [hash_]mapx to [hash_]map_into | 2016-05-31 17:29:01 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | c62bfcddef | finish purging x! from parity, remove x! and xx! macros | 2016-05-31 17:25:25 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 3abaeadcf3 | finish purging x! from ethcore | 2016-05-31 17:18:21 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 3dd642abe9 | Merge pull request #1185 from ethcore/ipc-fixes Database service upgrade (from the ipc branch) | 2016-05-31 17:00:07 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | ff7c755930 | mostly purge x! from ethcore | 2016-05-31 16:59:01 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0cd8644292 | split interfaces | 2016-05-31 16:41:15 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 3788b3a149 | expunge x! from util | 2016-05-31 16:40:48 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | b729a381f8 | rewrite map macros not to use an intermediate allocation | 2016-05-31 16:29:53 +02:00 |  |