tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Apply new pattern to repetitive functions	Dan Finlay	2017-01-04	1	-19/+2
\|
*	Update account list after adding account	Dan Finlay	2017-01-04	1	-10/+24
\| \| \| \| \| \|	Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961
*	Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManager	Dan Finlay	2017-01-03	3	-7/+7
\|\
\| *	Make single letter variables more verbose	Dan Finlay	2017-01-03	2	-5/+5
\| \|
\| *	Merge branch 'dev' into ShowDifferentAccounts	Dan Finlay	2017-01-03	20	-657/+669
\| \|\
\| \| *	Merge pull request #954 from MetaMask/kumavis-readme-gource	Frankie	2017-01-03	1	-0/+36
\| \| \|\ \| \| \| \| \| \| \| \|	Readme - add gource instructions to readme
\| \| * \	Merge pull request #955 from MetaMask/i727-provider-is-metamask	Frankie	2017-01-03	1	-0/+2
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	inpage-provider - add isMetaMask
\| * \| \| \|	Add tolerance for hex prefixed private keys to simple keychain	Dan Finlay	2017-01-03	1	-3/+4
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'origin/i727-provider-is-metamask' into ↵	Dan Finlay	2017-01-03	1	-0/+2
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \|	RevertTxManager
\| * \| \| \|	inpage-provider - add isMetaMask	kumavis	2017-01-03	1	-0/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	adds `metamaskInpageProvider.isMetaMask === true` Fixes #727
* \| \| \|	Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager	Dan Finlay	2017-01-03	19	-655/+666
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	meta - readme - add gource instructions	kumavis	2017-01-03	1	-0/+36
\| \|/
\| *	Merge pull request #921 from MetaMask/TxManager	kumavis	2017-01-03	18	-657/+631
\| \|\ \| \| \| \| \| \|	Feature: TxManager handles transaction state tracking
\| \| *	Merge branch 'dev' into TxManager	Frankie	2016-12-24	15	-197/+318
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	fix some minor spelling mistakes and clean up code	Frankie	2016-12-24	4	-34/+32
\| \| \|
\| \| *	fix merge	Frances Pangilinan	2016-12-22	1	-1/+1
\| \| \|
\| \| *	Merge branch 'dev' into TxManager	Frankie	2016-12-22	38	-362/+813
\| \| \|\
\| \| * \|	Remove txManager in keyring controller	Frances Pangilinan	2016-12-22	1	-2/+0
\| \| \| \|
\| \| * \|	Migrate all tx mutation code out of keyring controller and	Frances Pangilinan	2016-12-22	4	-54/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix up txManager to reflect code review requests
\| \| * \|	First pass at revision requests	Frances Pangilinan	2016-12-22	13	-595/+239
\| \| \| \|
\| \| * \|	Clean up and comment functions	Frances Pangilinan	2016-12-15	2	-10/+31
\| \| \| \|
\| \| * \|	add to CHANGELOG.md	Frances Pangilinan	2016-12-15	1	-0/+1
\| \| \| \|
\| \| * \|	add Test for txManager. As well as fix tests to account for txManager.	Frances Pangilinan	2016-12-15	6	-80/+185
\| \| \| \|
\| \| * \|	Create a TxManager	Frances Pangilinan	2016-12-15	7	-159/+350
\| \| \| \|
* \| \| \|	Correct getState test to be async	Dan Finlay	2016-12-24	1	-4/+7
\| \| \| \|
* \| \| \|	Fix rendering of loose accounts	Dan Finlay	2016-12-24	2	-3/+5
\| \| \| \|
* \| \| \|	Add loose account development state	Dan Finlay	2016-12-24	1	-0/+126
\| \| \| \|
* \| \| \|	Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts	Dan Finlay	2016-12-24	3	-4/+22
\|\ \ \ \
\| * \| \| \|	Add additional migration test	Dan Finlay	2016-12-24	3	-4/+22
\| \|/ / /
* \| \| \|	Show a "LOOSE" warning on accounts not belonging to HD Seed phrase	Dan Finlay	2016-12-23	3	-7/+42
\| \| \| \|
* \| \| \|	Return keyring metadata on metamask state object	Dan Finlay	2016-12-23	2	-29/+55
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge pull request #949 from MetaMask/RemoveLog	Kevin Serrano	2016-12-23	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Remove log
\| * \| \|	Remove log	Dan Finlay	2016-12-23	1	-1/+0
\|/ / /
* \| \|	Merge pull request #948 from MetaMask/RecoverLostAccounts	Dan Finlay	2016-12-23	14	-191/+316
\|\ \ \ \| \| \| \| \| \| \| \|	Auto-Recover accounts lost to BIP44 derivation fix
\| * \| \|	Rename function to be an action	Dan Finlay	2016-12-23	1	-2/+2
\| \| \| \|
\| * \| \|	Break up migration function	Dan Finlay	2016-12-23	1	-24/+24
\| \| \| \|
\| * \| \|	Don't bother changing selected accounts since accounts are recovered	Dan Finlay	2016-12-23	1	-13/+3
\| \| \| \|
\| * \| \|	Remove logs	Dan Finlay	2016-12-23	1	-2/+2
\| \| \| \|
\| * \| \|	Linted	Dan Finlay	2016-12-22	1	-4/+3
\| \| \| \|
\| * \| \|	Restructured migration	Dan Finlay	2016-12-22	6	-144/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.
\| * \| \|	Return undefined when vault is uninitialized	Dan Finlay	2016-12-22	1	-1/+1
\| \| \| \|
\| * \| \|	Added error when trying to unlock uninitialized vault	Dan Finlay	2016-12-22	1	-0/+4
\| \| \| \|
\| * \| \|	Move old keystore migration code to metamask controller	Dan Finlay	2016-12-22	2	-46/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
\| * \| \|	Fixed another lostAccount test	Dan Finlay	2016-12-22	1	-1/+1
\| \| \| \|
\| * \| \|	Refine a lostAccount test	Dan Finlay	2016-12-21	1	-1/+1
\| \| \| \|
\| * \| \|	Linted	Dan Finlay	2016-12-21	3	-5/+3
\| \| \| \|
\| * \| \|	Add lost accounts ui development state	Dan Finlay	2016-12-21	1	-0/+91
\| \| \| \|
\| * \| \|	Make notices confirmation configurable	Dan Finlay	2016-12-21	6	-15/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Confirm button will now dismiss the lost accounts array.
* \| \| \|	Fix account injection bug	Dan Finlay	2016-12-23	1	-2/+3
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](https://github.com/MetaMask/metamask-plugin/commit/f5b0795ac5582dd53de728479cf47c43eabfe67c) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908
* \| \|	Merge pull request #944 from MetaMask/i938-uri-validation	Dan Finlay	2016-12-22	4	-13/+39
\|\ \ \ \| \|/ / \|/\| \|	I938 uri validation
\| * \|	Add to changelog.	Kevin Serrano	2016-12-21	1	-0/+1
\| \| \|
\| * \|	Lint.	Kevin Serrano	2016-12-21	2	-12/+12
\| \| \|
\| * \|	Validate URIs before entering them in.	Kevin Serrano	2016-12-21	2	-2/+27
\|/ /
* \|	Merge pull request #916 from MetaMask/i894-DetectBadAccounts	Dan Finlay	2016-12-21	9	-57/+124
\|\ \ \| \| \| \| \| \|	I894 detect bad accounts
\| * \|	Made changes according to feedback.	Dan Finlay	2016-12-20	5	-14/+13
\| \| \|
\| * \|	Got bad account detection working and added to state	Dan Finlay	2016-12-10	4	-34/+13
\| \| \|
\| * \|	Mostly added bad account detection	Dan Finlay	2016-12-09	8	-50/+139
\| \|/ \| \| \| \| \| \|	Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
* \|	Merge pull request #939 from MetaMask/BrowserPassworder	Dan Finlay	2016-12-21	4	-228/+3
\|\ \ \| \| \| \| \| \|	Remove encryptor in favor of external browser-passworder
\| * \|	Bump passworder version	Dan Finlay	2016-12-21	1	-1/+1
\| \| \|
\| * \|	Use security patched version of browser-passworder	Dan Finlay	2016-12-21	1	-1/+1
\| \| \|
\| * \|	Remove encryptor in favor of external browser-passworder	Dan Finlay	2016-12-20	4	-228/+3
\| \| \| \| \| \| \| \| \| \| \| \|	I broke out the encryptor lib into its own module on npm called browser-passworder.
* \| \|	Merge pull request #942 from MetaMask/Version-2.14.1	Dan Finlay	2016-12-21	2	-1/+3
\|\ \ \ \| \|/ / \|/\| \|	Version 2.14.1
\| * \|	Version 2.14.12.14.1	Dan Finlay	2016-12-21	2	-1/+3
\| \| \|
* \| \|	Merge pull request #937 from MetaMask/i900-forgot-password-flow	Dan Finlay	2016-12-20	8	-26/+32
\|\ \ \ \| \| \| \| \| \| \| \|	I900 forgot password flow
\| * \| \|	Modify actions to support better transition.	Kevin Serrano	2016-12-20	3	-1/+18
\| \| \| \|
\| * \| \|	Add to changelog.	Kevin Serrano	2016-12-20	1	-0/+1
\| \| \| \|
\| * \| \|	Lint.	Kevin Serrano	2016-12-20	3	-6/+5
\| \| \| \|
\| * \| \|	Redirect to seed word screen for forgotten passwords.	Kevin Serrano	2016-12-20	4	-20/+9
\| \| \| \|
* \| \| \|	Merge pull request #936 from MetaMask/MergeMaster	kumavis	2016-12-20	25	-54/+626
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Merge master
\| * \| \|	Merged master into dev	Dan Finlay	2016-12-20	25	-54/+626
\|/\| \| \| \| \|/ /
\| * \|	Merge pull request #935 from MetaMask/kumavis-patch-1	Dan Finlay	2016-12-20	2	-8/+11
\| \|\ \ \| \| \| \| \| \| \| \|	inpage - temporarily disable ping stream
\| \| * \|	changelog - add whitespace	kumavis	2016-12-20	1	-0/+1
\| \| \| \|
\| \| * \|	Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2016-12-20	0	-0/+0
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kumavis-patch-1
\| \| \| * \	Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2016-12-20	2	-4/+6
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kumavis-patch-1
\| \| \| \| * \	Merge branch 'master' into kumavis-patch-1	kumavis	2016-12-20	2	-4/+5
\| \| \| \| \|\ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #929 from MetaMask/Version-2.14.0	Dan Finlay	2016-12-20	2	-4/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 2.14.0
\| \| * \| \| \| \|	Version 2.14.02.14.0	Dan Finlay	2016-12-17	2	-4/+5
\| \|/ / / / /
\| \| * / / /	changelog - inf reload detection hotfix	kumavis	2016-12-20	2	-4/+6
\| \| \|/ / /
\| \| * / /	changelog - add note on inf reload detection hotfix	kumavis	2016-12-20	1	-1/+1
\| \| \|/ /
\| \| * /	inpage - temporarily disable ping stream	kumavis	2016-12-20	1	-8/+9
\| \|/ /
\| * \|	Merge pull request #927 from MetaMask/AddNotices	Dan Finlay	2016-12-17	19	-21/+607
\| \|\ \ \| \| \| \| \| \| \| \|	Add notices
\| \| * \|	Clean up first notice	Dan Finlay	2016-12-17	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant title from notice component. Make link color the same orange as the rest of the UI.
\| \| * \|	Add date to notices display.	Kevin Serrano	2016-12-17	1	-1/+15
\| \| \| \|
\| \| * \|	move notice code from metamask-controller + config-manager, in to ↵	kumavis	2016-12-17	5	-205/+213
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notice-controller
\| \| * \|	meta - add npm-debug.log to gitignore	kumavis	2016-12-17	1	-0/+1
\| \| \| \|
\| \| * \|	clean - code style	kumavis	2016-12-17	2	-8/+3
\| \| \| \|
\| \| * \|	Deactivate polling for now.	Kevin Serrano	2016-12-17	1	-1/+3
\| \| \| \|
\| \| * \|	Merge branch 'AddNotices' of github.com:MetaMask/metamask-plugin into AddNotices	Dan Finlay	2016-12-17	2	-1/+12
\| \| \|\ \
\| \| \| * \|	remove duplicate controller.	Kevin Serrano	2016-12-17	1	-3/+0
\| \| \| \| \|
\| \| \| * \|	Clean notices.	Kevin Serrano	2016-12-17	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	The first notice, the fall of morden.	Kevin Serrano	2016-12-17	2	-1/+12
\| \| \| \| \|
\| \| * \| \|	Cleanup	Dan Finlay	2016-12-17	3	-4/+1
\| \| \|/ /
\| \| * \|	Rebuild development states before ci tests	Dan Finlay	2016-12-17	1	-2/+3
\| \| \| \|
\| \| * \|	Add ability to show notices to user & get confirmation.	Kevin Serrano	2016-12-17	4	-20/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
\| \| * \|	Add ability to show notices to user & get confirmation.	Kevin Serrano	2016-12-17	17	-4/+554
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
\| * \|	Merge pull request #923 from MetaMask/RemoveMorden	Frankie	2016-12-17	6	-27/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Remove morden
\| \| * \|	Bump changelog for removing morden	Dan Finlay	2016-12-16	1	-0/+1
\| \| \| \|
\| \| * \|	Remove morden testnet provider	Dan Finlay	2016-12-16	5	-27/+2
\| \|/ / \| \| \| \| \| \| \| \| \|	Instances configured to point at Morden will now point at Ropsten.
\| * \|	Merge pull request #918 from MetaMask/i915-txPermaCache	kumavis	2016-12-13	2	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \|	deps - bump provider-engine for bug fix
\| \| * \|	deps - bump provider-engine for bug fix	kumavis	2016-12-13	2	-1/+2
\| \|/ /
\| * \|	Merge pull request #912 from MetaMask/kumavis-patch-1	Dan Finlay	2016-12-08	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \|	changelog - "fix reload detection"
\| \| * \|	changelog - "fix reload detection"	kumavis	2016-12-08	1	-0/+2
\| \|/ /
\| * \|	Merge pull request #911 from MetaMask/i873-reloadBroken	Dan Finlay	2016-12-08	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fix broken disconnect detector
\| \| * \|	inpage - correctly listen for incomming messages	kumavis	2016-12-08	1	-1/+1
\| \|/ /
\| * \|	Merge pull request #891 from MetaMask/Version-2.13.11	Dan Finlay	2016-11-29	2	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Version 2.13.11
\| \| * \|	Version 2.13.112.13.11	Dan Finlay	2016-11-24	2	-1/+3
\| \|/ /
* \| \|	Merge pull request #926 from MetaMask/revert-920-dev	Dan Finlay	2016-12-17	11	-54/+101
\|\ \ \ \| \| \| \| \| \| \| \|	Revert "Interface enhancements"
\| * \| \|	Revert "Interface enhancements"	Dan Finlay	2016-12-17	11	-54/+101
\|/ / /
* \| \|	Merge pull request #920 from luisivan/dev	Dan Finlay	2016-12-15	11	-101/+54
\|\ \ \ \| \|_\|/ \|/\| \|	Interface enhancements
\| * \|	Fixed header h1 alignment and network name	Luis Iván Cuende	2016-12-15	2	-5/+3
\| \| \|
\| * \|	Better account details view	Luis Iván Cuende	2016-12-15	5	-42/+14
\| \| \|
\| * \|	Better editable label	Luis Iván Cuende	2016-12-15	5	-40/+15
\| \| \|
\| * \|	Better buttons	Luis Iván Cuende	2016-12-14	2	-4/+9
\| \| \|
\| * \|	Beautified disclaimer	Luis Iván Cuende	2016-12-14	3	-11/+14
\|/ /
* \|	Merge pull request #914 from MetaMask/FixUnitTestSuite	Dan Finlay	2016-12-09	2	-2/+2
\|\ \ \| \| \| \| \| \|	Remove .only from unit test suite
\| * \|	Cranked up CI test suite wait duration to alleviate their nondeterminism for now	Dan Finlay	2016-12-08	1	-1/+1
\| \| \|
\| * \|	Remove .only from unit test suite	Dan Finlay	2016-12-08	1	-1/+1
\|/ /
* \|	Merge pull request #904 from MetaMask/BetterIntegrationTest	kumavis	2016-12-02	9	-18/+161
\|\ \ \| \| \| \| \| \|	Made integration test suite better, added a step to story
\| * \|	Remove redundant logging block	Dan Finlay	2016-12-02	1	-3/+0
\| \| \|
\| * \|	Fix vault encrypting & unlocking bug	Dan Finlay	2016-12-01	6	-13/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
\| * \|	Add integration tests for logging out and back in	Dan Finlay	2016-12-01	2	-2/+29
\| \| \|
\| * \|	Add more integration tests	Dan Finlay	2016-12-01	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integration tests now: - Scroll through terms - Accept terms - Confirm seed phrase - Verify account detail screen
\| * \|	Made integration test create a first vault	Dan Finlay	2016-12-01	5	-4/+58
\|/ /
* \|	Merge pull request #899 from MetaMask/i893-DenodeifyKeyringController	Kevin Serrano	2016-11-30	2	-3/+10
\|\ \ \| \| \| \| \| \|	Fix incorrect nodeification and add descriptive error to help find in future
\| * \|	Add useful nodeify error message	Dan Finlay	2016-11-30	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a nodified method does not return a Promise, it will throw an error, like this: ``` Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified. ```
\| * \|	Return promise correctly from setSelectedAddress	Dan Finlay	2016-11-30	1	-1/+1
\| \| \|
* \| \|	Merge pull request #896 from MetaMask/i893-DenodeifyKeyringController	Kevin Serrano	2016-11-30	9	-458/+722
\|\\| \| \| \| \| \| \| \|	Denodeify most of KeyringController
\| * \|	Flattened addTx async methods	Dan Finlay	2016-11-30	2	-90/+83
\| \| \|
\| * \|	Bind ethQuery to estimateGas to allow it to be moved around.	Dan Finlay	2016-11-30	1	-2/+2
\| \| \|
\| * \|	Fix tx adding code	Dan Finlay	2016-11-30	2	-50/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
\| * \|	Ordered keyringController methods the same in metamask-controller	Dan Finlay	2016-11-30	2	-5/+9
\| \| \|
\| * \|	Annotated KeyringController	Dan Finlay	2016-11-30	1	-219/+496
\| \| \|
\| * \|	Remove unused dep	Dan Finlay	2016-11-29	1	-1/+0
\| \| \|
\| * \|	Fix nodeify usage	Dan Finlay	2016-11-29	1	-11/+11
\| \| \|
\| * \|	Fix nodeify	Dan Finlay	2016-11-29	2	-55/+35
\| \| \|
\| * \|	Denodeify most of KeyringController	Dan Finlay	2016-11-29	7	-172/+230
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mostly Fixes #893 A couple methods cache callbacks, and will require a larger refactor to fully denodeify. Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those. I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
* \| \|	Merge pull request #890 from MetaMask/MergeMasterIntoDev	Kevin Serrano	2016-11-29	6	-33/+72
\|\\| \| \| \| \| \| \| \|	Merge master into dev
\| * \|	Merge branch 'master' into dev	Dan Finlay	2016-11-24	6	-33/+72
\|/\| \| \| \|/
\| *	Merge pull request #884 from MetaMask/i883-sync-uninstallFilter	kumavis	2016-11-24	2	-0/+9
\| \|\ \| \| \| \| \| \|	Add support for sync RPC uninstallFilter
\| \| *	changelog - add sync rpc eth_uninstallFilter note	kumavis	2016-11-24	1	-0/+2
\| \| \|
\| \| *	rpc - add sync uninstallFilter support	kumavis	2016-11-24	1	-0/+7
\| \|/
\| *	Merge pull request #876 from MetaMask/Version-2.13.10	Dan Finlay	2016-11-23	2	-3/+7
\| \|\ \| \| \| \| \| \|	Version 2.13.10
\| \| *	Version 2.13.102.13.10	Dan Finlay	2016-11-23	2	-3/+7
\| \|/
\| *	Merge pull request #872 from MetaMask/i868-estimateGasTooHigh	kumavis	2016-11-23	2	-29/+50
\| \|\ \| \| \| \| \| \|	Improve gas estimation logic
\| \| *	Merge branch 'master' into i868-estimateGasTooHigh	kumavis	2016-11-23	5	-8/+17
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #864 from MetaMask/new-faucet	kumavis	2016-11-23	3	-4/+5
\| \|\ \ \| \| \| \| \| \| \| \|	Point to ropsten faucet
\| \| * \	Merge branch 'master' into new-faucet	Dan Finlay	2016-11-23	3	-4/+12
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #855 from MetaMask/i834-RopstenLinks	Kevin Serrano	2016-11-23	3	-4/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add ropsten link support
\| \| * \| \|	Unify test wording	Dan Finlay	2016-11-22	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Add temporary morden explorer link support	Dan Finlay	2016-11-22	2	-1/+7
\| \| \| \| \|
\| \| * \| \|	Fix ropsten link test	Dan Finlay	2016-11-22	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Bump changelog	Dan Finlay	2016-11-22	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into i834-RopstenLinks	Dan Finlay	2016-11-22	2	-1/+3
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Add ropsten link support	Dan Finlay	2016-11-22	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	Ropsten has sole access to the faucet.	Kevin Serrano	2016-11-23	2	-4/+4
\| \| \| \| \|
\| \| \| * \|	Add to changelog.	Kevin Serrano	2016-11-23	3	-2/+3
\| \| \|/ / \| \|/\| \|
\| \| \| *	idStore - fix estimateGas calculation	kumavis	2016-11-23	2	-29/+50
\| \| \|/ \| \|/\|
\| * \|	Merge pull request #838 from MetaMask/Version-2.13.9	kumavis	2016-11-22	2	-1/+3
\| \|\ \ \| \| \|/ \| \|/\|	Version 2.13.9
\| \| *	Version 2.13.92.13.9	Dan Finlay	2016-11-22	2	-1/+3
\| \|/
\| *	Merge pull request #832 from MetaMask/i831-AddRopsten	Kevin Serrano	2016-11-22	8	-4/+42
\| \|\ \| \| \| \| \| \|	Begin adding Ropsten support
* \| \	Merge pull request #887 from MetaMask/i865-erabe	Kevin Serrano	2016-11-24	5	-37/+20
\|\ \ \ \| \| \| \| \| \| \| \|	Modify forgot password flow to go back to init screen.
\| * \| \|	Cosmetic changes, rename links.	Kevin Serrano	2016-11-24	1	-9/+9
\| \| \| \|
\| * \| \|	Add link back to unlock.	Kevin Serrano	2016-11-24	1	-0/+16
\| \| \| \|
\| * \| \|	Fix proper behavior for restoring accounts when password forgotten.	Kevin Serrano	2016-11-24	2	-0/+2
\| \| \| \|
\| * \| \|	Modify forgot password flow to go back to init screen.	Kevin Serrano	2016-11-24	2	-36/+1
\| \| \| \|
* \| \| \|	Merge pull request #888 from MetaMask/i844-AsyncKeyrings	Kevin Serrano	2016-11-24	6	-144/+236
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Modify Keyring protocol to always return promises for public methods
\| * \| \|	Fix last async keyring test	Dan Finlay	2016-11-24	1	-8/+10
\| \| \| \|
\| * \| \|	Fix more async usage of KeyringController	Dan Finlay	2016-11-24	1	-25/+32
\| \| \| \|
\| * \| \|	Fix more keyring asyncifying tests	Dan Finlay	2016-11-24	2	-3/+11
\| \| \| \|
\| * \| \|	Mostly got async keyringController tests passing	Dan Finlay	2016-11-23	4	-62/+100
\| \| \| \|
\| * \| \|	Complete first pass at asyncrhonizing keyring controller	Dan Finlay	2016-11-23	1	-31/+53
\| \| \| \|
\| * \| \|	Asynced keyrings and started on controller	Dan Finlay	2016-11-23	3	-32/+47
\|/ / /
* \| \|	Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor	Kevin Serrano	2016-11-23	5	-6/+21
\|\ \ \ \| \| \| \| \| \| \| \|	Fix new encryptor implementation
\| * \| \|	Fix new encryptor migration logic	Dan Finlay	2016-11-23	3	-3/+13
\| \| \| \|
\| * \| \|	Fix undefined provider menu item	Dan Finlay	2016-11-23	1	-2/+5
\| \| \| \|
\| * \| \|	Fix password reference	Dan Finlay	2016-11-23	2	-1/+3
\| \| \| \|
* \| \| \|	Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptor	Dan Finlay	2016-11-23	4	-49/+42
\|\\| \| \| \| \| \| \| \| \| \| \|	Simplify Encryptor API Surface
\| * \| \|	Remove line of cruft	Dan Finlay	2016-11-23	1	-1/+0
\| \| \| \|
\| * \| \|	Fix vault migration unit test	Dan Finlay	2016-11-23	1	-1/+1
\| \| \| \|
\| * \| \|	Improve vault migration unit test	Dan Finlay	2016-11-23	1	-1/+2
\| \| \| \|
\| * \| \|	Refine isInitialized derivation method	Dan Finlay	2016-11-23	1	-1/+1
\| \| \| \|
\| * \| \|	Linted	Dan Finlay	2016-11-23	1	-1/+1
\| \| \| \|
\| * \| \|	Simplify Encryptor API Surface	Dan Finlay	2016-11-23	3	-49/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded and labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859
\| * \| \|	Merge branch 'dev' into i843-MoveSaltIntoEncryptor	Dan Finlay	2016-11-23	48	-138/+234
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev	Dan Finlay	2016-11-23	2	-5/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	I868 estimate gas too high dev
\| * \| \| \|	KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG	kumavis	2016-11-23	2	-5/+62
\| \| \| \| \|
* \| \| \| \|	Merge pull request #858 from MetaMask/i842-WaitForSeedWord	kumavis	2016-11-23	4	-8/+21
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	I842 wait for seed word
\| * \| \| \|	Move state update outside of conditional callback block	Dan Finlay	2016-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Restore ropsten link support	Dan Finlay	2016-11-23	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Remove callback type check	Dan Finlay	2016-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix etherscan link generation test	Dan Finlay	2016-11-23	1	-2/+8
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' into i842-WaitForSeedWord	Dan Finlay	2016-11-23	8	-46/+67
\| \|\ \ \ \
\| * \| \| \| \|	Use callback in placeSeedWord method.	Dan Finlay	2016-11-22	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842
* \| \| \| \| \|	Merge pull request #857 from MetaMask/i841-RenameMethod	kumavis	2016-11-23	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename idStoreMigrator method for clarity
\| * \| \| \| \| \|	Rename idStoreMigrator method for clarity	Dan Finlay	2016-11-22	2	-2/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #841
* \| \| \| \| \|	Merge pull request #869 from MetaMask/dev-cleanup	kumavis	2016-11-23	37	-71/+77
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dev Cleanup Package
\| * \ \ \ \ \	Merge branch 'dev' into dev-cleanup	Kevin Serrano	2016-11-23	8	-46/+67
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Fix camel casing on setSelectedAccount action.	Dan Finlay	2016-11-22	3	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added instructions for installing local build	Dan Finlay	2016-11-22	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change fauceting to become a response of an emit.	Kevin Serrano	2016-11-22	3	-4/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	change all instances of selectedAddress to selectedAccount.	Kevin Serrano	2016-11-22	31	-52/+49
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove entropy from encryption and project.	Kevin Serrano	2016-11-22	7	-17/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #871 from MetaMask/i860-ethjsremove	kumavis	2016-11-23	2	-6/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Phase out ethereumjs-util from encryptor module.
\| * \| \| \| \| \|	Phase out ethereumjs-util from encryptor module.	Kevin Serrano	2016-11-23	2	-6/+5
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #866 from MetaMask/new-faucet-dev	Dan Finlay	2016-11-23	3	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ropsten faucet button point at the correct url.
\| * \| \| \| \| \|	Make ropsten faucet button point at the correct url.	Kevin Serrano	2016-11-23	3	-3/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #856 from MetaMask/i835-OrganizeKeyrings	Kevin Serrano	2016-11-23	6	-45/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I835 organize keyrings
\| * \| \| \| \| \|	Fix keyring test	Dan Finlay	2016-11-22	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve Keyring organization	Dan Finlay	2016-11-22	5	-42/+62
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)
\| \| \| * \| \|	Began moving salt into encryptor	Dan Finlay	2016-11-23	1	-5/+10
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Revert premature link test fix	Dan Finlay	2016-11-22	1	-2/+2
\|/ / / /
* / / /	Fixed account link test for ropsten network	Dan Finlay	2016-11-22	1	-2/+2
\|/ / /
* \| \|	Merge pull request #837 from MetaMask/FixMenuItem	Kevin Serrano	2016-11-22	4	-8/+96
\|\ \ \ \| \| \| \| \| \| \| \|	Fix custom provider menu item
\| * \| \|	Add development states.js back into repo	Dan Finlay	2016-11-22	2	-1/+1
\| \| \| \|
\| * \| \|	Fix custom provider menu item	Dan Finlay	2016-11-22	5	-8/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* \| \| \|	Merge pull request #833 from MetaMask/i831-AddRopsten-Dev	Kevin Serrano	2016-11-22	8	-4/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Begin adding Ropsten support to dev
\| * \| \| \|	Merge branch 'dev' into i831-AddRopsten-Dev	Dan Finlay	2016-11-22	100	-814/+8243
\| \|\\| \| \| \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Begin adding Ropsten support	Dan Finlay	2016-11-22	8	-4/+42
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* \| \|	Merge pull request #830 from MetaMask/kumavis-patch-1	Dan Finlay	2016-11-22	1	-1/+8
\|\ \ \ \| \|_\|/ \|/\| \|	meta - README - add npm start to instructions
\| * \|	meta - README - add npm start to instructions	kumavis	2016-11-22	1	-1/+8
\|/ / \| \| \| \|	thanks @karlfloersch
* \|	Merge pull request #827 from MetaMask/currency-cleanup	Dan Finlay	2016-11-19	4	-7/+5731
\|\ \ \| \| \| \| \| \|	Convert conversion-util to pure json.
\| * \|	Convert conversion util to pure json.	Kevin Serrano	2016-11-19	4	-7/+5731
\| \| \|
* \| \|	Merge pull request #826 from MetaMask/mini-lint	Dan Finlay	2016-11-19	2	-3/+3
\|\ \ \ \| \|/ / \|/\| \|	Maintain linting.
\| * \|	Maintain linting.	Kevin Serrano	2016-11-19	2	-3/+3
\|/ /
* \|	Merge pull request #824 from MetaMask/failing-tests	Dan Finlay	2016-11-19	3	-5/+72
\|\ \ \| \| \| \| \| \|	Promisify persistence of old vaults in migration code
\| * \|	Promisify persistence of keyrings before returning key	Kevin Serrano	2016-11-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Change single letter variables (shame)
\| * \|	Merge branch 'dev' into failing-tests	Kevin Serrano	2016-11-19	2	-3/+3
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #823 from MetaMask/FixBork	Kevin Serrano	2016-11-19	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Update migration code for new hd wallet param name
\| * \| \|	Update migration code for new hd wallet param name	Dan Finlay	2016-11-19	1	-2/+2
\|/ / /
* \| \|	Persist keyrings from migration to storage.	Kevin Serrano	2016-11-19	1	-1/+1
\| \| \|
\| * \|	Create failing test to check submitPassword in keyringController.	Kevin Serrano	2016-11-19	2	-0/+67
\|/ /
* \|	Resolve merge conflict.	Kevin Serrano	2016-11-19	94	-805/+2444
\|\ \ \| \|/ \|/\|
\| *	random-id - use Number.MAX_SAFE_INTEGER as max	kumavis	2016-11-18	1	-1/+1
\| \|
\| *	Merge pull request #816 from MetaMask/i328-MultiVault	kumavis	2016-11-18	95	-818/+2457
\| \|\ \| \| \| \| \| \|	Multi vault to Dev Branch
\| \| *	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2016-11-18	66	-306/+273
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	i328-MultiVault
\| \| \| *	Revert one cb to previous state.	Kevin Serrano	2016-11-16	2	-2/+2
\| \| \| \|
\| \| \| *	Minimize dispatches by using emitters and relying on state updates.	Kevin Serrano	2016-11-16	2	-26/+12
\| \| \| \|
\| \| \| *	Fix semantics in comments	Kevin Serrano	2016-11-16	1	-1/+1
\| \| \| \|
\| \| \| *	Lints.	Kevin Serrano	2016-11-16	1	-1/+1
\| \| \| \|
\| \| \| *	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2016-11-16	0	-0/+0
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i328-MultiVault
\| \| \| \| *	Resolve merge conflicts.	Kevin Serrano	2016-11-16	3	-5/+5
\| \| \| \| \|\
\| \| \| * \| \	Resolve merge conflicts.	Kevin Serrano	2016-11-16	3	-5/+5
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \|/\| / \| \| \| \| \|/
\| \| \| * \|	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2016-11-16	1	-0/+2
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i328-MultiVault
\| \| \| \| * \|	Minimize repeated code.	Kevin Serrano	2016-11-16	1	-5/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Minimize repeated code.	Kevin Serrano	2016-11-16	2	-8/+7
\| \| \| \|/ /
\| \| \| * \|	Re-enable disclaimer screen. Rename variables to reflect role more clearly.	Kevin Serrano	2016-11-15	30	-49/+49
\| \| \| \| \|
\| \| \| * \|	Add idStore tests again.	Kevin Serrano	2016-11-15	1	-0/+198
\| \| \| \| \|
\| \| \| * \|	Rename n variables to numberOfAccounts inside of test suite. Remove idStore ↵	Kevin Serrano	2016-11-12	3	-203/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests.
\| \| \| * \|	Revert to previous anonymous function for promise.	Kevin Serrano	2016-11-12	1	-1/+3
\| \| \| \| \|
\| \| \| * \|	Various keyring changes	Kevin Serrano	2016-11-12	1	-18/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters.