Commit Graph

7194 Commits

Author SHA1 Message Date
Jannis R
4c42dedcad
sort props 💄 2016-12-15 13:51:44 +01:00
Jannis R
f59f7c5773
address style grumbles 💄 2016-12-15 13:48:40 +01:00
Jannis R
afba259506
merge master into jr-use-badge-reg 2016-12-15 13:25:35 +01:00
Denis S. Soldatov aka General-Beck
03db4d0373 Update gitlab-ci
add `cargo clean` in darwin build
2016-12-15 14:15:27 +07:00
Robert Habermeier
2966b88a7a Merge pull request #3835 from ethcore/bump-dev
Bump dev chain
2016-12-14 21:37:14 +01:00
Denis S. Soldatov aka General-Beck
245c8581bb Update .gitlab-ci.yml 2016-12-15 02:17:59 +07:00
Denis S. Soldatov aka General-Beck
244761782e Update gitlab-ci
Remove armv6 from `nightly`
remove `-j 8` key from windows builds
Remove `test-windows` from `nightly`
2016-12-15 02:14:15 +07:00
Vincent Serpoul
339b889ac4 spelling (#3839) 2016-12-14 15:15:19 +01:00
Jannis R
240bab230c
merge master into jr-use-badge-reg 2016-12-14 12:26:18 +01:00
keorn
ae98a56e8b revert submodule 2016-12-14 11:42:47 +01:00
keorn
e1d83d15b7 bump dev chain 2016-12-14 11:34:19 +01:00
GitLab Build Bot
1a9a142a69 [ci skip] js-precompiled 20161213-171715 2016-12-13 17:19:48 +00:00
Gav Wood
72b8ee84c7 Merge pull request #3766 from ethcore/jr-email-verification
email verification
2016-12-13 18:09:41 +01:00
Gav Wood
80d6e49070 Merge pull request #3812 from ethereumproject/splix/classic-replay-protection
Network configuration for Ethereum Classic
2016-12-13 17:39:33 +01:00
Robert Habermeier
0b69e41bd1 Merge pull request #3831 from ethcore/rpc-macros
Using jsonrpc-macros
2016-12-13 17:16:29 +01:00
Tomasz Drwięga
65d62ccf04 Altering the order [ci:skip] 2016-12-13 14:59:19 +01:00
Tomasz Drwięga
f47be50843 Using jsonrpc-macros 2016-12-13 14:40:35 +01:00
GitLab Build Bot
1114ad3ca7 [ci skip] js-precompiled 20161213-051314 2016-12-13 05:15:44 +00:00
Igor Artamonov
e61d14d7f7 reuse Morden for Classic Testnet 2016-12-12 19:50:32 +00:00
GitLab Build Bot
d2a34acdfd [ci skip] js-precompiled 20161212-143454 2016-12-12 14:37:25 +00:00
Gav Wood
3a16247655 Merge pull request #3823 from ethcore/jg-typedinput-tests
Fixed bool dropdown in contract execution
2016-12-12 15:28:58 +01:00
Jaco Greeff
3a7e30ec5c Fix issue with bool type dropdown 2016-12-12 12:49:40 +01:00
Jaco Greeff
563c8c75f9 Tests for DetailsStep (only bool dropdown) 2016-12-12 12:49:04 +01:00
Jaco Greeff
c5c4e5e901 Updated 2016-12-12 12:48:43 +01:00
Jaco Greeff
29674a0e65 Small testability fixes 2016-12-12 12:48:32 +01:00
Jaco Greeff
23234fb1aa Allow operation in test mode 2016-12-12 12:48:16 +01:00
Jannis R
c43944584d
fix import 2016-12-12 12:33:58 +01:00
Jannis R
723e9e55db
merge master into jr-email-verification 2016-12-12 12:21:06 +01:00
Jannis R
d67a9388ff
merge master into jr-use-badge-reg 2016-12-12 12:13:49 +01:00
Jaco Greeff
28be8d6f6c Test for bool TypedInput 2016-12-12 10:55:20 +01:00
Jaco Greeff
f9b5a056cf Merge branch 'master' into jg-typedinput-tests 2016-12-12 10:14:29 +01:00
Jaco Greeff
2c4c6ba4e4 Basic smoketest 2016-12-12 10:12:12 +01:00
GitLab Build Bot
1db4647327 [ci skip] js-precompiled 20161212-052342 2016-12-12 05:26:15 +00:00
GitLab Build Bot
f1096619a5 [ci skip] js-precompiled 20161212-034026 2016-12-12 03:43:28 +00:00
Gav Wood
c0a2d5c8f5 Merge pull request #3796 from ethcore/tx-broadcast
Avoid broadcasting transactions to peers that send them
2016-12-12 04:13:56 +01:00
Gav Wood
2844a4e85e Merge pull request #3800 from ethcore/eth-sign
eth_sign RPC now hashes given data instead of getting the hash
2016-12-12 04:12:27 +01:00
GitLab Build Bot
29af24519d [ci skip] js-precompiled 20161211-234535 2016-12-11 23:48:03 +00:00
Nicolas Gotchac
0cb16ae589 Add store for MethodDecoding (#3821)
* Add Loader to Transactions

* Add Method Decoding Store (better fetching of methods)

* Load locally stored ABI in MethodDecodingStore

* Fixes UI glitches along the way

* Linting

* Add method decoding from User Contracts
2016-12-12 00:38:47 +01:00
Jaco Greeff
22ac80d98f Add store for AddAddress (#3819)
* WIP

* Updated tests

* Final round of fixes

* Header update
2016-12-12 00:38:38 +01:00
GitLab Build Bot
2de64bb5e4 [ci skip] js-precompiled 20161211-202217 2016-12-11 20:24:36 +00:00
Tomasz Drwięga
83d9bc189b Fixing test 2016-12-11 21:08:15 +01:00
Nicolas Gotchac
4c3dea2a0b Fix React-Router in i18n locale change (#3815)
* Routes in routes config => no more react router error message

* Add LocalStorage for Locale Selection

* Ethcore to Parity LTD
2016-12-11 21:03:48 +01:00
Nicolas Gotchac
4dbfcf231d Cache fetched Dapps (#3804)
* Have a singleton DappsFetcher so we don't realod them at each page load

* Better dapps Fetcher : event based listener
  Update on meta change

* Remove dapps fetcher => all in singleton dapps store + utils

* Modify header to Parity
2016-12-11 21:03:40 +01:00
GitLab Build Bot
f4134cf634 [ci skip] js-precompiled 20161211-193650 2016-12-11 19:39:15 +00:00
Gav Wood
972aa79f9f Merge pull request #3818 from ethcore/consistent-crate-info
authors & homepage => Parity
2016-12-11 20:17:40 +01:00
GitLab Build Bot
282178e1fa [ci skip] js-precompiled 20161211-190404 2016-12-11 19:06:28 +00:00
Gav Wood
94f5501c61
authors & homepage => Parity 2016-12-11 19:43:58 +01:00
Gav Wood
c33901bd9f Merge pull request #3817 from ethcore/rename-ethcore-parity
Rename Ethcore -> Parity Technologies
2016-12-11 19:36:21 +01:00
Gav Wood
58b72c521d
Rename ethcore -> parity in licenses. 2016-12-11 19:31:31 +01:00
Gav Wood
17cc2be4b5
Rename ethcore -> parity in license. 2016-12-11 19:30:54 +01:00