Jaco Greeff
601cef226b
Merge branch 'master' into jg-external-dapps
2016-11-15 09:25:42 +01:00
Jaco Greeff
604be3e463
Import AddresBook from exported JSON ( #3433 )
...
* Adds error handler in Importer // Import AddressBook #2885
* More robust import #2885
2016-11-15 09:24:59 +01:00
Jaco Greeff
1e155ae548
Render selection inside areas
2016-11-14 21:57:28 +01:00
GitLab Build Bot
c4885a1423
[ci skip] js-precompiled 20161114-201022
2016-11-14 20:11:54 +00:00
Denis S. Soldatov aka General-Beck
85fdcc7bf3
Update gitlab-ci
...
remove -Zorbit=off
switch to rust 1.13
2016-11-14 23:45:58 +04:00
Nicolas Gotchac
b9f3c4b266
Merge branch 'master' into ng-accounts-backup
2016-11-14 20:31:10 +01:00
Nicolas Gotchac
5322727617
Fixing linting issues #3430
2016-11-14 20:29:37 +01:00
Nicolas Gotchac
09ec0c1f2f
More robust import #2885
2016-11-14 20:26:21 +01:00
keorn
071e66c9a8
fix flaky test
2016-11-14 19:03:02 +00:00
keorn
9d46401626
revert to try!
2016-11-14 18:25:42 +00:00
keorn
ae5ae765a6
Merge branch 'master' into auth-round
2016-11-14 18:04:44 +00:00
GitLab Build Bot
3bfa56c72a
[ci skip] js-precompiled 20161114-174654
2016-11-14 17:48:20 +00:00
keorn
06ebd5fa1a
remove most panics
2016-11-14 17:42:56 +00:00
Nicolas Gotchac
134622ea3a
Adds error handler in Importer // Import AddressBook #2885
2016-11-14 18:34:05 +01:00
Gav Wood
cfbd5bd713
Merge pull request #3427 from ethcore/ng-address-input-improv
...
Scrollable accounts in autocomplete
2016-11-14 18:30:50 +01:00
Jannis R
b5560d27a0
sms verification: pull out postToVerificationServer
2016-11-14 18:03:07 +01:00
Robert Habermeier
25b0b8641e
indent state tests
2016-11-14 17:47:56 +01:00
Nicolas Gotchac
29442673f8
Clean-Up #3314
2016-11-14 17:39:45 +01:00
Nicolas Gotchac
97378daee5
Merge branch 'master' into ng-array-parameters
2016-11-14 17:06:02 +01:00
Jaco Greeff
5a6e2f89dd
Hide external apps by default
2016-11-14 17:02:45 +01:00
Nicolas Gotchac
9e2214c513
Working add/remove fields for var. length #3314
2016-11-14 17:00:36 +01:00
keorn
1e3ae9fff9
typos, header functions
2016-11-14 15:56:19 +00:00
GitLab Build Bot
5127b997eb
[ci skip] js-precompiled 20161114-155241
2016-11-14 15:54:09 +00:00
GitLab Build Bot
c061eae64b
[ci skip] js-precompiled 20161114-154454
2016-11-14 15:46:21 +00:00
Gav Wood
ef471af4ee
Merge pull request #3428 from ethcore/ws-rs
...
Bump ws-rs
2016-11-14 16:32:33 +01:00
Gav Wood
d98c6fb717
Merge pull request #3425 from ethcore/jg-tokenreg-decimals
...
Swap TokenReg dapp from base to decimals
2016-11-14 16:32:12 +01:00
Gav Wood
3eb019064b
Merge pull request #3421 from ethcore/travis-beta
...
Change beta builds to stable on Travis
2016-11-14 16:29:34 +01:00
Gav Wood
1418c3175a
Merge pull request #3420 from ethcore/refactor-copy-to-clipboard
...
refactor copy to clipboard functionality
2016-11-14 16:29:09 +01:00
Gav Wood
ae67bd5371
Merge pull request #3385 from ethcore/dev-chain
...
Dev chain
2016-11-14 16:28:58 +01:00
Gav Wood
2989ab9dfc
fetch known code from the database during restoration ( #3377 )
...
* fetch known code from the database during restoration
previously it kept all seen code in memory, leading to
high memory usage by the end of state restoration
* whitespace
[ci:skip]
* test previous code fetch
2016-11-14 16:28:15 +01:00
Nicolas Gotchac
89f83b8cd7
Fixes #3397 : fake blur handled
2016-11-14 16:11:00 +01:00
Tomasz Drwięga
d66cc0907d
Bump ws-rs
2016-11-14 16:10:04 +01:00
Jannis R
9df0d33709
merge master into sms-verification-modal
2016-11-14 16:00:16 +01:00
Nicolas Gotchac
ecb89d3670
Scrollable Accounts list // Tab;Enter;Keydown for first input #3396
2016-11-14 15:35:25 +01:00
keorn
0b5a9a6e60
nicer bundled spec message
2016-11-14 14:29:33 +00:00
GitLab Build Bot
6fc7c15644
[ci skip] js-precompiled 20161114-142451
2016-11-14 14:26:16 +00:00
Jaco Greeff
48b2252029
Swap from base to decimals
2016-11-14 15:16:57 +01:00
Robert Habermeier
3c7533831e
Merge branch 'master' into client-provider
2016-11-14 15:16:26 +01:00
keorn
5de7d50bf8
add test for multi proposals
2016-11-14 14:15:31 +00:00
keorn
8be8b3e1cd
ensure no double proposals
2016-11-14 13:35:45 +00:00
keorn
8a86c11375
enable force sealing
2016-11-14 13:35:16 +00:00
Arkadiy Paronyan
b4ef3f3255
Fixing benches ( #3422 )
2016-11-14 14:21:35 +01:00
Robert Habermeier
18153b8d9e
Merge branch 'master' into missing-code-by-prefix
2016-11-14 14:02:19 +01:00
Tomasz Drwięga
9f002a8a94
Fixing benches
2016-11-14 13:29:49 +01:00
Tomasz Drwięga
d02afc0e40
Beta -> Stable
2016-11-14 13:21:08 +01:00
keorn
165e2bef75
modify proposer test
2016-11-14 11:34:54 +00:00
Jannis R
b1fcee73a5
sms verification: less block confirmations
2016-11-14 12:33:29 +01:00
Jannis R
8ce362b224
sms verification: add terms of service
2016-11-14 12:31:26 +01:00
Tomasz Drwięga
2795f40464
Merge branch 'new-token' of github.com:ethcore/parity into new-token
2016-11-14 12:17:29 +01:00
Tomasz Drwięga
7f011afacb
Tokens retention policy
2016-11-14 12:17:05 +01:00
