5015 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Kei Chan	0163538d5e	Merge branch 'NewUI-flat' into cb-372	2017-12-07 09:54:56 -08:00
Chi Kei Chan	41d281a527	Merge branch 'NewUI-flat' into cb-372	2017-12-07 09:54:37 -08:00
Chi Kei Chan	e0d0e19c92	Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UI ... [NewUI] Auto add users to new ui	2017-12-07 09:47:31 -08:00
Chi Kei Chan	efa894a0c3	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	2017-12-07 09:46:55 -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
Dan	2e9137dddd	Update max amount behaviour to meet new specs.	2017-12-06 21:15:39 -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	bd5ce9461e	User is automatically added to new UI if they meet conditions at time of login.	2017-12-06 20:49:45 -03:30
Frankie	a78cc013d1	Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff ... Exponentional backoff on transaction retry in pending-tx-tracker	2017-12-06 15:57:19 -05:00
Dan	3356c15d04	Add tests for exponential backoff code in _resubmitTx	2017-12-06 14:11:14 -03:30
Dan	af8fcb6777	Update resubmitPendingTxs tests.	2017-12-06 14:10:11 -03:30
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	9db00fa507	Show user notifications after switch between UIs	2017-12-04 23:36:54 -03:30
Dan	730d7f84ca	Update newUI UI for switching back to old UI.	2017-12-04 23:08:51 -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	ce14ee2ffc	New-ui actions accomodates old-ui.	2017-12-04 23:08:23 -03:30
Dan	f7ad015f5b	Use newui actions in old-ui	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Dan	6561e75aa2	Add old-ui directory	2017-12-04 23:06:26 -03:30
Alexander Tseung	7dba114feb	Update font weights to 300, remove animation from network dropdown, fix network dropdown not closing from certain click-areas	2017-12-01 14:19:53 -08:00
Thomas Huang	c30b543a80	Merge pull request #2630 from MetaMask/i2624-VersionedNotices ... Versioned notices	2017-11-29 17:25:10 -06:00
Dan Finlay	91817573c9	Bump changelog	2017-11-29 13:54:53 -08:00
Dan Finlay	10459ebaf4	Remove debugger	2017-11-29 13:35:48 -08:00
Dan Finlay	adc66974ff	Add markdown class to mascara ui markdown field	2017-11-29 13:34:19 -08:00
Dan Finlay	9ca6f93eca	Bump version to 3.12.1	2017-11-29 12:50:12 -08:00
Dan Finlay	f725bc6ab7	Fix test reference	2017-11-29 12:41:55 -08:00
Dan Finlay	42108ba3bc	Make notice skipping async	2017-11-29 12:39:48 -08:00
kumavis	23a5ea9321	Merge pull request #2627 from MetaMask/reload-fix ... Fix dapp reload via obs-store@3	2017-11-29 10:31:52 -10:00
Dan Finlay	9276fea6bc	Redundantly skip notices	2017-11-29 12:30:10 -08:00
Dan Finlay	119c0fdecf	Make test more resilient	2017-11-29 12:23:31 -08:00
Dan Finlay	6d63720f87	Remove duplicate button declaration	2017-11-29 12:11:09 -08:00
Dan Finlay	4e6946f47c	Fix test selector	2017-11-29 11:52:26 -08:00
Dan Finlay	8192c0b58c	Fix migration comment	2017-11-29 11:51:27 -08:00
Dan Finlay	e35cd77eee	Accept all notices in integration tests	2017-11-29 11:49:53 -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	45c5a26405	Fix test to skip screens before privacy notice	2017-11-28 17:25:09 -08:00
Dan Finlay	ab35a76a24	Migrate old data to include firstVersion info	2017-11-28 16:56:45 -08:00
Dan Finlay	80dedcc01c	Bump changelog	2017-11-28 15:37:29 -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
Thomas Huang	2b1f2557c7	Merge pull request #2615 from jpclark/NewUI-flat ... Provide blockie identicon option	2017-11-28 13:58:06 -06:00
Thomas Huang	f131468353	Remove useBlockie in props for render ... Removed unused useBlock for Lint validation.	2017-11-28 13:37:45 -06:00
Dan Finlay	ec4b7de962	Add firstVersion field to notices selector	2017-11-28 11:22:09 -08:00