debris
|
610251fdf7
|
Merge branch 'master' into tracing
|
2016-04-11 11:35:07 +02:00 |
|
debris
|
66e63ee081
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-04-11 11:32:34 +02:00 |
|
Gav Wood
|
587862a370
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-04-10 15:35:53 -07:00 |
|
Gav Wood
|
6c35c5e604
|
--unlock is comma-delimited. (#916)
|
2016-04-10 14:01:41 -07:00 |
|
Marek Kotewicz
|
fed853593b
|
fixed eth_getLogs (#915)
* fixed eth_getLogs
* removed empty lines
|
2016-04-10 11:42:03 -07:00 |
|
debris
|
8340f135fc
|
fixed eth_getLogs
|
2016-04-10 19:43:42 +02:00 |
|
NikVolf
|
26e23da4c0
|
some newver/oldver logics
|
2016-04-10 17:15:40 +03:00 |
|
NikVolf
|
d3411a50a4
|
locked ver.lock upgrade
|
2016-04-10 16:42:33 +03:00 |
|
NikVolf
|
69add61174
|
basic upgrade scenario
|
2016-04-10 16:12:20 +03:00 |
|
Nikolay Volf
|
032d29ec86
|
Merge pull request #912 from ethcore/keys-path-fix-create
create provided custom dir for keys if none
|
2016-04-10 17:01:51 +04:00 |
|
NikVolf
|
5f7cc437dd
|
removing lower-level defaults
|
2016-04-10 14:38:57 +03:00 |
|
NikVolf
|
219e88a023
|
create provided custom dir for keys if none
|
2016-04-10 14:20:48 +03:00 |
|
Gav Wood
|
6ebd5009fc
|
--unlock is comma-delimited.
|
2016-04-09 12:58:13 -07:00 |
|
Marek Kotewicz
|
373284ca0a
|
spec loading cleanup (#858)
* spec loading cleanup in progress
* changed engine field in json spec
* refactored engine params
* polishing spec loading refactor
* fixed compiling json tests
* fixed compiling parity
* removed warnings
* removed commented out code
* fixed failing test
* bringing back removed TODO in spec.
|
2016-04-09 10:20:35 -07:00 |
|
Gav Wood
|
d823fd7685
|
Merge pull request #906 from ethcore/webapps-auth
WebApps HTTP Basic Auth Support
|
2016-04-09 10:19:59 -07:00 |
|
Tomasz Drwięga
|
a63be702e1
|
Merge pull request #888 from ethcore/h256
Removing match on constant
|
2016-04-09 11:28:01 +02:00 |
|
Tomasz Drwięga
|
04d5b5cbe6
|
Merge branch 'master' into h256
Conflicts:
ethcore/src/account.rs
|
2016-04-09 11:27:19 +02:00 |
|
Tomasz Drwięga
|
e839404bd2
|
Merge pull request #907 from ethcore/gavofyork-patch-1
Update auth.rs
|
2016-04-09 11:25:05 +02:00 |
|
Gav Wood
|
1d5b29fb48
|
Update auth.rs
|
2016-04-08 17:51:20 -07:00 |
|
Gav Wood
|
60875905ac
|
Merge pull request #904 from ethcore/webapp-default
Enabling webapps compilation by default
|
2016-04-08 17:43:13 -07:00 |
|
Gav Wood
|
0ef6de930f
|
Update account.rs
|
2016-04-08 17:42:17 -07:00 |
|
Gav Wood
|
215973c7ab
|
Merge pull request #898 from ethcore/fixed_895
fixed #895
|
2016-04-08 17:41:54 -07:00 |
|
Tomasz Drwięga
|
dab54cf2a7
|
HTTP Basic Authorization for WebApps server.
|
2016-04-08 16:11:58 +02:00 |
|
Tomasz Drwięga
|
8f16515d82
|
HTTP Authorization support in router
|
2016-04-08 15:25:20 +02:00 |
|
NikVolf
|
80d04ead33
|
server handshake
|
2016-04-08 14:07:25 +03:00 |
|
debris
|
fcf7f392f0
|
fixed failing tests
|
2016-04-08 11:48:37 +02:00 |
|
Tomasz Drwięga
|
508daad011
|
Enabling webapps by default
|
2016-04-08 11:18:46 +02:00 |
|
Arkadiy Paronyan
|
f9f11b6f74
|
Merge pull request #899 from ethcore/webapps2
Support for compile-time included WebApplications.
|
2016-04-08 10:54:40 +02:00 |
|
Tomasz Drwięga
|
f129126a82
|
Adding couple of missing commas
|
2016-04-08 10:13:42 +02:00 |
|
debris
|
64294853cc
|
separated tracing logic to its own trait
|
2016-04-08 01:50:55 +02:00 |
|
NikVolf
|
c4727ac021
|
reserved message ids and little endian for client
|
2016-04-07 23:32:41 +03:00 |
|
NikVolf
|
2560640b29
|
reserved message ids and little endian for client
|
2016-04-07 23:32:33 +03:00 |
|
NikVolf
|
72acd67644
|
ipcconfig trait
|
2016-04-07 23:18:48 +03:00 |
|
Tomasz Drwięga
|
6395095659
|
Updating version of parity-status
|
2016-04-07 18:42:51 +02:00 |
|
Tomasz Drwięga
|
1852f1b462
|
REST-API PoC
|
2016-04-07 18:22:53 +02:00 |
|
Tomasz Drwięga
|
9bd41761fc
|
Reverting back to old-hyper version of rpc
|
2016-04-07 16:31:42 +02:00 |
|
Tomasz Drwięga
|
b7c790d741
|
Disabling rpc until we switch to async hyper
|
2016-04-07 16:22:02 +02:00 |
|
Tomasz Drwięga
|
bf4ab6daa8
|
Merge branch 'master' into webapps2
Conflicts:
parity/main.rs
|
2016-04-07 16:13:58 +02:00 |
|
Tomasz Drwięga
|
4569c25127
|
Specifying webapp interface
|
2016-04-07 15:59:45 +02:00 |
|
Arkadiy Paronyan
|
46a25b31ab
|
Merge pull request #894 from ethcore/send-transactions
Propagate transaction queue
|
2016-04-07 15:36:01 +02:00 |
|
Marek Kotewicz
|
08980dabd6
|
Merge pull request #901 from ethcore/rpc
Use new json RPC server
|
2016-04-07 15:31:35 +02:00 |
|
Tomasz Drwięga
|
ed633bd0b7
|
Adding StatusPage and main page support
|
2016-04-07 15:14:39 +02:00 |
|
arkpar
|
8074fee28c
|
Use new json RPC server
|
2016-04-07 14:32:44 +02:00 |
|
Arkadiy Paronyan
|
8e64379ed4
|
Merge pull request #900 from ethcore/fixing-rpc
Gracefully dying when trying to enable RPC and app is compiled without it.
|
2016-04-07 14:25:22 +02:00 |
|
Tomasz Drwięga
|
6279237c86
|
Adding documentation
|
2016-04-07 13:15:59 +02:00 |
|
Tomasz Drwięga
|
db2354a252
|
Merge branch 'fixing-rpc' into webapps2
Conflicts:
parity/main.rs
|
2016-04-07 13:09:58 +02:00 |
|
Tomasz Drwięga
|
2adeb9fe88
|
Removing Option from setup_rpc_server method return type
|
2016-04-07 12:55:06 +02:00 |
|
Tomasz Drwięga
|
d1e3c633e5
|
Fixing compilation with rpc feature disabled
|
2016-04-07 12:50:35 +02:00 |
|
Arkadiy Paronyan
|
123a0f0b40
|
Merge pull request #893 from ethcore/closing
Additional logging and friendlier error messages
|
2016-04-07 12:36:19 +02:00 |
|
Tomasz Drwięga
|
1e0a787012
|
Merge branch 'closing' of github.com:ethcore/parity into closing
|
2016-04-07 12:30:48 +02:00 |
|