Dan Finlay
7659f5894a
Combine two identical then blocks
2017-01-05 11:03:30 -08:00
Frankie
cf6817092b
remove unnecessary try statments
2017-01-04 15:03:45 -08:00
Frankie
4b17222a59
Merge branch 'TxManager' into fixTxManager
2017-01-04 14:06:49 -08:00
Frankie
f50e983500
Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into TxManager
2017-01-04 13:53:54 -08:00
Frankie
32e8063a77
clean up
2017-01-04 13:13:34 -08:00
Frankie
354fa763d4
Merge branch 'dev' into fixtTxManager
2017-01-04 13:05:29 -08:00
Frankie
e6da8e2762
Fix signing of transactions
2017-01-04 13:04:33 -08:00
Dan Finlay
c22da8450c
Merge pull request #965 from MetaMask/chrome-permissions
...
Chrome permissions
2017-01-03 13:21:13 -08:00
Kevin Serrano
b571913daf
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev
2017-01-03 12:19:33 -08:00
Kevin Serrano
0ba63e0ead
Merge pull request #964 from MetaMask/i963-BalancesNotUpdating
...
Update UI state on ethStore updates
2017-01-03 12:19:26 -08:00
Kevin Serrano
0a6d8af171
Merge branch 'dev' into i963-BalancesNotUpdating
2017-01-03 12:07:38 -08:00
Kevin Serrano
1a16057857
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev
2017-01-03 11:41:34 -08:00
Kevin Serrano
74cccb4f1d
Merge pull request #962 from MetaMask/i961-UpdateUiBug
...
Fix AddAccount not updating UI
2017-01-03 11:41:26 -08:00
Dan Finlay
2c2cdc4475
Convert more actions to new simple pattern
2017-01-03 11:33:15 -08:00
Dan Finlay
10c818abac
Restore missing line
2017-01-03 11:30:27 -08:00
Kevin Serrano
3363a38bfc
Changelog.
2017-01-03 11:26:19 -08:00
Kevin Serrano
68e27e6193
Changelog.
2017-01-03 11:24:03 -08:00
Kevin Serrano
68be524019
Take out unneeded permissions from the app.
2017-01-03 11:23:27 -08:00
Dan Finlay
33b4d213f1
Fix sendUpdate for new promisified getState method
2017-01-03 11:15:38 -08:00
Dan Finlay
1b9906372b
Update UI state on ethStore updates
...
UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity.
Fixes #963
2017-01-03 11:10:20 -08:00
Dan Finlay
013e6a608f
Corrected instances of showWarning to displayWarning
2017-01-03 11:03:25 -08:00
Dan Finlay
8b7b097034
Apply new pattern to repetitive functions
2017-01-03 10:42:09 -08:00
Dan Finlay
3ebf029c04
Update account list after adding account
...
Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process.
Fixes #961
2017-01-03 10:39:34 -08:00
Kevin Serrano
b13c54682b
Merge pull request #958 from MetaMask/i897-ReplayProtection
...
Add replay protection
2017-01-03 09:28:53 -08:00
Dan Finlay
fe61fcb0fc
Merge branch 'dev' into i897-ReplayProtection
2017-01-02 17:49:04 -08:00
Dan Finlay
b93cdd428b
Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManager
2017-01-02 17:38:37 -08:00
Dan Finlay
6b8db04f0f
Merge remote-tracking branch 'origin/i727-provider-is-metamask' into RevertTxManager
2017-01-02 17:34:35 -08:00
Dan Finlay
2dbbc0dce7
Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager
2017-01-02 17:32:51 -08:00
Dan Finlay
305cda4265
Use chainId parameter instead of second argument
2017-01-02 15:31:05 -08:00
Dan Finlay
af2c7004b0
Make single letter variables more verbose
2017-01-02 15:08:18 -08:00
Dan Finlay
7320095079
Linted
2017-01-02 14:54:31 -08:00
Dan Finlay
d2fb48f8ba
Bump changelog
2017-01-02 14:41:04 -08:00
Dan Finlay
9c6c277b8b
Add replay protection to Transaction Manager
...
Fixes #897
Needs tests.
2017-01-02 14:38:04 -08:00
Dan Finlay
25d0ac1476
Merge branch 'dev' into ShowDifferentAccounts
2017-01-02 14:04:27 -08:00
Dan Finlay
edc5f9e821
Add tolerance for hex prefixed private keys to simple keychain
2017-01-02 13:55:43 -08:00
Frankie
fb002dc44e
Merge pull request #954 from MetaMask/kumavis-readme-gource
...
Readme - add gource instructions to readme
2017-01-02 12:49:37 -08:00
Frankie
d461fe6fdc
Merge pull request #955 from MetaMask/i727-provider-is-metamask
...
inpage-provider - add isMetaMask
2017-01-02 12:39:30 -08:00
kumavis
616721f47d
inpage-provider - add isMetaMask
...
adds `metamaskInpageProvider.isMetaMask === true`
Fixes #727
2017-01-02 12:20:09 -08:00
kumavis
fc9c03d4d1
meta - readme - add gource instructions
2017-01-02 12:09:56 -08:00
kumavis
fc723e7f7c
Merge pull request #921 from MetaMask/TxManager
...
Feature: TxManager handles transaction state tracking
2017-01-02 14:30:00 -05:00
Dan Finlay
5e8a344f97
Correct getState test to be async
2016-12-23 18:40:36 -08:00
Dan Finlay
c05e04c611
Fix rendering of loose accounts
2016-12-23 17:23:33 -08:00
Dan Finlay
f6748f043d
Add loose account development state
2016-12-23 17:22:36 -08:00
Dan Finlay
21af3de43d
Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts
2016-12-23 17:10:56 -08:00
Dan Finlay
e95c937569
Add additional migration test
2016-12-23 17:09:24 -08:00
Frankie
fa3e708f34
Merge branch 'dev' into TxManager
2016-12-23 12:48:36 -08:00
Frankie
fde69ea0ba
fix some minor spelling mistakes and clean up code
2016-12-23 12:43:42 -08:00
Dan Finlay
1f15499046
Show a "LOOSE" warning on accounts not belonging to HD Seed phrase
2016-12-22 17:17:20 -08:00
Dan Finlay
a10fe6b6f4
Return keyring metadata on metamask state object
...
Required making the getState methods for both keyringController and metamaskController async.
They both now return promises, and the main metamask-controller.getState method is now nodeified.
Will allow the UI to render loose keys differently than persisted keys.
2016-12-22 17:17:07 -08:00
Kevin Serrano
2ab34760b0
Merge pull request #949 from MetaMask/RemoveLog
...
Remove log
2016-12-22 14:50:52 -08:00
