519 Commits

Author	SHA1	Message	Date
Frankie	c400f7c0f6	Fix gasPrice range	2016-10-13 15:10:29 -07:00
Frankie	229d95956b	Merge branch 'master' into i#495CustomGasField	2016-10-11 16:19:13 -07:00
Dan Finlay	5d01d50c16	Merge branch 'master' into i721-ScrollAccountList	2016-10-11 16:13:53 -07:00
Kevin Serrano	39f2118d31	Remove logs.	2016-10-11 16:03:52 -07:00
Dan Finlay	1dc2612f8e	Remove flex class from account list container	2016-10-11 15:59:55 -07:00
Kevin Serrano	5e9bc31c58	Cleanup.	2016-10-11 15:50:02 -07:00
Kevin Serrano	ed03b89e26	Move tos hash logic to build phase. Create dynamic global variables based on build.	2016-10-11 14:32:03 -07:00
Frankie	3a610f2c06	Merge branch 'master' into i#495CustomGasField	2016-10-10 18:18:07 -07:00
Frankie	e1b78da3e6	Add custom gas field to send page	2016-10-10 18:17:56 -07:00
Kevin Serrano	0ecf364c5b	Prevent back/login buttons from appearing on the terms of service.	2016-10-07 02:11:03 -07:00
Kevin Serrano	c0d6dcff00	Rewritten to react standards. Way easier.	2016-10-05 02:42:19 -07:00
Kevin Serrano	a59422c01d	Linting.	2016-10-04 21:50:56 -07:00
Kevin Serrano	862adf3a4b	Rename drop menu item to be consistent with naming.	2016-10-04 21:47:17 -07:00
Kevin Serrano	f7714412e5	Add relevant legal links to help page.	2016-10-04 21:46:33 -07:00
Kevin Serrano	9b61978738	Make config page title consistent with menu item.	2016-10-04 21:06:31 -07:00
Kevin Serrano	94bfb5410b	Add links to relevant legal pages on user agreement page.	2016-10-04 21:03:14 -07:00
Kevin Serrano	64d8f91371	Add conditional logic for adding listener.	2016-10-04 20:49:06 -07:00
Kevin Serrano	1158855a15	Add padding to markdown paragraphs.	2016-10-04 18:45:01 -07:00
Kevin Serrano	30a915921e	Merge branch 'master' into tos	2016-10-04 18:40:47 -07:00
Kevin Serrano	991c06e542	Add CSS rules for proper formatting.	2016-10-04 18:39:54 -07:00
Kevin Serrano	3628c5b324	Implemented scroll-to-bottom functionality for button activation.	2016-10-04 17:42:17 -07:00
Frankie	4eafb7da2f	Merge branch 'master' into SmallerCopiedButton	2016-10-04 13:50:16 -07:00
Dan Finlay	769bd8e2ee	Removed hex prefix from private key export ... For compatibility with Jaxx, MEW, and Geth. Fixes #687	2016-10-04 13:26:51 -07:00
Dan Finlay	c7d10affd5	Make seed word confirmation button font smaller ... To avoid formatting glitches on some machines.	2016-10-04 13:04:54 -07:00
Dan Finlay	1f771f30e4	Space out purchase details on ShapeShift form	2016-09-15 21:18:21 -07:00
Dan Finlay	ed51b91b4a	Merge branch 'master' into i675-LoadingBuy	2016-09-15 21:05:24 -07:00
Dan Finlay	4eef2c57cf	Show loading indication when selecting ShapeShift	2016-09-15 20:58:18 -07:00
Frankie	77ef71448d	Fix CHANGELOG.md and restructure onClick events	2016-09-15 19:35:04 -07:00
Frankie	3682a2a1f9	linting	2016-09-15 18:25:05 -07:00
Frankie	dcda841f4d	Merge branch 'master' into tx-viz	2016-09-15 18:16:41 -07:00
Frankie	9c982a4bd6	add tx-viz link to transaction history	2016-09-15 18:13:13 -07:00
Frankie	cf484d735f	Clean up some of the code	2016-09-15 14:31:45 -07:00
kumavis	1325990726	css - smaller balance warning	2016-09-15 13:04:09 -07:00
kumavis	f0d83813d6	confTx - add insufficient balance warning message	2016-09-15 12:56:40 -07:00
kumavis	5005fc143b	confTx - show disabled accept btn + add colors	2016-09-15 12:42:35 -07:00
Frankie	8ea086290b	Merge branch 'master' into i#519buyButtonTxConf	2016-09-15 10:26:02 -07:00
Frankie	ef0b535d94	Drop the buy button in the confTx view if account does not have enough eth	2016-09-15 10:24:05 -07:00
Dan Finlay	a0bfdfe409	Do not show user rejection errors within our UI.	2016-09-14 14:34:54 -07:00
Frankie	19c1b1fd8e	Merge branch 'master' into qrCode	2016-09-13 12:18:19 -07:00
kumavis	f7794d9949	PendingTxDetails - partially remove imagify support	2016-09-13 10:18:57 -07:00
kumavis	c477411ce0	Merge branch 'library' of github.com:MetaMask/metamask-plugin into library	2016-09-13 00:37:41 -07:00
kumavis	8a5007a396	ui - remove unused currentDomain prop	2016-09-12 21:30:04 -07:00
Frankie	4aa5114019	Remove unused code in qr actions	2016-09-12 17:32:49 -07:00
Frankie	fc292627e4	Merge branch 'master' into qrCode	2016-09-12 17:30:54 -07:00
Frankie	218f380d87	Add qrcode-npm to package.json and swap out Qr Code generator api for node-module	2016-09-12 17:27:14 -07:00
Dan Finlay	784856532c	Ensure loading indication covers fox	2016-09-12 14:37:17 -07:00
Dan Finlay	2caac3c7d7	Fix single account list formatting	2016-09-12 14:27:26 -07:00
Dan Finlay	0d11eab8cb	Add accounts back to metamask state	2016-09-12 14:22:06 -07:00
Frankie	c37c050c8a	Revert "Add new eth-lightwallet salting to vault."	2016-09-12 10:34:06 -07:00
Dan Finlay	c2105c4070	Fix account list formatting when only a single item. ... - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.	2016-09-12 08:39:38 -07:00