Commit Graph

354 Commits

Author SHA1 Message Date
Dan Finlay b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
kumavis 4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
Anton 71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
Anton 1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton 62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
kumavis fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie e8b2e11c56 Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
Whymarrh Whitby c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby 924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis 44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis 8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
Csaba Solya 2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00
Csaba Solya 3642810584 remove unnecessary lib 2018-05-10 13:34:56 +02:00
Csaba Solya 349fb9e0bc revert unnecessary change in state manager 2018-05-10 13:33:40 +02:00
Csaba Solya 9026651224 add time stamps to transaction history log entries 2018-05-10 13:26:02 +02:00
bitpshr 6351b7bb88 Fix documentation typo 2018-05-07 15:08:43 -04:00
kumavis a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis fec4c50657 controllers - network - move default config out of first-time-state 2018-05-02 18:03:59 -07:00
frankiebee a45cb75435 transactions - add a nonce check utility for ui use 2018-05-01 13:57:43 -07:00
frankiebee 62bf76db53 fix - getTxsByMetaData check if the key is in the object not if the value is truthy 2018-05-01 13:57:14 -07:00
kumavis 53caa49666 network - refactor to remove unnecesary code 2018-04-30 17:59:53 -07:00
kumavis 6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
kumavis bfedd2776d controllers - network - more semantic assert 2018-04-30 16:23:16 -07:00
Thomas Huang 3180b69b97
Merge pull request #4140 from MetaMask/v4.6.1
Version 4.6.1
2018-04-30 14:37:22 -07:00
frankiebee 98ae853b6c require log 2018-04-30 09:57:36 -07:00
frankiebee 706647785c log emitter errors 2018-04-29 16:35:08 -07:00
frankiebee 7eb735651b transactions - run event emitters outside context of _setTxStatus 2018-04-29 16:32:16 -07:00
kumavis 2b9925a9e4
Merge pull request #4110 from MetaMask/master
Develop - Add commits to develop that are already in Master
2018-04-27 16:17:46 -06:00
bitpshr 8c5994abc9 Return 0 for token rate fetch failures 2018-04-26 18:31:54 -04:00
Thomas Huang 4e7b0ff15c
Merge pull request #4095 from MetaMask/v4.6.0
Version 4.6.0
2018-04-26 14:16:35 -07:00
kumavis dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3
docs and file organization for txController
2018-04-25 16:52:46 -06:00
kumavis 1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
frankiebee 8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -07:00
Dan Finlay f6653b9f94
Merge pull request #4069 from MetaMask/i4056-LatestPriceApi
Use latest balanc3 api for prices
2018-04-25 10:42:03 -07:00
Dan Finlay 7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -07:00
Dan ed264d3479 Merge branch 'master' into dm-docs-2 2018-04-24 12:36:30 -02:30
Dan Finlay a833f02f33 Use the metamask balanc3 dev price api
Fixes #4056
2018-04-23 16:39:33 -07:00
Alexander Tseung 9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Dan Finlay 621e9334bc Cleaned up some typos and JSDocs in Transactions
Nonce tracker is not fully documented yet.
Have not yet touched:
- tx-state-manager
- tx-state-history-helper
- util
- tx-gas-utils
- pending-tx-tracker
2018-04-23 09:43:18 -07:00
Dan 0c26df9653 Fix nits. 2018-04-23 14:11:02 -02:30
Dan Finlay 74c419f9b6
Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr
Documentation
2018-04-20 14:10:05 -07:00
Dan 69920045e9 Minor fixes in a number of docs. 2018-04-20 15:48:58 -02:30
Dan 71b0de76ff Merge branch 'master' into dm-docs-2 2018-04-20 13:23:17 -02:30
bitpshr 8636f3bae5 Clean up JSDoc for background scripts 2018-04-19 15:14:00 -04:00
frankiebee e862a5091e transactions - fix refernces 2018-04-19 12:07:45 -07:00
frankiebee c20c97ce62 Merge branch 'master' into tx-controller-rewrite-v3 2018-04-19 11:49:11 -07:00
frankiebee eeb9390de8 meta - transactions - docs yo! 2018-04-19 11:46:15 -07:00