Tomasz Drwięga
2ef6f756d0
Merge branch 'master' into idmanager
...
Conflicts:
webapp/src/apps.rs
webapp/src/page/mod.rs
webapp/src/proxypac.rs
webapp/src/router/mod.rs
2016-05-16 20:22:19 +02:00
Tomasz Drwięga
6363b0f69f
Bumping status&idmanager
2016-05-16 20:10:43 +02:00
arkpar
9d2823da89
style
2016-05-16 19:46:09 +02:00
Nikolay Volf
f3f45a1dd9
ethsync tests fixed
2016-05-16 20:25:05 +03:00
Nikolay Volf
caec38d533
Merge branch 'master' into miner-spec-refact
...
Conflicts:
ethcore/build.rs
2016-05-16 19:46:56 +03:00
Nikolay Volf
8cc321fe24
fix warnings
2016-05-16 19:45:16 +03:00
Nikolay Volf
7c28b1cef9
removed engine retrieval from client public api
2016-05-16 19:43:48 +03:00
Nikolay Volf
4e41cbca81
Moving all Client public API types to separate mod & binary serialization codegen for that mod ( #1051 )
...
* transaction moved
* trash remove
* ids move
* receipt
* tree-route
* blockchain info
* log_entry move
* trace filter moved
* executed & trace moved
* localized trace moved
* block status moved
* build scripts and codegen refs
* Cargo.lock update
* binary for blockstatus, blockchaininfo
* binary for trace
* trace filters binary ser
* binary for log entries & executed
* binary for receipt
* special case for u8 & transaction binary attribute
* resolved remaining issues & error binary serialization
* json-tests util import
* fix warnings
* ids attr
* add missing attributes
* Update build.rs
2016-05-16 18:33:32 +02:00
Nikolay Volf
994d056922
miner will use separate spec
2016-05-16 19:16:56 +03:00
Nikolay Volf
71278def5e
Merge branch 'master' into types-binary
2016-05-16 17:48:18 +03:00
Tomasz Drwięga
9301963d98
Subdomains support in content server (webapps server). ( #1082 )
...
* Proxy.pac serving
* Subdomains router for dapps
* Proper handling of prefixed and non-prefixed apps
* Changing dapps domain to parity
2016-05-16 16:08:52 +02:00
Arkadiy Paronyan
ab06c9209b
Merge pull request #1087 from ethcore/fixuncle
...
Fix uncle getter
2016-05-16 14:55:11 +02:00
arkpar
b5e10a53af
Sync block collection
2016-05-16 14:42:04 +02:00
Gav Wood
56c705968b
Fix typo.
2016-05-16 13:33:29 +02:00
Tomasz Drwięga
2d18bc936f
Merge branch 'content-server' into idmanager
...
Conflicts:
webapp/src/lib.rs
2016-05-16 13:15:18 +02:00
Tomasz Drwięga
237bd37030
Changing dapps domain to parity
2016-05-16 13:01:56 +02:00
Tomasz Drwięga
d94030294a
Bumping idmanager version
2016-05-16 13:00:55 +02:00
Gav Wood
f4d5c7b48e
Fix uncle getter
...
Uncle blocks don't necessarily have BlockDetails, so can't get total
difficulty directly.
Closes #1057
2016-05-16 12:46:09 +02:00
Nikolay Volf
96e92f1c38
add missing attributes
2016-05-15 02:34:27 +03:00
Nikolay Volf
d67d1eb355
ids attr
2016-05-15 02:32:53 +03:00
Nikolay Volf
9e7968c92e
fix warnings
2016-05-15 02:13:45 +03:00
Nikolay Volf
326e1b3a42
json-tests util import
2016-05-15 01:56:18 +03:00
Nikolay Volf
483687b6bf
resolved remaining issues & error binary serialization
2016-05-15 00:51:02 +03:00
Nikolay Volf
2d992d0c29
Merge branch 'master' into types-binary
...
Conflicts:
ethcore/src/error.rs
2016-05-14 23:12:18 +03:00
Nikolay Volf
52e22b8a51
Merge pull request #1085 from ethcore/fix1073
...
Provide fallback for usd-per-eth option when offline.
2016-05-14 22:02:35 +03:00
Nikolay Volf
05f00a946d
Merge pull request #1083 from ethcore/path-man
...
path centralized
2016-05-14 22:01:37 +03:00
Nikolay Volf
3ea26fcb0a
merged out function return
2016-05-14 20:43:29 +03:00
Nikolay Volf
93aa6c613a
Merge branch 'master' into path-man
...
Conflicts:
parity/configuration.rs
2016-05-14 20:22:59 +03:00
Gav Wood
33248528b9
Provide fallback for usd-per-eth option when offline.
...
Fixes #1073 .
2016-05-14 14:53:46 +01:00
Nikolay Volf
354ac7d6e5
Limiting result of the execution to execution-specific errors ( #1071 )
...
* execution error/result limiting
* missing trailing comma
* fix executive tests
* adding original error as string to the generic transaction error
* 'mallformed'-s all around
2016-05-14 13:28:44 +01:00
Nikolay Volf
2b78e511c9
Configurable keys security ( #1080 )
...
* adding options & cli flags
* adding it to the key deriving
* removed duplicated option
2016-05-14 12:30:25 +01:00
Marek Kotewicz
9b91444638
comma delimeting multiple cors headers ( #1078 )
2016-05-14 12:29:26 +01:00
Tomasz Drwięga
72b1b41748
Supporting topbar injection
2016-05-13 18:40:20 +02:00
Nikolay Volf
96496d6349
by ref
2016-05-13 18:36:18 +03:00
Nikolay Volf
7c19930efa
creating all in one place
2016-05-13 18:32:32 +03:00
Nikolay Volf
9150538ac4
refactoring in configuration
2016-05-13 13:53:33 +03:00
Nikolay Volf
d5d5b0918c
mod for paths & ethereum default paths
2016-05-13 13:12:32 +03:00
Tomasz Drwięga
0a85df10e8
Proper handling of prefixed and non-prefixed apps
2016-05-13 10:21:41 +02:00
Arkadiy Paronyan
effa2cf96d
Merge pull request #1081 from poppingtonic/fix-drop-impl-error-message
...
Update error message
2016-05-12 20:43:32 +02:00
Brian Muhia
4a8fe6c99d
Update error message
2016-05-12 18:39:12 +03:00
Tomasz Drwięga
3fc7faf24c
Subdomains router for dapps
2016-05-12 15:53:04 +02:00
Tomasz Drwięga
f62d058186
Proxy.pac serving
2016-05-12 14:45:09 +02:00
Marek Kotewicz
06aefb54bc
Merge pull request #1076 from ethcore/wallet-bump
...
Updating dapp-wallet
2016-05-12 07:46:35 +03:00
Tomasz Drwięga
a22f0a0d03
Updating dapp-wallet
2016-05-11 18:10:42 +02:00
Nikolay Volf
889642c3d4
special case for u8 & transaction binary attribute
2016-05-11 13:23:11 +03:00
Arkadiy Paronyan
89b1b25fde
Merge pull request #1070 from ethcore/net-local-connect-fix
...
Fixed connecting to local nodes on startup
2016-05-11 11:28:50 +02:00
Nikolay Volf
6c74bfb153
Merge branch 'master' into types-binary
2016-05-11 11:55:43 +03:00
arkpar
9836c79962
Fixed connecting to local nodes on startup
2016-05-11 00:08:35 +02:00
Arkadiy Paronyan
ab288268bc
Validate signature in Tx queue ( #1068 )
...
* moving deps to ethcore/hyper and bumping jsonrpc-http-server version
* Validate signature in tx queue
2016-05-10 11:43:26 +01:00
Arkadiy Paronyan
80e48f3672
Merge pull request #1067 from ethcore/hyper-update-3
...
moving deps to ethcore/hyper and bumping jsonrpc-http-server version
2016-05-10 11:34:06 +02:00
