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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make ballance teal for shapeshift tx and add to change log	Frankie	2016-08-19	3	-3/+7
\|
*	Create a ShapeShift tx in tx History	Frankie	2016-08-19	8	-65/+105
\|
*	Add api Public key	Frankie	2016-08-19	1	-0/+2
\|
*	Merge branch 'master' into shapeshiftTx	Frankie	2016-08-19	24	-15/+401
\|\
\| *	Merge pull request #520 from MetaMask/usd-conversion	Dan Finlay	2016-08-17	21	-13/+390
\| \|\ \| \| \| \| \| \|	Conversion implementation
\| \| *	Added compliance for tests and properly accounts for N/A conversions.	Kevin Serrano	2016-08-17	4	-12/+11
\| \| \|
\| \| *	Lint.	Kevin Serrano	2016-08-17	1	-4/+5
\| \| \|
\| \| *	Remove logs.	Kevin Serrano	2016-08-17	1	-3/+0
\| \| \|
\| \| *	Hide conversions when API fails.	Kevin Serrano	2016-08-17	1	-29/+42
\| \| \|
\| \| *	Remove npm debug log.	Kevin Serrano	2016-08-17	1	-46/+0
\| \| \|
\| \| *	Fix uncalled fn.	Kevin Serrano	2016-08-17	1	-1/+1
\| \| \|
\| \| *	Add to changelog.	Kevin Serrano	2016-08-17	1	-0/+2
\| \| \|
\| \| *	Change account list balance rendering.	Kevin Serrano	2016-08-17	2	-3/+6
\| \| \|
\| \| *	Remove console logs.	Kevin Serrano	2016-08-17	2	-2/+46
\| \| \|
\| \| *	Add recent conversion date.	Kevin Serrano	2016-08-17	1	-0/+4
\| \| \|
\| \| *	Add fallback to API failure.	Kevin Serrano	2016-08-17	2	-1/+7
\| \| \|
\| \| *	Remove react-select as dependency.	Kevin Serrano	2016-08-17	2	-8/+0
\| \| \|
\| \| *	Remove logging. Clean up duplicate entries in currency list.	Kevin Serrano	2016-08-17	3	-4/+2
\| \| \|
\| \| *	Add to package request-promise.	Kevin Serrano	2016-08-17	1	-0/+1
\| \| \|
\| \| *	Merge branch 'master' into usd-conversion	Kevin Serrano	2016-08-17	2	-1/+3
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #550 from MetaMask/Version2.8.0	Frankie	2016-08-16	2	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Version 2.8.0
\| \| * \|	Version 2.8.0	Dan Finlay	2016-08-16	2	-1/+3
\| \|/ /
\| \| *	Remove extra test.	Kevin Serrano	2016-08-17	2	-50/+0
\| \| \|
\| \| *	linting and ignoring.	Kevin Serrano	2016-08-17	8	-15/+55
\| \| \|
\| \| *	Divided eth components for tx and account detail.	Kevin Serrano	2016-08-17	4	-16/+129
\| \| \|
\| \| *	Merge master.	Kevin Serrano	2016-08-16	31	-185/+1309
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #547 from MetaMask/cssFixes	Dan Finlay	2016-08-15	2	-1/+8
\| \|\ \ \| \| \| \| \| \| \| \|	Add margin to "go to test faucet" button and show more of the address…
\| \| * \|	Add margin to "go to test faucet" button and show more of the address on qr ↵	Frankie	2016-08-15	2	-1/+8
\| \|/ / \| \| \| \| \| \| \| \| \|	code page
\| \| *	Did not previously call functions before!	Kevin Serrano	2016-08-10	2	-3/+6
\| \| \|
\| \| *	Fix default value. Add loading indication for async.	Kevin Serrano	2016-08-10	3	-4/+6
\| \| \|
\| \| *	Enable full listing of supported currencies by Cryptonator.	Kevin Serrano	2016-08-10	3	-6/+16
\| \| \|
\| \| *	Add fix for zero balance shorten.	Kevin Serrano	2016-08-08	3	-2/+4
\| \| \|
\| \| *	Get fiat numbers rendering on tooltip. Need to find way to create line breaks.	Kevin Serrano	2016-08-06	7	-14/+33
\| \| \|
\| \| *	Holding off on select formatting for now. Renamed keys for options.	Kevin Serrano	2016-08-05	4	-7/+7
\| \| \|
\| \| *	Create default values for metamask state for conversion. Fix config files ↵	Kevin Serrano	2016-08-05	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|	for ui dev.
\| \| *	currency now selectable and save-able.	Kevin Serrano	2016-08-05	3	-2/+26
\| \| \|
\| \| *	Merge branch 'master' into usd-conversion	Kevin Serrano	2016-08-05	22	-81/+253
\| \| \|\
\| \| * \	Merge branch 'master' into usd-conversion	Kevin Serrano	2016-07-26	8	-3/+74
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into usd-conversion	Kevin Serrano	2016-07-26	9	-19/+237
\| \| \|\ \ \
\| \| * \ \ \	Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.	Kevin Serrano	2016-07-23	12	-12/+224
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Linting!	Kevin Serrano	2016-07-23	4	-6/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Change function names. Add interval polling for api. Refactor functions.	Kevin Serrano	2016-07-22	3	-11/+34
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add date access throughout the data flow.	Kevin Serrano	2016-07-22	5	-4/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Provide date access.	Kevin Serrano	2016-07-22	1	-1/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into usd-conversion	Kevin Serrano	2016-07-22	18	-39/+178
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Add data field to pass up parameters up to reducer.	Kevin Serrano	2016-07-22	4	-3/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add fiat actions to metamask controllere and actions.	Kevin Serrano	2016-07-22	2	-0/+24
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Progress on config manager. Plus tests.	Kevin Serrano	2016-07-21	2	-1/+108
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	WIP: ShapeShift tx	Frankie	2016-08-19	11	-12/+314
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #544 from MetaMask/RemoveEtc	kumavis	2016-08-15	7	-33/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ethereum classic provider
\| * \| \| \| \| \| \|	Remove ethereum classic provider	Dan Finlay	2016-08-15	7	-33/+4
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #542
* \| \| \| \| \| \|	Merge pull request #529 from MetaMask/buyForm	kumavis	2016-08-14	11	-12/+1060
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Buy form
\| * \| \| \| \| \| \|	Add to change log	Frankie	2016-08-14	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add multi message capability to Qr view for market info	Frankie	2016-08-13	4	-6/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a to test faucet button	Frankie	2016-08-13	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'buyForm' of https://github.com/MetaMask/metamask-plugin into ↵	Frankie	2016-08-13	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	buyForm
\| \| * \ \ \ \ \ \	Merge branch 'master' into buyForm	Dan Finlay	2016-08-12	6	-101/+10
\| \| \|\ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \	Merge branch 'master' into buyForm	Frankie	2016-08-13	18	-140/+230
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #538 from MetaMask/i512	Kevin Serrano	2016-08-13	3	-25/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deps - extracted ensnare to module
\| * \| \| \| \| \| \| \| \| \|	deps - extracted ensnare to module	kumavis	2016-08-13	3	-25/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #535 from MetaMask/CustomRpcLoadingBug	kumavis	2016-08-12	5	-2/+194
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom rpc loading bug
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into CustomRpcLoadingBug	kumavis	2016-08-12	5	-12/+24
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #532 from MetaMask/logging-fix	kumavis	2016-08-12	5	-12/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Logging fix
\| * \| \| \| \| \| \| \| \| \|	Add global var for background.	Kevin Serrano	2016-08-12	4	-5/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge github.com:MetaMask/metamask-plugin into logging-fix	Kevin Serrano	2016-08-12	6	-101/+10
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	UI logging supressed for production.	Kevin Serrano	2016-08-12	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create global variable that changes ui logging.	Kevin Serrano	2016-08-12	4	-15/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Setting defaults to production.	Kevin Serrano	2016-08-12	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Separate developmentMode conditional to only wrap log.	Kevin Serrano	2016-08-12	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Cosmetic difference.	Kevin Serrano	2016-08-12	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove stray console.log	Kevin Serrano	2016-08-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Take out unused dependency.	Kevin Serrano	2016-08-12	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove comments.	Kevin Serrano	2016-08-12	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into logging-fix	Kevin Serrano	2016-08-12	3	-4/+9
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Lint	Kevin Serrano	2016-08-12	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add ability to hide logging messages in production.	Kevin Serrano	2016-08-12	4	-8/+34
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Add state selector to mock-dev server used by UI tests	Dan Finlay	2016-08-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Added buggy state file to states folder	Dan Finlay	2016-08-12	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Add network indicator class to loading image	Dan Finlay	2016-08-12	2	-1/+190
\| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #533 from MetaMask/inpage-fixes	kumavis	2016-08-12	6	-101/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	inpage and stream provider fixes
\| * \| \| \| \| \| \| \| \| \|	changelog - add note about web3-provider-stream fix	kumavis	2016-08-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	inpage-prov - sync error - fix link	kumavis	2016-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	deps - bump web3-stream-provider	kumavis	2016-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	deps - local-message-stream extracted as module post-message-stream	kumavis	2016-08-12	4	-58/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	clean -formatting	kumavis	2016-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	inpage-provider - remove createSyncProvider, just fail	kumavis	2016-08-12	1	-40/+3
\|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \|	Change buy forms so that they are their own view and add Qr-code	Frankie	2016-08-13	9	-184/+256
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Even out some of the margins	Frankie	2016-08-11	1	-2/+4
\| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Fix typo for copyButton	Frankie	2016-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix merge mess	Frankie	2016-08-11	4	-14/+108
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into buyForm	Frankie	2016-08-11	53	-127/+852
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #528 from MetaMask/checkout-fix	Frankie	2016-08-11	3	-4/+9
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix ether warning checkbox to reflect proper behavior.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into checkout-fix	Kevin Serrano	2016-08-11	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #527 from MetaMask/tests	kumavis	2016-08-11	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	Add testem to devDependencies
\| * \| \| \| \| \| \| \|	Add testem to devDependencies	Frankie	2016-08-11	1	-0/+1
\|/ / / / / / / /
\| * / / / / / /	Fix ether warning checkbox.	Kevin Serrano	2016-08-11	3	-4/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #518 from MetaMask/typo-fix	Kevin Serrano	2016-08-05	3	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typo fix for apostrophes
\| * \| \| \| \| \| \|	Add to changelog.	Kevin Serrano	2016-08-05	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix typos with missing apostrophe	Kevin Serrano	2016-08-05	2	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #517 from MetaMask/i#516	Frankie	2016-08-04	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #516 issue with dropdown menu
\| * \| \| \| \| \| \|	Fix issue with dropdown menu	Frankie	2016-08-04	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #508 from MetaMask/FixAccountSelectionBug	Dan Finlay	2016-07-30	3	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix account selection bug
\| * \| \| \| \| \| \|	Version 2.7.3	Dan Finlay	2016-07-30	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2016-07-30	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix account selection updating	Dan Finlay	2016-07-30	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #507 from MetaMask/Version2.7.2Version2.7.2	Dan Finlay	2016-07-30	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 2.7.2
\| * \| \| \| \| \| \|	Version 2.7.2	Dan Finlay	2016-07-30	2	-1/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #506 from MetaMask/FixNetworkReference	Dan Finlay	2016-07-30	2	-3/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix network name reference
\| * \| \| \| \| \| \|	Fix reference in drop menu item	Dan Finlay	2016-07-30	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix network name reference	Dan Finlay	2016-07-30	1	-1/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
* \| \| \| \| \| \|	Merge pull request #498 from MetaMask/AddEthClassic	kumavis	2016-07-29	10	-10/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add eth classic
\| * \ \ \ \ \ \	Merge branch 'master' into AddEthClassic	Dan Finlay	2016-07-29	2	-1/+2
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #500 from MetaMask/FixRemoteStoreBug	Dan Finlay	2016-07-29	2	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken reference to host store.didUpdate
\| * \ \ \ \ \ \ \	Merge branch 'master' into FixRemoteStoreBug	Dan Finlay	2016-07-29	2	-19/+32
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken reference to host store.didUpdate	Dan Finlay	2016-07-29	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again.
\| \| * \| \| \| \| \| \|	Merge branch 'master' into AddEthClassic	Dan Finlay	2016-07-29	2	-19/+32
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #502 from MetaMask/ParallelCopyTasks	Dan Finlay	2016-07-29	1	-18/+31
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some gulp task issues
\| * \| \| \| \| \| \| \| \|	Fix some gulp task issues	Dan Finlay	2016-07-29	1	-18/+31
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I know, I've been fixing up the gulp scripts all week. I keep fixing one thing then breaking another. In this commit, I fix some issues with some previous approaches. I no longer try to do the copying to `chrome` after `firefox`, I simply stream to both during copy and build tasks, and that logic is reused during dev and build tasks. The `copyTask` function now supports an array of `destinations`, that allows piping to multiple destinations, which is pretty cool. The `manifest:cleanup` task that chrome requires is now just part of the `copy` task, so we don't have to remember it everywhere we copy. So obvious it's like why only now.
* \| \| \| \| \| \| \| \|	Merge pull request #501 from MetaMask/UpdateNodeDependency	Dan Finlay	2016-07-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Update readme node version
\| * \| \| \| \| \| \| \|	Update readme node version	Dan Finlay	2016-07-29	1	-1/+1
\|/ / / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' into AddEthClassic	Dan Finlay	2016-07-29	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #499 from MetaMask/FixDevScripts	Dan Finlay	2016-07-29	1	-10/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dev tasks for multi browser copying
\| \| * \| \| \| \| \| \|	Linted	Dan Finlay	2016-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add missing reference for provider	Dan Finlay	2016-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2016-07-29	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix margin on provider checkmarks	Dan Finlay	2016-07-29	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add eth classic to provider menu	Dan Finlay	2016-07-29	8	-10/+50
\| \|/ / / / / / /
\| * / / / / / /	Fix dev tasks for multi browser copying	Dan Finlay	2016-07-29	1	-10/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #497 from MetaMask/FixBuild	Dan Finlay	2016-07-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix nondeterministic build
\| * \| \| \| \| \| \|	Fix nondeterministic build	Dan Finlay	2016-07-28	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We used to be able to copy static resources while we built js, but now part of the copy task is copying firefox built files into chrome, so they need to be done in order. This could probably be optimized a bit more, but for now it builds reliably again.
* \| \| \| \| \| \|	Merge pull request #496 from MetaMask/Version2.7.1	Dan Finlay	2016-07-28	2	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 2.7.1
\| * \| \| \| \| \| \|	Version 2.7.1	Dan Finlay	2016-07-28	2	-2/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #493 from MetaMask/droppo-fix	Dan Finlay	2016-07-27	3	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Droppo fix
\| * \| \| \| \| \| \|	Changelog add.	Kevin Serrano	2016-07-27	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into droppo-fix	Kevin Serrano	2016-07-27	12	-54/+143
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #492 from MetaMask/FixChromeBuild	Dan Finlay	2016-07-27	3	-7/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix chrome build
\| * \| \| \| \| \| \| \|	Correct typo comment	Dan Finlay	2016-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into FixChromeBuild	Dan Finlay	2016-07-27	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #491 from MetaMask/FixChromeBuild	Dan Finlay	2016-07-27	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix chrome build
\| \| * \| \| \| \| \| \| \|	Fix copy task	Dan Finlay	2016-07-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Enhance manifest details	Dan Finlay	2016-07-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Cleanup Changelog	Dan Finlay	2016-07-27	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild	Dan Finlay	2016-07-27	2	-1/+3
\| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Version 2.7.02.7.0	Dan Finlay	2016-07-22	2	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix chrome build	Dan Finlay	2016-07-27	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #489 from MetaMask/FixDeploySteps	Dan Finlay	2016-07-27	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed deploy instructions
\| * \| \| \| \| \| \| \| \|	Fixed deploy instructions	Dan Finlay	2016-07-27	1	-5/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #488 from MetaMask/BuildsFolder	Dan Finlay	2016-07-27	2	-4/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store versioned builds in builds folder
\| * \| \| \| \| \| \| \| \|	Store versioned builds in builds folder	Dan Finlay	2016-07-27	2	-4/+7
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Add platform specific builds and zip tasks (#486)	Dan Finlay	2016-07-27	8	-30/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog
* \| \| \| \| \| \| \| \|	Merge pull request #482 from MetaMask/FirefoxCompatibility	kumavis	2016-07-26	8	-19/+77
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	Fix inpage script race condition
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2016-07-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix integration tests	Dan Finlay	2016-07-26	1	-4/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix extension tests	Dan Finlay	2016-07-26	5	-7/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into FirefoxCompatibility	Dan Finlay	2016-07-26	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Inject inpage script synchronously	Dan Finlay	2016-07-26	3	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Huge thanks to the Firefox team, for their help on the issue of our long-standing inpage script race condition. http://stackoverflow.com/questions/38577656/how-can-i-make-a-firefox-add-on-contentscript-inject-and-run-a-script-before-oth The problem is that we were injecting a `script` tag and assigning its `src` attribute, which triggers an asynchronous fetch request, and does not guarantee execution order! (That was news to me!) Instead, I'm now assigning the `script` tag a `textContent` value of the script to inject, and it seems to fix the problem! There is also a Firefox-only API that could solve this whole problem in an even more elegant way, so we might want to expose a code path for that solution later on: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_Bindings/Components.utils.exportFunction Allows you to expose an object from one scope to another. There was even talk of creating a polyfill for it that does virtually what we do, message passing between contexts.
\| * \| \| \| \| \| \| \|	Add note about firefox stackoverflow to readme	Dan Finlay	2016-07-26	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add note about mozilla irc	Dan Finlay	2016-07-26	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clean up extension polyfill abstraction	Dan Finlay	2016-07-26	2	-14/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add firefox instructions to readme	Dan Finlay	2016-07-26	1	-0/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow page injection to look for cross-browser APIs appropriately	Dan Finlay	2016-07-26	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Correct skip usage	Dan Finlay	2016-07-23	2	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix promise usage?	Dan Finlay	2016-07-23	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Run browser tests in parallel	Dan Finlay	2016-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Skip PhantomJS in testem	Dan Finlay	2016-07-23	3	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add promise polyfill for PhantomJS	Dan Finlay	2016-07-23	3	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix testem runner page	Dan Finlay	2016-07-23	3	-7/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove phantom from build deps	Dan Finlay	2016-07-23	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move pre scripts to dependencies key	Dan Finlay	2016-07-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix circle pre script	Dan Finlay	2016-07-23	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add testem and phantom to circleCI pre-script	Dan Finlay	2016-07-23	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add UI tests to CI test script	Dan Finlay	2016-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Separate UI tests from normal unit test suite	Dan Finlay	2016-07-23	3	-6/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add UI Testing Framework and Simple UI Test	Dan Finlay	2016-07-23	6	-0/+63
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a Testem configuration that launches a Qunit page with an iFrame that builds and loads our mock-dev page and can interact with it and run tests on it. Wrote a simple test that accepts the terms and conditions and transitions to the next page. I am not doing any fancy redux-hooks for the async waiting, I've simply added a `tests/integration/helpers.js` file with a `wait()` function that returns a promise that should wait long enough. Long term we should hook into the app lifecycle by some means for testing, so we only wait the right amount of time, and wait long enough for slower processes to complete, but this may work for the time being, just enough to run some basic automated browser tests.
\| \| \| * \| \| \| \|	Fix menu droppo issues caused by Chrome 52.	Kevin Serrano	2016-07-27	2	-0/+2
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Ui testing (#481)	Dan Finlay	2016-07-26	8	-3/+74
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add UI Testing Framework and Simple UI Test Added a Testem configuration that launches a Qunit page with an iFrame that builds and loads our mock-dev page and can interact with it and run tests on it. Wrote a simple test that accepts the terms and conditions and transitions to the next page. I am not doing any fancy redux-hooks for the async waiting, I've simply added a `tests/integration/helpers.js` file with a `wait()` function that returns a promise that should wait long enough. Long term we should hook into the app lifecycle by some means for testing, so we only wait the right amount of time, and wait long enough for slower processes to complete, but this may work for the time being, just enough to run some basic automated browser tests. * Separate UI tests from normal unit test suite * Add UI tests to CI test script * Add testem and phantom to circleCI pre-script * Fix circle pre script * Move pre scripts to dependencies key * Remove phantom from build deps * Fix testem runner page * Add promise polyfill for PhantomJS * Skip PhantomJS in testem * Run browser tests in parallel * Fix promise usage? * Correct skip usage
* \| \| \| \| \|	Merge pull request #477 from MetaMask/MockDev	Kevin Serrano	2016-07-22	9	-19/+237
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Add mock dev mode
\| * \| \| \| \|	Add mock dev mode	Dan Finlay	2016-07-22	9	-19/+237
\|/ / / / /
* / / / /	Manifest fix for firefox-specific field (#475)	Kevin Serrano	2016-07-22	2	-5/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove firefox-only manifest.json line. * Changelog change.
* \| \| /	Buy button (#474)	Frankie	2016-07-22	11	-3/+211
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension
* \| \|	Implement some cross-browser practices (#473)	Dan Finlay	2016-07-22	14	-35/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests
* \| \|	Make injected web3 fail hard on sync methods (#471)	Dan Finlay	2016-07-21	2	-1/+11
\| \| \| \| \| \| \| \| \|	Make injected web3 fail hard on sync methods
* \| \|	Version 2.6.2 (#470)2.6.2	Dan Finlay	2016-07-21	2	-1/+3
\| \| \|
* \| \|	Add instructions for taking a state dump (#469)	Dan Finlay	2016-07-21	1	-0/+15
\| \| \|
* \| \|	Merge pull request #465 from MetaMask/i447	kumavis	2016-07-19	1	-2/+10
\|\ \ \ \| \|_\|/ \|/\| \|	inpage - add try/catch to cleanContextForImports
\| * \|	typo fix	kumavis	2016-07-19	1	-1/+1
\| \| \|
\| * \|	inpage - add try/catch to cleanContextForImports	kumavis	2016-07-19	1	-2/+10
\|/ /
* \|	Merge pull request #455 from MetaMask/FixReopeningBug	Kevin Serrano	2016-07-19	3	-1/+13
\|\ \ \| \| \| \| \| \|	Fix reopening bug
\| * \|	Update Changelog to account for last PR	Kevin Serrano	2016-07-19	1	-0/+1
\| \| \|
\| * \|	Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2016-07-19	3	-1/+12
\|/\| \| \| \| \| \| \| \| \| \| \|	FixReopeningBug
\| * \|	Merge branch 'master' into FixReopeningBug	Dan Finlay	2016-07-16	1	-0/+8
\| \|\ \
\| * \| \|	Bump changelog	Dan Finlay	2016-07-16	1	-0/+2
\| \| \| \|
\| * \| \|	Add ui state logging function	Dan Finlay	2016-07-16	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now from the UI console, you can always call `logState()`, and it will print the state stringified into the console, ready to drop into the ui dev mode states folder, or other inspection. This should make it easier to diagnose user bugs in the future.
\| * \| \|	Triage a strange undefined balance error	Dan Finlay	2016-07-16	1	-1/+2
\| \| \| \|
* \| \| \|	Merge pull request #464 from MetaMask/test-branch	Kevin Serrano	2016-07-19	0	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Test branch
\| * \ \ \	Merge branch 'master' of github.com:MetaMask/metamask-plugin	Kevin Serrano	2016-07-19	1	-1/+1
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #463 from MetaMask/aust-zero-changes	Kevin Serrano	2016-07-19	1	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Aust zero changes
\| * \| \| \| \|	Readd string to conform to tests. Will discuss later.	Kevin Serrano	2016-07-19	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'AustP-master'	Kevin Serrano	2016-07-19	1	-2/+7
\| \|/\| \| \| \| \|/\|/ / / /
\| * \| \| \|	Remove unused None string.	Kevin Serrano	2016-07-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/AustP/metamask-plugin into ↵	Kevin Serrano	2016-07-19	1	-1/+6
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AustP-master
\| * \| \| \|	Add eslint config to pass tests	Aust	2016-07-19	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Make zero balance display 0. Fixes #449	Aust	2016-07-18	1	-1/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #459 from Schaeff/transaction-typo-fix	kumavis	2016-07-19	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix typo
\| * \| \|	Fix typo	Thibaut SCHAEFFER	2016-07-18	1	-1/+1
\|/ / /
\| \| *	Create "buy form" add shape shift	Frankie	2016-08-11	10	-9/+966
\| \|/ \|/\|
* \|	Add simple build instructions (#454)	Dan Finlay	2016-07-16	1	-0/+8
\|/
*	Merge pull request #448 from MetaMask/user-agreement-proofread	Kevin Serrano	2016-07-15	1	-11/+11
\|\ \| \| \| \|	Proofread and fix spelling errors of user agreement.
\| *	Merge branch 'master' into user-agreement-proofread	Kevin Serrano	2016-07-15	6	-26/+83
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #443 from MetaMask/legal-beagal	kumavis	2016-07-15	1	-0/+34
\|\ \ \| \| \| \| \| \|	Meta - Add license
\| * \	Merge branch 'master' into legal-beagal	kumavis	2016-07-15	8	-30/+59
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Version 2.6.1 (#442)	Dan Finlay	2016-07-14	2	-1/+3
\| \| \|
* \| \|	new tx - calculate estimatedGas and show thing in tx-details (#441)	kumavis	2016-07-14	4	-25/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* new tx - calculate estimatedGas and show thing in tx-details * Bump changelog
\| * \|	license	kumavis	2016-07-15	1	-0/+34
\| \| \|
\| \| *	Proofread and fix spelling errors of user agreement.	Kevin Serrano	2016-07-15	1	-11/+11
\| \|/ \|/\|
* \|	Fix eth balance tooltip to show 6 decimals (#440)	Frankie	2016-07-14	4	-4/+10
\|/ \| \| \| \| \| \| \| \| \| \| \|	* Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log
*	Merge pull request #439 from MetaMask/japan-localization	kumavis	2016-07-14	2	-1/+11
\|\ \| \| \| \|	Japan localization
\| *	Add Japanese localization file.	Kevin Serrano	2016-07-14	1	-0/+10
\| \|
\| *	Fix MetaMask title for EN.	Kevin Serrano	2016-07-14	1	-1/+1
\|/
*	Bump provider-engine from 7.8.1 to 7.8.3 (#435)	Kevin Serrano	2016-07-14	2	-1/+3
\| \| \| \| \| \|	* Bump provider-engine from 7.8.1 to 7.8.3 * Modify changelog.
*	Move fox logo with filled in eyes into design folder (#433)	Frankie	2016-07-14	1	-0/+0
\| \| \| \| \| \| \| \| \| \|	* Move fox logo with filled in eyes into design folder * Crop fox * Crop fox properly * Gah Crop fox properly
*	Merge pull request #431 from MetaMask/one-wallet-one-future	kumavis	2016-07-13	2	-1/+2
\|\ \| \| \| \|	Add one wallet to new accounts instead of three.
\| *	Update changelog.	Kevin Serrano	2016-07-13	1	-0/+1
\| \|
\| *	Add one wallet to new accounts instead of three.	Kevin Serrano	2016-07-13	1	-1/+1
\|/
*	Merge pull request #423 from MetaMask/FixMenuBug	kumavis	2016-07-12	1	-2/+2
\|\ \| \| \| \|	Fix main dropdown animation
\| *	Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug	kumavis	2016-07-12	14	-191/+106
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #428 from MetaMask/FixSvgIcons	Dan Finlay	2016-07-12	7	-21/+20
\|\ \ \| \| \| \| \| \|	Fix svg icons
\| * \	Merge branch 'master' into FixSvgIcons	Dan Finlay	2016-07-12	7	-169/+83
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #427 from MetaMask/balance-refactor	Dan Finlay	2016-07-12	7	-169/+83
\|\ \ \ \| \| \| \| \| \| \| \|	Balance refactor, less-than-one abbreviation for eth balances, util cleanup
\| * \ \	Merge branch 'master' into balance-refactor	Kevin Serrano	2016-07-12	3	-3/+12
\| \|\ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Update changelog.	Kevin Serrano	2016-07-12	1	-0/+2
\| \| \| \|
\| * \| \|	Integrate changes back into eth-balance	Kevin Serrano	2016-07-12	5	-111/+54
\| \| \| \|
\| * \| \|	Move shorten balance to util. Add as property of generateBalance object output.	Kevin Serrano	2016-07-12	3	-23/+28
\| \| \| \|
\| * \| \|	Remove unused functions. Readd if necessary.	Kevin Serrano	2016-07-12	2	-37/+4
\| \| \| \|
\| * \| \|	Refactor util tests.	Kevin Serrano	2016-07-12	1	-11/+8
\| \| \| \|
\| \| * \|	Linted	Dan Finlay	2016-07-12	4	-17/+10
\| \| \| \|
\| \| * \|	Fix svg icon in notification	Dan Finlay	2016-07-12	1	-0/+2
\| \| \| \|
\| \| * \|	Merge branch 'master' into FixSvgIcons	Dan Finlay	2016-07-12	2	-1/+3
\| \| \|\ \ \| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #426 from MetaMask/Version26	Dan Finlay	2016-07-12	2	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Version 2.6
\| * \| \| \|	Version 2.6	Dan Finlay	2016-07-12	2	-1/+3
\|/ / / /
\| \| * \|	Rebuild states object	Dan Finlay	2016-07-12	1	-1/+1
\| \| \| \|
\| \| * \|	Fix imageification of recipient	Dan Finlay	2016-07-12	1	-3/+4
\| \| \| \|
\| \| * \|	Add coin sending tx state	Dan Finlay	2016-07-12	1	-0/+1
\| \| \| \|
\| \| * \|	Add notification global for development	Dan Finlay	2016-07-12	1	-1/+3
\| \|/ / \|/\| \| \| \| \| \| \| \|	The background process now has a global `METAMASK_NOTIFIER` object that allows easy mocking of notification data.
\| \| *	Merge branch 'master' into FixMenuBug	Dan Finlay	2016-07-12	1	-2/+9
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #424 from MetaMask/UpdateScript	Dan Finlay	2016-07-12	1	-2/+9
\|\ \ \ \| \|/ / \|/\| \|	Updated script for what I recorded
\| * \|	Updated script for what I recorded.	Dan Finlay	2016-07-12	1	-2/+9
\|/ /
\| *	Fix main dropdown animation	Dan Finlay	2016-07-12	1	-2/+2
\|/
*	Merge pull request #418 from MetaMask/ui-fixth-width-tx-history	kumavis	2016-07-09	5	-7/+100
\|\ \| \| \| \|	Fixed width applied on transaction history components
\| *	lint	Kevin Serrano	2016-07-09	1	-5/+5
\| \|