Tomasz Drwięga
19ca9ad460
Prevent broadcasting transactions to peer that send them.
2016-12-10 21:22:19 +01:00
Nicolas Gotchac
70eab0da03
PR grumbles
2016-12-10 20:29:22 +01:00
Nicolas Gotchac
89ed76497e
Merge branch 'master' into ng-ui-fixes
2016-12-10 20:23:09 +01:00
Nicolas Gotchac
0f6681d3e8
Linting issue
2016-12-10 19:15:45 +01:00
Nicolas Gotchac
69c0086ada
Better Autocomplete Divider
2016-12-10 19:14:29 +01:00
Nicolas Gotchac
2346f29731
Add dividers to AutoComplete
2016-12-10 18:35:54 +01:00
Nicolas Gotchac
cd6ab07217
Use the new onClose
autocomplete prop
2016-12-10 17:06:44 +01:00
Nicolas Gotchac
84116130f6
Add sender balances to contract (exec/deploy)
2016-12-10 16:58:03 +01:00
Nicolas Gotchac
d9da8a48ff
Add sender balance in transfer modal
2016-12-10 16:46:00 +01:00
Nicolas Gotchac
054b4810d5
Fix wallet data's prop types
2016-12-10 15:30:39 +01:00
Tomasz Drwięga
704054ef40
Merge branch 'master' into tx-broadcast
...
Conflicts:
ethcore/src/client/traits.rs
2016-12-10 15:23:53 +01:00
Nicolas Gotchac
ef93262311
See addresses outside address book + Save them
2016-12-10 15:19:05 +01:00
Tomasz Drwięga
e1ade5b375
Maintaining a list of transactions propagated from other peers
2016-12-10 15:18:44 +01:00
Nicolas Gotchac
65f586ed14
Fix tab bar active style
2016-12-10 14:32:54 +01:00
Nicolas Gotchac
81c5085b35
Don't create new Contracts instance if already exists
2016-12-10 14:31:20 +01:00
Nicolas Gotchac
13607d48be
Better use of Tab Bar
2016-12-10 14:26:35 +01:00
Nicolas Gotchac
591d086f42
Better use of React-Router (maintaining old routes)
2016-12-10 14:19:15 +01:00
Gav Wood
82efa2675e
Merge remote-tracking branch 'origin/master' into consistent-id
2016-12-10 13:36:30 +01:00
Nicolas Gotchac
51b9034a5e
Don't show addresses while loading balances (fix flash of unsorted)
2016-12-10 12:44:48 +01:00
Nicolas Gotchac
0d9b1882a3
Treat tabs as real link (enable Ctrl+Click for new Tab)
2016-12-10 01:56:38 +01:00
Nicolas Gotchac
f6564dcc2f
Fix dapps separation
2016-12-10 01:32:39 +01:00
Nicolas Gotchac
b9c04fcd00
Fixes to the Wallet UI ( #3787 )
...
* Correct number of transactions for contracts
* Remove daily limit info if set to 0
* Hide tx count for contracts
2016-12-10 01:26:47 +01:00
Nicolas Gotchac
6655e7e3c0
Add support for wallets without getOwner() interface ( #3779 )
...
* Make Wallet Mist compatible #3282
* Owners icons on load
* Fix oversized logo on load
* Don't fetch registry twice (even when pending)
* Better logging...
* Better contract view : show if no events // show loading events
* Better decimal typed input
* PR grumble
2016-12-10 01:26:28 +01:00
Nicolas Gotchac
923f85d90d
Update Material-UI ( #3785 )
...
* Update MUI => Fixes wrong error styled inputs
* Update postcss import
2016-12-10 01:26:03 +01:00
Nicolas Gotchac
5c555aa18f
Fixes error in Transfer modal (mix between props and own property) ( #3788 )
2016-12-10 01:25:23 +01:00
Gav Wood
341777dbb6
Merge pull request #3743 from ethcore/jg-test-ui
...
Basic UI rendering tests
2016-12-09 23:16:11 +01:00
Gav Wood
5f1fcf95e0
Make *ID names consistent with std Rust (Id)
2016-12-09 23:01:43 +01:00
Gav Wood
598fd42856
Merge pull request #3770 from ethcore/jg-execute-gas
...
GasPrice selection for contract execution
2016-12-09 20:24:10 +01:00
Gav Wood
45ec84e627
Merge pull request #3752 from ethcore/jg-subscription-check
...
Allow autoRemove from api.subscribe based on callback return values
2016-12-09 20:16:34 +01:00
GitLab Build Bot
647b62b4a2
[ci skip] js-precompiled 20161209-182130
2016-12-09 18:23:46 +00:00
Gav Wood
b99403740a
Merge pull request #3773 from ethcore/ng-enhanced-multisig
...
Lower gas usage for creating a Multisig Wallet
2016-12-09 19:15:46 +01:00
Jaco Greeff
a73e0a987e
Merge branch 'master' into jg-test-ui
2016-12-09 18:34:58 +01:00
Jaco Greeff
290a4a40ff
Merge branch 'master' into jg-subscription-check
2016-12-09 18:17:36 +01:00
Jaco Greeff
0cbef30508
Unsubscribe on true
2016-12-09 18:17:31 +01:00
Jaco Greeff
99846e2ad2
Merge branch 'master' into jg-subscription-check
2016-12-09 18:14:09 +01:00
Jaco Greeff
1b0945940b
Test for boolean result before unsubscribe
2016-12-09 18:14:05 +01:00
GitLab Build Bot
fd23a2972c
[ci skip] js-precompiled 20161209-165845
2016-12-09 17:00:59 +00:00
Jaco Greeff
ffd8314a11
Be lenient around invalid owners map ( #3764 )
...
* Be lenient around invalid owners map
* Filter invalid owners before render
2016-12-09 17:52:25 +01:00
Nicolas Gotchac
ff11634e1d
PR Grumble
2016-12-09 16:55:43 +01:00
Jannis R
bc33231f7c
merge master into jr-use-badge-reg
2016-12-09 16:53:14 +01:00
Jannis R
eb1429237b
merge master into jr-email-verification
2016-12-09 16:52:44 +01:00
Jannis R
c249c51dd3
certification: use BadgeReg to load the contract
2016-12-09 16:40:45 +01:00
Nicolas Gotchac
bace05b154
Merge branch 'master' into ng-enhanced-multisig
2016-12-09 16:40:07 +01:00
Nicolas Gotchac
caf3a96c19
Add fallback Full Fleshed Wallet if no library
2016-12-09 16:29:57 +01:00
Nicolas Gotchac
efee55ae84
Updated Wallet Version ! Now only 500k gas for Wallet creation
2016-12-09 16:24:11 +01:00
Jannis R
452b8c9c74
split sms & email verification 3rdparty code
...
We might want to bundle the code in `3rdparty`.
React & presentational components don't belong in there. At the
same time, the terms of service are strictly related to the use
of these external services. We decided to not bundle them, but
still keep them in a file called `terms-of-service.js`.
The commit also moves the "how it works" section into the
presentational part in `modals/Verification`.
2016-12-09 16:23:13 +01:00
Jaco Greeff
d992c642ff
Adjust to final step on rejected/completed
2016-12-09 15:55:50 +01:00
Nicolas Gotchac
63137b1548
Add enhanced Wallet solidity code
2016-12-09 15:52:28 +01:00
Jaco Greeff
d2494d1425
GasPrice selection for contract execution
2016-12-09 15:43:24 +01:00
Jannis R
6d20592f76
remove certification on Revoke
2016-12-09 14:06:02 +01:00
GitLab Build Bot
1213ada59c
[ci skip] js-precompiled 20161209-125036
2016-12-09 12:52:50 +00:00
Jaco Greeff
2582514b58
GasEditor component ( #3750 )
...
* Initial split of component (WIP)
* GasPriceEditor externalised
* Fix lint
2016-12-09 13:44:35 +01:00
Jaco Greeff
befcc9cc1a
Cleanups ( #3742 )
...
* Remove unused file
* Combine tx checks into single file
* Move UI components into UI
* DRY links
* Unused rollup config
* Cleanup util paths
* Revert "Move UI components into UI"
This reverts commit 3379e61246cde635c296d31322b71e63395a5cd4.
* Re-apply ~/util/tx move
* Cleanup unused styles
2016-12-09 13:44:10 +01:00
Jaco Greeff
00c53a8d18
Merge branch 'master' into jg-test-ui
2016-12-09 13:36:50 +01:00
Jaco Greeff
bb209424ac
IdentityName flags testing
2016-12-09 13:36:46 +01:00
Jannis R
fd88421e88
store id with certifiers
2016-12-09 13:35:10 +01:00
Jannis R
3dc943e854
merge master into jr-use-badge-reg
2016-12-09 13:14:35 +01:00
Jaco Greeff
1f4c84cbf1
Theme tests
2016-12-09 13:03:46 +01:00
Jannis R
a94bbea7a5
more user-friendly method selection
2016-12-09 12:37:36 +01:00
Jaco Greeff
296301e284
Extend tests for TxList
2016-12-09 10:55:46 +01:00
Jaco Greeff
a133e41e16
Merge branch 'master' into jg-test-ui
2016-12-09 09:53:55 +01:00
GitLab Build Bot
83f791fa5d
[ci skip] js-precompiled 20161209-044115
2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd
[ci skip] js-precompiled 20161209-014235
2016-12-09 01:44:45 +00:00
Jaco Greeff
8f9fdb350c
Merge branch 'master' into jg-subscription-check
2016-12-09 02:34:07 +01:00
Jaco Greeff
f9a24f3c8e
Update babel, fix CI build due to breaking changes ( #3754 )
...
* Update babel to latest version
* Re-add circular deps plugin
* Bump for build
* Fixes for babel build
2016-12-09 02:33:12 +01:00
Jaco Greeff
6b65a1f872
Merge branch 'master' into jg-subscription-check
2016-12-09 01:41:44 +01:00
GitLab Build Bot
e1ad347cdb
[ci skip] js-precompiled 20161209-003004
2016-12-09 00:32:45 +00:00
Nicolas Gotchac
09334ca3bd
Small fixes to contract ( #3751 )
...
* Fix contracts execution will fallback function
* Fix contract execute modal
* Working execute from Contract
* Don't dupliacet events
* Gas * 1.2 in wallet confirmations
2016-12-09 01:21:51 +01:00
Jaco Greeff
13f962ae01
Attempt to fix ci webpack
2016-12-09 00:56:12 +01:00
Jaco Greeff
10c356de65
Simplify, consolidate uses between subscription managers
2016-12-09 00:52:21 +01:00
Jannis R
5418c56b01
remove Prepare step
...
The modal got really crowded and the preparation step had
only been shown for fractions of a second anyways. The
"loading" message is now part of the next step.
2016-12-09 00:39:16 +01:00
Jannis R
dfc445b6d6
fix bugs & linting issues
2016-12-09 00:39:16 +01:00
Jannis R
162420f4c2
send emailHash with request, update ABI
2016-12-09 00:39:16 +01:00
Jannis R
0e0f602d5e
pass fields to query into QueryCode
2016-12-09 00:39:16 +01:00
Jannis R
052f9258a5
pass fields to query into GatherData
2016-12-09 00:39:15 +01:00
Jannis R
d3fd71d953
add email-specific contract, helpers, store
2016-12-09 00:39:15 +01:00
Jannis R
1ac3421f33
step to select verification method
2016-12-09 00:39:15 +01:00
Jannis R
1672cbad7b
factor out SMS-specific logic
2016-12-09 00:39:15 +01:00
Jannis R
b5b529f8c2
modals/SMSVerification -> modals/Verification
2016-12-09 00:39:15 +01:00
Jannis R
600a7e5ccc
make SMS verification contract general purpose
2016-12-09 00:39:15 +01:00
Jannis R
e536290892
fix linting issues
2016-12-09 00:38:44 +01:00
Jannis R
a84cd9143f
show certifications in accounts list
2016-12-09 00:36:27 +01:00
Jannis R
5862f2a9eb
Certifications: read dappsUrl from state
2016-12-09 00:34:59 +01:00
Jannis R
e1c5796a5c
fetch certifications in account view
2016-12-09 00:34:59 +01:00
Jannis R
409c4adfbf
fetch certifiers from BadgeReg
2016-12-09 00:34:58 +01:00
Jannis R
b32b636697
fetch certifiers by id
2016-12-09 00:34:58 +01:00
Jannis R
2b34d76b8c
pull out fetchMeta
2016-12-09 00:34:58 +01:00
Jaco Greeff
3989e2642b
Typo
2016-12-09 00:25:50 +01:00
Jaco Greeff
1ecda93de9
Align api.subscribe with contract
2016-12-09 00:15:39 +01:00
Jaco Greeff
4ce3142c63
Add autoRemove functionality to api.contract.subscribe
2016-12-09 00:15:27 +01:00
Jaco Greeff
ad971a444c
Add autoRemove functionality for api.subscribe
2016-12-09 00:00:56 +01:00
Jaco Greeff
9d5de519b6
Merge remote-tracking branch 'origin/jg-test-ui' into jg-test-ui
2016-12-08 17:33:15 +01:00
Jaco Greeff
0544e0e786
Merge branch 'jg-test-ui-2' into jg-test-ui
2016-12-08 17:33:02 +01:00
Jaco Greeff
96d4569cf3
Update test describe paths
2016-12-08 17:31:41 +01:00
Jaco Greeff
ae49251c81
Remove .only
2016-12-08 17:04:21 +01:00
Jaco Greeff
507b4b68a1
Merge branch 'master' into jg-test-ui
2016-12-08 16:50:23 +01:00
Jaco Greeff
9e8fb616d3
Add store tests, fix issue with pending sort to top
2016-12-08 16:50:19 +01:00
GitLab Build Bot
4e1b72b45c
[ci skip] js-precompiled 20161208-150237
2016-12-08 15:04:38 +00:00
Jaco Greeff
a1fb1240a7
Properly delete addresses/contracts in addressbook ( #3739 )
...
* Remove previously market addresses at startup
* Remove meta.deleted checks
* Remove artifact from code move
2016-12-08 15:54:23 +01:00
Nicolas Gotchac
d38da1f3b4
Display Wallet Owners in Accounts list ( #3741 )
2016-12-08 15:53:46 +01:00
Nicolas Gotchac
715761a714
Edit Multisig Wallet settings ( #3740 )
...
* WIP Sending tokens in multi-sig wallet
* Working Token transfer for multi-sig wallet #3282
* Add operation hash to transfer modal
* Add existing wallet from address #3282
* Wallet delete redirect to Wallets/Accounts #3282
* Rightly check balance in Transfer // Get all accounts balances #3282
* Fix linting
* Better Header UI for Wallet
* Use the `~` webpack alias
* Use Webpack `~` alias
* Add `ETH` format to number typed input
* Fix wallet creation hint && eth input type
* Update dailylimit #3282
* Fix too long copied message
* WIP Wallet settings modification #3282
* WIP edit contract parameters #3282
* Edit Wallet parameters #3282
* Don't show wallets if none
* Fix Transfer for Wallet #3282
* Optimized version of contract code
* Fix wrong max in Wallet creation // Round gas in API
2016-12-08 15:53:29 +01:00
GitLab Build Bot
69e010bbf9
[ci skip] js-precompiled 20161208-144436
2016-12-08 14:46:49 +00:00
Jaco Greeff
328db0c124
Replace build directory completely ( #3748 )
2016-12-08 15:39:27 +01:00
Jaco Greeff
fb80cf6190
Add existing release files before merge ( #3747 )
2016-12-08 15:20:53 +01:00
Jaco Greeff
5d224df2d5
Release script back to using fetch/merge ( #3746 )
...
* Update with -X only for merge
* Release back to using fetch/merge
2016-12-08 15:02:45 +01:00
Jaco Greeff
1ab4ee3781
Update Button with correct proptypes
2016-12-08 14:53:57 +01:00
Jaco Greeff
cbd5fe7c07
Update with -X only for merge ( #3745 )
2016-12-08 14:48:09 +01:00
Jaco Greeff
a5b5277a88
Expanded basic tests for #2289
2016-12-08 13:00:29 +01:00
Jaco Greeff
543428fe5d
NODE_ENV=test for all tests
2016-12-08 12:59:59 +01:00
Jaco Greeff
699a821775
Merge branch 'master' into jg-test-ui
2016-12-08 12:45:40 +01:00
Robert Habermeier
de4715bc67
Merge pull request #3732 from ethcore/jg-duplicate-accounts
...
Give accounts precedence over address_book entries
2016-12-08 12:27:26 +01:00
Jaco Greeff
b3f7c00780
ui/Container tests as per #2289
2016-12-08 12:22:40 +01:00
Jaco Greeff
ad8a191e95
Adjust specs to show location
2016-12-08 12:19:03 +01:00
Jaco Greeff
88e5ed9ea5
Allow mocha to use webpack aliasses via babel
2016-12-08 12:18:43 +01:00
Jaco Greeff
5f1021822d
Cleanups on js-precompiled ( #3738 )
...
* Cleanups on js-precompiled
* Combined
* Adjust based on Pr comments
2016-12-07 21:38:28 +01:00
GitLab Build Bot
9e8d90b5ba
[ci skip] js-precompiled 20161207-173717
2016-12-07 17:39:18 +00:00
Jaco Greeff
46840d36c9
Add parity_removeAddress RPC
2016-12-07 16:53:46 +01:00
GitLab Build Bot
3388eab76a
[ci skip] js-precompiled 20161207-123833
2016-12-07 12:40:35 +00:00
GitLab Build Bot
2e40a00768
[ci skip] js-precompiled 20161207-122336
2016-12-07 12:26:14 +00:00
Nicolas Gotchac
8dbd56888d
Add functionalities to multi-sig wallet ( #3729 )
...
* WIP Sending tokens in multi-sig wallet
* Working Token transfer for multi-sig wallet #3282
* Add operation hash to transfer modal
* Add existing wallet from address #3282
* Wallet delete redirect to Wallets/Accounts #3282
* Rightly check balance in Transfer // Get all accounts balances #3282
* Fix linting
* Better Header UI for Wallet
* Use the `~` webpack alias
* Use Webpack `~` alias
2016-12-07 12:47:44 +01:00
Jaco Greeff
5bdb6e4f22
Ignore meta.deleted for account name display
2016-12-07 11:51:48 +01:00
Jaco Greeff
f7586109df
Ignore meta.deleted for accounts
2016-12-07 11:48:08 +01:00
Jaco Greeff
be90245ecb
PropTypes as function call ( #3731 )
2016-12-07 10:46:46 +01:00
Jaco Greeff
e2bb8ef6d1
Unify proptypes in util/proptypes.js ( #3728 )
...
* Unify proptypes in util/proptypes.js
* Add missing use of nodeOrStringProptype
2016-12-07 10:25:57 +01:00
GitLab Build Bot
97e60a6e9c
[ci skip] js-precompiled 20161207-042556
2016-12-07 04:28:25 +00:00
GitLab Build Bot
0f76533713
[ci skip] js-precompiled 20161206-084538
2016-12-06 08:47:58 +00:00
Nicolas Gotchac
bec3539651
First draft of the MultiSig Wallet ( #3700 )
...
* Wallet Creation Modal #3282
* Name and description to Wallet #3282
* Add Wallet to the Account Page and Wallet Page #3282
* Fix Linting
* Crete MobX store for Transfer modal
* WIP Wallet Redux Store
* Basic Details for Wallet #3282
* Fixing linting
* Refactoring Transfer store for Wallet
* Working wallet init transfer #3282
* Optional gas in MethodDecoding + better input
* Show confirmations for Wallet #3282
* Order confirmations
* Method Decoding selections
* MultiSig txs and confirm pending #3282
* MultiSig Wallet Revoke #3282
* Confirmations and Txs Update #3282
* Feedback for Confirmations #3282
* Merging master fixes...
* Remove unused CSS
2016-12-06 09:37:59 +01:00
GitLab Build Bot
98bfbdc5cb
[ci skip] js-precompiled 20161205-174841
2016-12-05 17:50:43 +00:00
Jaco Greeff
873f451df1
Move decoding for contract deployment logic earlier ( #3714 )
...
* Move decoding deployment logic earlier
* Removed rendunant isContract
2016-12-05 18:42:44 +01:00
GitLab Build Bot
e6ed49b2c9
[ci skip] js-precompiled 20161205-150312
2016-12-05 15:05:10 +00:00
GitLab Build Bot
cf796d3ea4
[ci skip] js-precompiled 20161205-105433
2016-12-05 10:56:28 +00:00
Nicolas Gotchac
9a43e6d6c8
Update JS dependencies ( #3710 )
...
* Minor Versions NPM updates
* Remove unused packages
* No longer relevant JS test
* Update some major versions // Revert Rechartjs
* Update Redux/React-{Ace, RouterRedux}
* Updated React Tooltips
* Update mock-socket // Update tests to pass
* Updated React Router
* Removed `history` module that isn't necessary (instead of updating it)
* Updated redux-actions
* Removed commented hot store reload
2016-12-05 11:48:43 +01:00
Nicolas Gotchac
52b4ce0dd7
Use Webpack Aliases ( #3711 )
...
* Adds aliases to Webpack Build
* Use `ui` Webpack alias
* Use `views` alias
* Use `modals` aliase
* Use `providers` aliase
* Use `contracts` aliase
* Use '~' aliase
* from `ui` to from `~/ui`
* from to from
* from `modals` to from `~/modals`
* from `providers` to from `~/redux/providers`
* from `contracts` to from `~/contracts`
* Updated Webpack App config
2016-12-05 11:47:13 +01:00
GitLab Build Bot
a9424bdf26
[ci skip] js-precompiled 20161204-042533
2016-12-04 04:27:27 +00:00
GitLab Build Bot
ca4aa42615
[ci skip] js-precompiled 20161203-062111
2016-12-03 06:23:18 +00:00
Gav Wood
be7401c8bf
Merge pull request #3671 from ethcore/jg-signer-decoding
...
Signer method parameter decoding & destination info
2016-12-02 22:13:35 -08:00
GitLab Build Bot
f093b077a4
[ci skip] js-precompiled 20161203-043512
2016-12-03 04:37:04 +00:00
GitLab Build Bot
f15906fe8d
[ci skip] js-precompiled 20161202-201514
2016-12-02 20:18:10 +00:00
Jaco Greeff
b2a5d66c99
Fix slice test ( #3712 )
2016-12-02 21:10:22 +01:00
GitLab Build Bot
4c32d3ced4
[ci skip] js-precompiled 20161202-142708
2016-12-02 14:29:56 +00:00
Jaco Greeff
fbd3738096
Merge branch 'master' into jg-signer-decoding
2016-12-02 15:27:56 +01:00
Jaco Greeff
b8b9086dae
React library update ( #3704 )
...
* Update React & MaterialUI
* Adjust TabBar layouts for new MUI
2016-12-02 15:21:25 +01:00
Nicolas Gotchac
456b50639c
Adds Loading Component ( #3707 )
2016-12-02 15:21:11 +01:00
Nicolas Gotchac
c892a4f7ae
Refactoring Transfer Modal ( #3705 )
...
* Better Token Select in Transfer > Details
* Better Autocomplete
* Crete MobX store for Transfer modal
* Remove unused var
* Update Webpack Conf
* Small changes...
* Optional gas in MethodDecoding + better input
* New Contract `getAll` method // TxList Row component
* Method Decoding selections
* Rename `getAll` to `getAllLogs`
2016-12-02 15:21:01 +01:00
Jaco Greeff
bd2e2b630c
Fix extra scrollbars in dapps ( #3706 )
...
* Fix extra scrollbars in dapps
* Dapps list padding
* spelling
* lint
* Height overflow fix
2016-12-02 15:10:38 +01:00
Jaco Greeff
2dd2004ed5
Merge branch 'master' into jg-signer-decoding
...
# Conflicts:
# js/src/views/Signer/components/RequestFinished/requestFinished.js
2016-12-02 11:21:17 +01:00
GitLab Build Bot
986e8ef9a2
[ci skip] js-precompiled 20161202-052414
2016-12-02 05:26:08 +00:00
GitLab Build Bot
f30a8f79f2
[ci skip] js-precompiled 20161202-034812
2016-12-02 03:50:41 +00:00
Gav Wood
21a76c22fc
Merge pull request #3698 from ethcore/jg-null-transaction
...
Filter null transactions for display (not available on node)
2016-12-01 19:40:16 -08:00
Gav Wood
5b829aece7
Merge pull request #3697 from ethcore/jr-move-recovery-print
...
move recovery phrase print button
2016-12-01 19:38:31 -08:00