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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	uncomment intervalDelay	frankiebee	2017-04-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	match intervals	frankiebee	2017-04-07	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Fix wakeUps:	frankiebee	2017-04-07	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix spelling cut wakeup time in half
* \| \| \| \|	Merge pull request #1312 from MetaMask/WakeUp	kumavis	2017-04-07	3	-2/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wake up
\| * \| \| \|	Bump sw-client version	frankiebee	2017-04-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	remove unnecessary listner	frankiebee	2017-04-07	1	-6/+1
\| \| \| \| \|
\| * \| \| \|	Ping service worker to keep it from going idle	frankiebee	2017-04-07	3	-3/+14
\|/ / / /
* \| \| \|	Merge pull request #1311 from MetaMask/mascara-publish	Frankie	2017-04-06	6	-21/+56
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Mascara - docker support
\| * \| \| \|	mascara - ready to deploy via docker	kumavis	2017-04-06	4	-4/+40
\| \| \| \| \|
\| * \| \| \|	mascara - mascara lib - read mascara origin from env var	kumavis	2017-04-06	1	-17/+14
\| \| \| \| \|
\| * \| \| \|	build - add envify to bundle process	kumavis	2017-04-06	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1310 from MetaMask/account-transition-fix	kumavis	2017-04-06	3	-2/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Account transition fix
\| * \| \| \|	Changelog.	Kevin Serrano	2017-04-06	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix account detail transition fix.	Kevin Serrano	2017-04-06	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #1309 from MetaMask/mascara2	Frankie	2017-04-05	22	-150/+236
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Mascara - various fixes
\| * \| \| \|	mascara - rename popup to ui	kumavis	2017-04-05	2	-3/+3
\| \| \| \| \|
\| * \| \| \|	mascara - rename things + break out mascara asset server	kumavis	2017-04-05	11	-114/+135
\| \| \| \| \|
\| * \| \| \|	clean - remove unused extension ref	kumavis	2017-04-05	1	-3/+2
\| \| \| \| \|
\| * \| \| \|	auto-faucet - only skip faucet on explicit test environment	kumavis	2017-04-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	add platforms to mascara + move buyEther window open to ui	kumavis	2017-04-05	10	-31/+97
\|/ / / /
* \| \| \|	Merge pull request #1307 from MetaMask/mascara	kumavis	2017-04-05	18	-220/+328
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Proof of Concept: Mascara
\| * \| \| \|	clean - metamask controller - remove log	kumavis	2017-04-05	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Remove out of date comments	frankiebee	2017-04-04	1	-9/+1
\| \| \| \| \|
\| * \| \| \|	Fix first install flow	frankiebee	2017-04-04	2	-11/+4
\| \| \| \| \|
\| * \| \| \|	Update todos on README	frankiebee	2017-04-03	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Update MetaMascara README	frankiebee	2017-04-03	1	-11/+3
\| \| \| \| \|
\| * \| \| \|	Rename mascara root directory	frankiebee	2017-04-03	12	-0/+0
\| \| \| \| \|
\| * \| \| \|	Check to see if connection is from popup	frankiebee	2017-04-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Make Popup close after approving a transaction	frankiebee	2017-04-03	1	-7/+14
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into mascara	frankiebee	2017-04-03	19	-334/+213
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into mascara	frankiebee	2017-04-03	15	-82/+197
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Rename and move around files	frankiebee	2017-04-03	11	-110/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up	frankiebee	2017-03-31	6	-181/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix stream	frankiebee	2017-03-30	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump sw-stream and setup "untrusted and trusted comunication"	frankiebee	2017-03-30	4	-6/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Create a Transaction from within the dapp	frankiebee	2017-03-30	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	WIP: lost enital call from dapp to getAccounts	frankiebee	2017-03-30	8	-24/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into mascara	frankiebee	2017-03-29	33	-593/+720
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	WIP: Untrusted external connections eg: dapps	frankiebee	2017-03-29	9	-54/+221
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add versioning and migrateing data	frankiebee	2017-03-24	2	-51/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into mascara	frankiebee	2017-03-24	67	-1037/+573
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix state persistence	frankiebee	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clean up messy merge	frankiebee	2017-03-24	1	-11/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'mascaraMix' into mascara	frankiebee	2017-03-24	2	-23/+12
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Get mascara to send a transaction in the ui	frankiebee	2017-03-24	5	-18/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	WIP: indexdb is at an err state "provider is undefined"	frankiebee	2017-03-24	5	-13/+26
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	WIP: streams->indexdb	frankiebee	2017-03-24	10	-54/+96
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	WIP:stream	frankiebee	2017-03-22	3	-12/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	notes and clean up	frankiebee	2017-03-10	3	-179/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	put background in service worker	frankiebee	2017-03-10	7	-2/+378
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1308 from MetaMask/FixFaucet	Kevin Serrano	2017-04-05	2	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix faucet to only autoFaucet first account
\| * \| \| \| \| \| \| \| \|	Fix faucet to only autoFaucet first account	frankiebee	2017-04-05	2	-0/+3
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1306 from MetaMask/redoAutoFaucetAsFetch	Kevin Serrano	2017-04-05	1	-5/+11
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Switch auto-faucet from XMLHttpRequest to fetch
\| * \| \| \| \| \| \| \|	Switch auto-faucet from XMLHttpRequest to fetch	frankiebee	2017-04-04	1	-5/+11
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #1300 from MetaMask/platform	Frankie	2017-04-03	19	-334/+213
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Introduce Platform API
\| * \| \| \| \| \| \|	notification-manager - rename show -> showPoup + make getPopup private	kumavis	2017-04-01	2	-11/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	ui - use global.platform for extension interaction	kumavis	2017-04-01	6	-22/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	kumavis	2017-04-01	5	-50/+101
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1297 from MetaMask/eip155	Dan Finlay	2017-04-01	4	-35/+83
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tx-manager - add eip155 support
\| * \| \| \| \| \| \| \|	tests - tx-manager - fix assert and clean formatting	kumavis	2017-03-31	2	-10/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	tx-manager - add eip155 support	kumavis	2017-03-31	3	-35/+91
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1299 from MetaMask/test-notice-fix	Dan Finlay	2017-04-01	1	-15/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test - fix notice-controller test
\| * \| \| \| \| \| \| \| \|	test - fix notice-controller test	kumavis	2017-03-31	1	-15/+18
\|/ / / / / / / / /
\| \| * \| \| \| \| \| \|	ui - move popup auto-close after tx conf to ui entrypoint	kumavis	2017-04-01	2	-6/+9
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	ui - startPopup returns store after boot	kumavis	2017-04-01	4	-39/+46
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	ui - reducer - app - code cleanup	kumavis	2017-04-01	1	-27/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	etc - fix notification-manager ref, remove duplicated test file	kumavis	2017-03-31	2	-79/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	kumavis	2017-03-31	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1298 from MetaMask/tests-fix	Frankie	2017-03-31	3	-10/+54
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Test Framework Fix
\| * \| \| \| \| \| \| \|	tests - add missing done	kumavis	2017-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	extension - remove local extension files, we use extensionizer	kumavis	2017-03-31	2	-85/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	introduce platform api and rename notifications to notification-manager	kumavis	2017-03-31	7	-80/+117
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	extension - prefer extensionizer module	kumavis	2017-03-31	7	-7/+7
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	meta - package.json - rename npm test scripts	kumavis	2017-03-31	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	tests - helper - add note	kumavis	2017-03-31	1	-9/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	tests - unit - fail on unhandled promise rejection	kumavis	2017-03-31	2	-4/+46
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks	Kevin Serrano	2017-03-30	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix currency checking for firefox
\| * \| \| \| \| \| \|	Fix currency checking for firefox	Dan Finlay	2017-03-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By adding cryptonator to our permitted CORS hosts. Fixes #1285. Will probably trigger additional permissions requests to our users.
* \| \| \| \| \| \| \|	Merge pull request #1293 from MetaMask/ImproveGasEstimates	Kevin Serrano	2017-03-30	2	-14/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tx-utils - gas buffer ceiling at 90% of block gas limit
\| * \| \| \| \| \| \| \|	tests - tx-utils gasBuffer calc - fix bug and user easier numbers	kumavis	2017-03-30	1	-11/+17
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	tx-utils - gas buffer ceiling at 90% of block gas limit	kumavis	2017-03-30	1	-3/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1287 from MetaMask/kumavis-patch-1	Dan Finlay	2017-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	deps - bump provider-engine
\| * \| \| \| \| \| \| \|	deps - bump provider-engine	kumavis	2017-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	uses fetch instead of xhr, fixes a race condition in cache subp
* \| \| \| \| \| \| \| \|	Merge pull request #1283 from MetaMask/i1267-textfix	kumavis	2017-03-30	2	-4/+8
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix potential formatting issues for seed word display.
\| * \| \| \| \| \| \| \|	Fix potential formatting issues for seed word display.	Kevin Serrano	2017-03-29	2	-4/+8
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1284 from MetaMask/FixFirefoxPopup	kumavis	2017-03-30	3	-2/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix firefox popup
\| * \| \| \| \| \| \| \|	Linted	Dan Finlay	2017-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-03-30	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix popup behavior for Firefox	Dan Finlay	2017-03-30	2	-2/+7
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already.
* \| \| \| \| \| \| \|	Merge pull request #1281 from MetaMask/migration-enable	Dan Finlay	2017-03-29	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Add missing migration.
\| * \| \| \| \| \| \|	Add missing migration.	Kevin Serrano	2017-03-29	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1277 from MetaMask/Version-2.5.2	Dan Finlay	2017-03-29	2	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 2.5.2
\| * \| \| \| \| \| \|	Version 2.5.2v3.5.2 v2.5.2	Dan Finlay	2017-03-29	2	-1/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1268 from MetaMask/kovan-faucet-instructions	Dan Finlay	2017-03-29	3	-2/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Kovan faucet instructions
\| * \ \ \ \ \ \	Merge branch 'master' into kovan-faucet-instructions	Dan Finlay	2017-03-29	12	-177/+108
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into kovan-faucet-instructions	Kevin Serrano	2017-03-28	3	-1/+8
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add to changelog.	Kevin Serrano	2017-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add link to kovan faucet instructions.	Kevin Serrano	2017-03-28	2	-2/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1273 from MetaMask/i1267-seedfix	Dan Finlay	2017-03-29	4	-33/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Assure that seed words are placed into state tree upon request.
\| * \| \| \| \| \| \| \| \|	Assure that seed words are placed into state tree upon request.	Kevin Serrano	2017-03-28	4	-33/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1272 from MetaMask/hideseedwordsfromlogstate	Dan Finlay	2017-03-29	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide seed words from UI State Dump
\| * \| \| \| \| \| \| \| \| \|	Remove a note	Dan Finlay	2017-03-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To reduce security concerns.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into hideseedwordsfromlogstate	Dan Finlay	2017-03-29	3	-3/+17
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add to changelog.	Kevin Serrano	2017-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove seedWords from UI state dump.	Kevin Serrano	2017-03-28	1	-1/+5
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1276 from MetaMask/ImproveGasEstimates	kumavis	2017-03-29	8	-173/+86
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| / / / / / / \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|	Improve UI gas calculation logic
\| * \| \| \| \| \| \| \| \|	Merge branch 'ImproveGasEstimates' of github.com:MetaMask/metamask-plugin ↵	kumavis	2017-03-29	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into ImproveGasEstimates
\| \| * \| \| \| \| \| \| \| \|	Filter txs by txMeta network value in account detail	Dan Finlay	2017-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Filter txs by txMeta network value in account detail	kumavis	2017-03-29	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	tx manager - emit update on new unapproved tx	kumavis	2017-03-29	1	-1/+2
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Detect tx network from txMeta	Dan Finlay	2017-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	tx manager - add eth-query	kumavis	2017-03-29	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	tx manager - adjust new tx flow and txMeta decorations	kumavis	2017-03-29	2	-41/+32
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve UI gas calculation logic	Dan Finlay	2017-03-29	4	-127/+46
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
* \| \| \| \| \| \| \| \|	Merge pull request #1275 from MetaMask/injection-polish	Dan Finlay	2017-03-29	1	-3/+16
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix injection logic.
\| * \| \| \| \| \| \| \|	Fix injection logic.	Kevin Serrano	2017-03-29	1	-3/+16
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #1271 from MetaMask/i1223-InjectIFrames	Dan Finlay	2017-03-28	3	-2/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Inject web3 in iFrames
\| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-03-28	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into master	Dan Finlay	2017-03-28	7	-11/+25
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1269 from MetaMask/notice-fix	Dan Finlay	2017-03-28	3	-1/+8
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Notice fix for when notices are short
\| * \| \| \| \| \| \|	Version 3.5.1v3.5.1	Dan Finlay	2017-03-28	2	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add to changelog.	Kevin Serrano	2017-03-28	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix edge case where notice does not require scrollbar.	Kevin Serrano	2017-03-28	1	-0/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1266 from MetaMask/Version-3.5.0	Frankie	2017-03-28	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 3.5.0
\| * \| \| \| \| \| \|	Version 3.5.0v3.5.0	Dan Finlay	2017-03-28	2	-1/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1265 from MetaMask/ropsten-fix	Dan Finlay	2017-03-28	4	-10/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Block explorer - fix ropsten links
\| * \| \| \| \| \| \|	explorer - fix ropsten explorer link tests	kumavis	2017-03-28	2	-8/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2017-03-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ropsten-fix
\| \| * \| \| \| \| \| \|	block explorer - ropsten	kumavis	2017-03-28	1	-1/+1
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
\| * \| \| \| \| \| \|	tests - fix ropsten link check	kumavis	2017-03-28	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	block explorer - account link - ropsten	kumavis	2017-03-28	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
\| * / / / / /	Allow injection in IFrames + dynamic IFrames	Stefaan Ponnet	2017-03-26	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1253 from MetaMask/i1210-txdisappearance	Dan Finlay	2017-03-25	3	-10/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transactions disappearing on other networks when creating transactions on a network
\| * \ \ \ \ \	Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin ↵	Kevin Serrano	2017-03-25	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into i1210-txdisappearance
\| \| * \ \ \ \ \	Merge branch 'master' into i1210-txdisappearance	Kevin Serrano	2017-03-25	18	-458/+627
\| \| \|\ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	correct bug in test.	Kevin Serrano	2017-03-25	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add tests.	Kevin Serrano	2017-03-25	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into i1210-txdisappearance	Kevin Serrano	2017-03-25	18	-458/+627
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #1249 from MetaMask/kovan-notice	Kevin Serrano	2017-03-25	4	-3/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Kovan notice
\| * \ \ \ \ \ \	Merge branch 'master' into kovan-notice	Dan Finlay	2017-03-25	4	-0/+51
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1250 from MetaMask/notice-modification	Dan Finlay	2017-03-25	4	-0/+51
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Erase notice body when read
\| * \ \ \ \ \ \ \	Merge branch 'master' into notice-modification	Dan Finlay	2017-03-25	10	-455/+569
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Create migration to erase body in read notices.	Kevin Serrano	2017-03-23	1	-0/+36
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add migration tests to ensure that bodies are erased properly in notices.	Kevin Serrano	2017-03-23	2	-0/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove notice body after reading.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into kovan-notice	Dan Finlay	2017-03-25	10	-455/+569
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserForm	Dan Finlay	2017-03-25	8	-451/+565
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hard gas limits browser form
\| * \| \| \| \| \| \| \| \|	Add personalMessages to function to calculate pending tx index.	Kevin Serrano	2017-03-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix tx selecting bug	Dan Finlay	2017-03-25	2	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove goHome action causing erratic UI behavior.	Kevin Serrano	2017-03-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove unnecessary log	Dan Finlay	2017-03-25	1	-2/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'i1234-HardGasLimits-BrowserForm' of ↵	Dan Finlay	2017-03-25	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Kevin Serrano	2017-03-24	1	-3/+3
\| \| \|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParam	Kevin Serrano	2017-03-24	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \|	Remove gas limit param
\| * \| \| \| \| \| \| \| \| \|	Remove gas limit param	Dan Finlay	2017-03-24	1	-3/+3
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1256 by removing redundant param.
\| * / / / / / / / /	Disable accept button when gas limit is too low	Dan Finlay	2017-03-25	1	-8/+5
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Make gas calculations on render more consistent	Dan Finlay	2017-03-24	1	-10/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix initial tx fee estimation	Dan Finlay	2017-03-24	2	-4/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix a couple things	Dan Finlay	2017-03-24	2	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorry apparently the gas fixes weren't in the last commit, but are in this one. As reported in previous commit, fixes a bug where initial estimate is not derived from the network. Also fixes a bug where clicking "reset" does not clear our custom validation warnings.
\| * \| \| \| \| \| \| \|	Make reset button clear errors	Dan Finlay	2017-03-24	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix initial gas price estimate	Dan Finlay	2017-03-24	1	-4/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prevent default for reset and reject buttons	Dan Finlay	2017-03-24	2	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Override browser default validation message	Dan Finlay	2017-03-24	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix some broken refs	Dan Finlay	2017-03-24	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'i1234-HardGasLimits-BrowserForm' of ↵	Dan Finlay	2017-03-24	18	-22/+65
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Kevin Serrano	2017-03-24	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1251 from MetaMask/kovan-tx-etherscan	Dan Finlay	2017-03-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Enable etherscan linking on Kovan transaction list items.
\| * \| \| \| \| \| \| \| \|	Enable etherscan linking on Kovan transaction list items.	Kevin Serrano	2017-03-23	1	-1/+1
\|/ / / / / / / / /
\| \| * \| \| \| \| \| \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Dan Finlay	2017-03-23	14	-17/+53
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Kevin Serrano	2017-03-23	4	-4/+11
\| \| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Combine pending-tx-details component into pending-tx-details	Dan Finlay	2017-03-24	2	-370/+346
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons. This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern. This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-03-23	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Dan Finlay	2017-03-23	8	-52/+227
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Got basic validations working	Dan Finlay	2017-03-23	5	-108/+199
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Some progress	Dan Finlay	2017-03-23	2	-7/+16
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Reset disabled state for confirm button after every notice.	Kevin Serrano	2017-03-23	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Create announcement for Kovan.	Kevin Serrano	2017-03-23	3	-2/+3
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Add to changelog.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Fix persistence of transactions between networks.	Kevin Serrano	2017-03-23	1	-10/+22
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1243 from MetaMask/i238-kovan	Dan Finlay	2017-03-23	10	-4/+45
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Kovan Test Net
\| * \ \ \ \ \ \ \	Merge branch 'master' into i238-kovan	Dan Finlay	2017-03-23	1	-9/+5
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1241 from MetaMask/i1237-xmlfix2	Dan Finlay	2017-03-23	1	-9/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify logic for injection conditions.
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into i1237-xmlfix2	Kevin Serrano	2017-03-23	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into i1237-xmlfix2	Dan Finlay	2017-03-23	2	-4/+2
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into i1237-xmlfix2	Kevin Serrano	2017-03-23	1	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into i1237-xmlfix2	Dan Finlay	2017-03-23	3	-3/+6
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into i1237-xmlfix2	Kevin Serrano	2017-03-23	3	-6/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Modify logic for injection conditions.	Kevin Serrano	2017-03-23	1	-9/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \|	Merge branch 'master' into i238-kovan	Kevin Serrano	2017-03-23	3	-4/+3
\| \| \| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1247 from MetaMask/hide-password	Kevin Serrano	2017-03-23	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Hide the password in the private key retrieval screen.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into hide-password	Kevin Serrano	2017-03-23	2	-4/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1245 from MetaMask/i1193-errorstylefix	Dan Finlay	2017-03-23	2	-4/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix styling of error message in import accounts
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into i1193-errorstylefix	Dan Finlay	2017-03-23	4	-4/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix styling of error message.	Kevin Serrano	2017-03-23	2	-4/+2
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into hide-password	Kevin Serrano	2017-03-23	4	-4/+11
\| \| \|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Hide the password in the private key retrieval screen.	Kevin Serrano	2017-03-23	1	-0/+1
\| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \|	Merge branch 'master' into i238-kovan	Kevin Serrano	2017-03-23	1	-1/+5
\| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1244 from MetaMask/i1227-uidumpblockhash	Dan Finlay	2017-03-23	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Add current block number and hash to the state.
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into i1227-uidumpblockhash	Dan Finlay	2017-03-23	3	-3/+6
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add current block number and hash to the state.	Kevin Serrano	2017-03-23	1	-1/+5
\| \|/ / / / / / / /
\| \| \| * \| \| \| \| \|	Merge branch 'master' into i238-kovan	Dan Finlay	2017-03-23	3	-3/+6
\| \| \| \|\ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1225 from MetaMask/i1033-spinnerfix	Dan Finlay	2017-03-23	3	-3/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix spinner issue on seed word request
\| * \| \| \| \| \| \| \|	Merge branch 'master' into i1033-spinnerfix	kumavis	2017-03-23	8	-51/+226
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add one more loading indication.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Uncomment lines relating to showing indicator.	Kevin Serrano	2017-03-22	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove redundant removal of loading indicator. Integrate loading indicator ↵	Kevin Serrano	2017-03-22	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disappear with display warning.
\| * \| \| \| \| \| \| \|	Changelog addition.	Kevin Serrano	2017-03-21	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add action to hide loading indication on an incorrect pw.	Kevin Serrano	2017-03-21	1	-2/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \|	Changelog bump.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add Kovan test network to our application.	Kevin Serrano	2017-03-23	1	-0/+9
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add kovan to drop-menu-item	Kevin Serrano	2017-03-23	1	-1/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add conditional kovan to current network component.	Kevin Serrano	2017-03-23	1	-0/+12
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add kovan conditional to config screen.	Kevin Serrano	2017-03-23	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add conditional kovan logic to etherscan link generators.	Kevin Serrano	2017-03-23	2	-2/+7
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Modify css rule for unused hollow diamond.	Kevin Serrano	2017-03-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add kovan config settings to config manager.	Kevin Serrano	2017-03-23	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add kovan to config file.	Kevin Serrano	2017-03-23	1	-0/+2
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1239 from MetaMask/betterErrors	kumavis	2017-03-23	2	-5/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better errors
\| * \| \| \| \| \| \|	Add to CHANGELOG	frankiebee	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Have better error messages	frankiebee	2017-03-23	1	-5/+10
\|/ / / / / / /
* \| / / / / /	Require redux-logger of 2.10.2 and up (#1235)	Kevin Serrano	2017-03-23	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Require redux-logger of 2.8.1 and up * Bump to 2.10.2 and above, 2.10.1 had critical bug.
* \| \| \| \| \|	Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle	Dan Finlay	2017-03-22	6	-46/+215
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Polish Private Key Export UI
\| * \| \| \| \|	Add to changelog.	Kevin Serrano	2017-03-21	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Adjust private key confirmation style and logic.	Kevin Serrano	2017-03-21	3	-46/+75
\| \| \| \| \| \|
\| * \| \| \| \|	Add new development states for UI development.	Kevin Serrano	2017-03-21	2	-0/+139
\|/ / / / /
* \| \| \| \|	Merge pull request #1214 from MetaMask/i1181-RemoveLightwallet	Kevin Serrano	2017-03-21	10	-903/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove eth-lightwallet
\| * \ \ \ \	Merge branch 'master' into i1181-RemoveLightwallet	Kevin Serrano	2017-03-21	2	-11/+23
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1215 from MetaMask/ImprovePersonalSignStyle	Dan Finlay	2017-03-21	2	-11/+23
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Improve personal_sign style
\| * \| \| \| \|	Improve personal_sign style	Dan Finlay	2017-03-17	2	-11/+23
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
\| * / / /	Remove eth-lightwallet	Dan Finlay	2017-03-17	10	-903/+2
\|/ / / /
* \| \| \|	Merge pull request #1198 from MetaMask/i1165-predictive	Dan Finlay	2017-03-17	10	-6/+211
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Add predictive address functionality to recipient field in send
\| * \| \|	Merge branch 'master' into i1165-predictive	Kevin Serrano	2017-03-15	31	-43/+40
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1212 from MetaMask/i1211-currencyretention	kumavis	2017-03-15	31	-43/+40
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Fix currency settings retention
\| * \| \|	Merge branch 'master' into i1211-currencyretention	Kevin Serrano	2017-03-15	2	-1/+6
\| \|\ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Rename variables to proper currency state variables.	Kevin Serrano	2017-03-15	5	-17/+14
\| \| \| \|
\| * \| \|	Fix description of some migrations.	Kevin Serrano	2017-03-15	2	-2/+2
\| \| \| \|
\| * \| \|	Fix development to use new currency state.	Kevin Serrano	2017-03-15	24	-24/+24
\| \| \|/ \| \|/\|
\| \| *	Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-15	2	-1/+6
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	i1165-predictive
\| \| \| *	Merge branch 'master' into i1165-predictive	kumavis	2017-03-15	2	-1/+6
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #1207 from MetaMask/i1206-customrpc	Kevin Serrano	2017-03-14	2	-1/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Allow changing custom RPCs from lock screen
\| * \| \|	Changelog addition.	Kevin Serrano	2017-03-14	1	-0/+1
\| \| \| \|
\| * \| \|	Render config screen from unlock.	Kevin Serrano	2017-03-14	1	-0/+4
\| \| \| \|
\| * \| \|	Display Custom RPC on lock screen.	Kevin Serrano	2017-03-14	1	-1/+1
\|/ / /
\| * /	Minor change in removing opts object.	Kevin Serrano	2017-03-15	1	-4/+1
\| \|/
\| *	Add to changelog.	Kevin Serrano	2017-03-15	1	-0/+1
\| \|
\| *	Limit the number of addresses stored in our book.	Kevin Serrano	2017-03-14	1	-0/+4
\| \|
\| *	Add test to account for prevention of identities duplication.	Kevin Serrano	2017-03-11	1	-1/+22
\| \|
\| *	Connect keyring controller to address book to prevent additional duplicates.	Kevin Serrano	2017-03-11	2	-9/+23
\| \|
\| *	Add another test for duplicates.	Kevin Serrano	2017-03-11	1	-0/+7
\| \|
\| *	Improve duplicate checking in address book.	Kevin Serrano	2017-03-11	1	-2/+2
\| \|