1615 Commits

Author	SHA1	Message	Date
Dan	05c6789030	Adds button for opening app in main browser window in extension.	2017-12-12 12:14:40 -08:00
Chi Kei Chan	845aec82b9	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	2017-12-07 09:46:28 -08:00
Chi Kei Chan	373f8b72d0	Merge branch 'master' into NewUI-flat	2017-12-06 21:13:29 -08:00
Dan	ec6c3c33bd	Merge branch 'master' into NewUI-flat-merge-with-master	2017-12-06 21:11:52 -08:00
Dan	f58aae3f2b	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx	2017-12-06 13:21:09 -03:30
Dan	ea23da9e75	Correct note for updateTx after block-update event in transaction.js	2017-12-06 13:07:31 -03:30
Dan	871d9fd9fb	Fix undefined latestBlockNumber in _resubmitTx	2017-12-06 13:02:38 -03:30
Dan	ae2a4d78e8	Exponentional backoff on transaction retry in pending-tx-tracker	2017-12-05 17:21:14 -03:30
Dan	84321b2d9b	Lint fix	2017-12-04 23:08:23 -03:30
Dan	db06e7e649	Css selected in background based on betaUI state.	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Thomas Huang	c30b543a80	Merge pull request #2630 from MetaMask/i2624-VersionedNotices ... Versioned notices	2017-11-29 17:25:10 -06:00
Dan Finlay	9ca6f93eca	Bump version to 3.12.1	2017-11-29 12:50:12 -08:00
Dan Finlay	8192c0b58c	Fix migration comment	2017-11-29 11:51:27 -08:00
kumavis	327651e7fb	Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix	2017-11-29 08:27:47 -10:00
Dan Finlay	ab35a76a24	Migrate old data to include firstVersion info	2017-11-28 16:56:45 -08:00
Dan Finlay	bd82b17310	Linted	2017-11-28 15:35:20 -08:00
Dan Finlay	049ec52a95	Add seed phrase bounty award notice ... Only shows to people who installed before or equal to MetaMask 3.12.1	2017-11-28 15:31:49 -08:00
Dan Finlay	f0f6bb28e0	Get notice version filtering working nicely	2017-11-28 15:16:04 -08:00
kumavis	f64bc3c01a	deps - obs-store@3 + migrate stream plumbing	2017-11-28 11:09:18 -10:00
Dan Finlay	ec4b7de962	Add firstVersion field to notices selector	2017-11-28 11:22:09 -08:00
Dan Finlay	e89f82399f	Add optional version field to notices ... Allows notices to only show to users who are on a certain version.	2017-11-28 11:14:57 -08:00
Dan Finlay	725277dbdb	Merge pull request #2441 from MetaMask/kumavis-patch-3 ... NetworkController - add warning when aborting lookupNetwork	2017-11-27 16:21:25 -08:00
kumavis	634102df63	network controller - warn via log.warn	2017-11-27 13:59:32 -10:00
Jason Clark	a34362b776	Fixes changes requested in pullrequestreview-79088534	2017-11-27 08:11:48 -07:00
Jason Clark	abefcc9612	more eslint fixes	2017-11-25 15:57:54 -07:00
Jason Clark	fc46a16a32	toggle wired up to preferences property store	2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)	90fc4812bc	incremental commit	2017-11-23 18:33:44 -07:00
Dan Finlay	65cb970487	Prevent creation of multiple vaults ... Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.	2017-11-20 14:03:12 -08:00
Dan Finlay	c0aa7ce857	Add reproduction and mutex code	2017-11-20 13:27:29 -08:00
Thomas Huang	408bbe726f	Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error ... Add useful error when duplicate web3 is detected.	2017-11-20 11:38:41 -06:00
Chi Kei Chan	03968ffafe	Version Bump	2017-11-15 12:23:39 -08:00
Chi Kei Chan	e61ba93194	Merge branch 'master' into merge-master	2017-11-15 12:03:13 -08:00
Dora E. Mondrian	41fea44af3	newUnaprovedTx => newUnapprovedTx ... This typo tripped me up when I was reading through the code and trying to understand what's going on.	2017-11-06 04:35:51 -08:00
Thomas Huang	86e88dc813	Merge pull request #2519 from danjm/NewUI-flat-lintfixes ... [NewUI-flat] New ui flat lintfixes	2017-11-02 10:02:09 -07:00
Dan	5a94775b3f	Lint fixes for NewUI-flat.	2017-11-02 00:00:33 -02:30
Dan Finlay	5ce94e69b3	Add useful error when duplicate web3 is detected. ... Fixes #2507	2017-10-31 09:59:26 -07:00
Kevin Serrano	e0030a8bf8	Merge pull request #2291 from MetaMask/gasPriceSpecified ... Add boolean for specified gas price	2017-10-27 14:01:08 -07:00
Kevin Serrano	1e9c0a9db2	Resolve merge conflicts	2017-10-26 16:22:08 -07:00
kumavis	c1d2a1226c	4.0.3	2017-10-25 20:13:05 -07:00
kumavis	a7424f0c0d	3.12.0	2017-10-25 20:06:26 -07:00
Chi Kei Chan	db5326dfc2	Merge branch 'NewUI-flat' into uat	2017-10-25 19:46:42 -07:00
Chi Kei Chan	5aecce908f	Merge branch 'master' into NewUI-flat	2017-10-25 18:49:02 -07:00
Chi Kei Chan	fa95303e1e	Sign Typed Request styling fixes	2017-10-25 18:05:52 -07:00
Dan	ddf11011c9	Signature request fixes.	2017-10-25 17:40:48 -07:00
Kevin Serrano	b9bbf8f329	Resolving that ugly merge.	2017-10-25 15:45:26 -07:00
Alexander Tseung	3d8182f5d5	Add Info section	2017-10-25 12:16:47 -07:00
Chi Kei Chan	311ca1f3ca	Fix styling on notification view	2017-10-25 00:10:09 -07:00
Chi Kei Chan	301c737bbc	Merge branch 'master' into NewUI-flat	2017-10-24 16:56:49 -07:00
Kevin Serrano	1767dceba4	Merge pull request #2422 from watilde/fixes-lint ... Fixes lint warnings	2017-10-24 16:53:54 -07:00