2133 Commits

Author	SHA1	Message	Date
kumavis	84275456e4	Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe ... Blacklist problematic shopify iFrame	2018-04-30 17:06:19 -06:00
Bryce Neal	18a8a21179	Blacklist problematic shopify iFrame	2018-04-30 14:35:47 -07:00
kumavis	e881ea7aaf	sentry - report error-like messages using the obj message	2018-04-30 12:10:15 -07:00
kumavis	2a8d3ea450	sentry - wrap report modifiers in a try-catch	2018-04-30 12:07:48 -07:00
kumavis	5f3f8c85fc	Merge pull request #4059 from MetaMask/i-4033-seed-words ... Use new design for Reveal Seed screen. Persist seed words only in the first time flow.	2018-04-30 12:04:53 -06:00
kumavis	755d4945f7	Merge pull request #4132 from MetaMask/master ... Master	2018-04-30 09:38:12 -06:00
frankiebee	873f85d996	guard adainst raven erroring	2018-04-29 13:46:07 -07:00
kumavis	2b9925a9e4	Merge pull request #4110 from MetaMask/master ... Develop - Add commits to develop that are already in Master	2018-04-27 16:17:46 -06:00
bitpshr	8c5994abc9	Return 0 for token rate fetch failures	2018-04-26 18:31:54 -04:00
Thomas Huang	4e7b0ff15c	Merge pull request #4095 from MetaMask/v4.6.0 ... Version 4.6.0	2018-04-26 14:16:35 -07:00
kumavis	b97457e9e2	v4.6.0	2018-04-26 13:43:44 -07:00
kumavis	dcd04091cc	Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 ... docs and file organization for txController	2018-04-25 16:52:46 -06:00
kumavis	1c63b11e3f	rpc - bump provider-engine + eth-json-rpc-filters	2018-04-25 14:02:41 -07:00
frankiebee	8ffce8b59d	transactions - more docs and clean ups	2018-04-25 11:13:51 -07:00
Dan Finlay	f6653b9f94	Merge pull request #4069 from MetaMask/i4056-LatestPriceApi ... Use latest balanc3 api for prices	2018-04-25 10:42:03 -07:00
Dan Finlay	7ec775d614	Use latest balanc3 api for prices	2018-04-24 14:12:57 -07:00
Dan	0fbd389a50	lint fix	2018-04-24 13:18:34 -02:30
Dan	ed264d3479	Merge branch 'master' into dm-docs-2	2018-04-24 12:36:30 -02:30
Dan	020824f3c7	Remove accidentally added code in message-manager.	2018-04-24 12:36:26 -02:30
Dan	016d492414	Remove unnecessary doc comment.	2018-04-24 12:20:38 -02:30
Dan Finlay	a833f02f33	Use the metamask balanc3 dev price api ... Fixes #4056	2018-04-23 16:39:33 -07:00
Dan Finlay	9dd8158b1d	Merge pull request #4029 from MetaMask/DocumentMetaMaskController ... Added docs to MM-controller	2018-04-23 15:49:47 -07:00
Dan Finlay	4289f813e9	Merge pull request #3968 from MetaMask/gh-3653 ... Clean up network config	2018-04-23 15:49:17 -07:00
Dan Finlay	9679cdae02	Merge pull request #4041 from MetaMask/DocumentBackground ... Document Background Script	2018-04-23 14:49:01 -07:00
Dan Finlay	5abb0256a9	Linted docs	2018-04-23 14:47:11 -07:00
Alexander Tseung	9e41f58af2	Clean up network config	2018-04-23 10:18:05 -07:00
Dan Finlay	621e9334bc	Cleaned up some typos and JSDocs in Transactions ... Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker	2018-04-23 09:43:18 -07:00
Dan	0c26df9653	Fix nits.	2018-04-23 14:11:02 -02:30
Alexander Tseung	1d2d9798cb	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words	2018-04-22 09:28:29 -07:00
Alexander Tseung	3082d2e4ef	Use new design for reveal seed screen. Persist seed words only in first time flow	2018-04-22 09:24:21 -07:00
Alexander Tseung	477b74124d	Revert "Fix UI getting stuck in Reveal Seed screen" ... This reverts commit 2c8156ebe9.	2018-04-21 22:23:45 -07:00
Dan Finlay	74c419f9b6	Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr ... Documentation	2018-04-20 14:10:05 -07:00
Dan	69920045e9	Minor fixes in a number of docs.	2018-04-20 15:48:58 -02:30
Dan	3ec22dc7e1	Notification manager method docs.	2018-04-20 15:48:44 -02:30
Dan Finlay	327ec03d6f	Remove wrong chars	2018-04-20 10:45:06 -07:00
Dan Finlay	357582cc52	Add ui note to background docs	2018-04-20 10:41:41 -07:00
Dan Finlay	17afe922d4	Lint background docs	2018-04-20 10:40:53 -07:00
Dan Finlay	ff689748a7	Document MetaMaskState and TransactionMeta	2018-04-20 10:39:31 -07:00
Dan Finlay	fad8afb7d1	Linted jsdocs	2018-04-20 09:26:24 -07:00
Dan	71b0de76ff	Merge branch 'master' into dm-docs-2	2018-04-20 13:23:17 -02:30
bitpshr	8636f3bae5	Clean up JSDoc for background scripts	2018-04-19 15:14:00 -04:00
frankiebee	e862a5091e	transactions - fix refernces	2018-04-19 12:07:45 -07:00
frankiebee	c20c97ce62	Merge branch 'master' into tx-controller-rewrite-v3	2018-04-19 11:49:11 -07:00
frankiebee	eeb9390de8	meta - transactions - docs yo!	2018-04-19 11:46:15 -07:00
bitpshr	9c7eafc86f	Add more documentation to computed balances controller	2018-04-19 14:37:08 -04:00
Dan Finlay	16434776a4	Document Background Script	2018-04-19 11:27:53 -07:00
Dan	9f12c26d44	Even more documentation for various controllers and libs.	2018-04-19 13:08:56 -02:30
bitpshr	1ef6528921	Add JSDoc to various background scripts	2018-04-18 21:30:13 -04:00
Dan Finlay	f78d2f5e0b	Added docs to MM-controller	2018-04-18 17:54:50 -07:00
Dan Finlay	4544d57f26	Merge pull request #3984 from whymarrh/3941-jsdoc ... Add a few docblocks to background files	2018-04-18 15:37:50 -07:00