754 Commits

Author	SHA1	Message	Date
Kevin Serrano	5a02e58f62	Fix proper behavior for restoring accounts when password forgotten.	2016-11-23 13:49:54 -08:00
Kevin Serrano	5251fb373f	Modify forgot password flow to go back to init screen.	2016-11-23 13:05:02 -08:00
Dan Finlay	1e46d858e9	Fix undefined provider menu item	2016-11-22 16:34:02 -08:00
kumavis	e14efa8f17	Merge pull request #858 from MetaMask/i842-WaitForSeedWord ... I842 wait for seed word	2016-11-22 16:18:43 -05:00
Dan Finlay	0289444fcb	Merge branch 'dev' into i842-WaitForSeedWord	2016-11-22 10:51:48 -08:00
Kevin Serrano	8261cf232d	Merge branch 'dev' into dev-cleanup	2016-11-22 10:50:15 -08:00
Kevin Serrano	17669e4af8	Make ropsten faucet button point at the correct url.	2016-11-22 10:20:59 -08:00
Kevin Serrano	8d2afccdc0	Ropsten has sole access to the faucet.	2016-11-22 10:13:57 -08:00
Kevin Serrano	88ed1f191f	Add to changelog.	2016-11-22 09:45:28 -08:00
Dan Finlay	ea56426b23	Use callback in placeSeedWord method. ... When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842	2016-11-21 20:08:36 -08:00
Dan Finlay	17d63acaed	Fix camel casing on setSelectedAccount action.	2016-11-21 18:16:59 -08:00
Kevin Serrano	1cbab788ec	Change fauceting to become a response of an emit.	2016-11-21 16:46:26 -08:00
Kevin Serrano	f5b0795ac5	change all instances of selectedAddress to selectedAccount.	2016-11-21 16:21:16 -08:00
Kevin Serrano	9123e70434	Remove entropy from encryption and project.	2016-11-21 15:49:03 -08:00
Kevin Serrano	7cf6e372eb	Merge pull request #837 from MetaMask/FixMenuItem ... Fix custom provider menu item	2016-11-21 12:19:54 -08:00
Dan Finlay	6ae2400ef2	Fix custom provider menu item ... The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.	2016-11-21 11:45:31 -08:00
Dan Finlay	7ab9d40820	Merge branch 'dev' into i831-AddRopsten-Dev	2016-11-21 11:03:32 -08:00
Dan Finlay	e8a8302624	Begin adding Ropsten support ... Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831	2016-11-21 10:58:49 -08:00
Kevin Serrano	a07e5826ad	Convert conversion util to pure json.	2016-11-18 16:49:39 -08:00
Kevin Serrano	592b64a19f	Revert one cb to previous state.	2016-11-15 17:13:33 -08:00
Kevin Serrano	5bfb700fa8	Minimize dispatches by using emitters and relying on state updates.	2016-11-15 17:12:13 -08:00
Kevin Serrano	7de6b12aad	Re-enable disclaimer screen. Rename variables to reflect role more clearly.	2016-11-14 16:49:16 -08:00
Kevin Serrano	0c23925c23	Fix lint rules for ternary operator placement.	2016-11-11 15:37:22 -08:00
Kevin Serrano	3828edf6a4	Typo fix.	2016-11-11 10:54:15 -08:00
Kevin Serrano	23263bec7d	Linting to the max.	2016-11-11 10:26:12 -08:00
kumavis	c664b8f11e	Merge branch 'master' into i328-MultiVault	2016-11-11 03:18:33 -05:00
Frankie	b60f51dfc2	lint fix	2016-11-10 22:20:58 -08:00
Frankie	b60992b446	Fix funny looking errors in conf-tx	2016-11-10 22:13:30 -08:00
kumavis	e123e3095b	Merge branch 'master' into i328-MultiVault	2016-11-11 01:01:06 -05:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Frankie	f665b779cb	Merge branch 'master' into i328-MultiVault	2016-11-10 16:53:47 -08:00
Kevin G. Serrano	7b3f1ecc41	Unify warning functions.	2016-11-07 16:02:02 -08:00
Dan Finlay	161ff62fdc	Merge branch 'master' into i328-MultiVault	2016-11-07 15:38:25 -08:00
Dan Finlay	b3cb675a8b	Develop import subviews	2016-11-04 15:32:02 -07:00
Dan Finlay	a7af47db92	Add import account placeholder template	2016-11-04 14:39:53 -07:00
Dan Finlay	bc623bbe34	Linted	2016-11-04 12:32:47 -07:00
Dan Finlay	19f7041ba4	Add account adding subview placeholders	2016-11-04 12:27:26 -07:00
Dan Finlay	2cf2ceae21	Remove unused class	2016-11-04 12:02:20 -07:00
Dan Finlay	1af0d609bd	Convert buy subview to new tab bar component	2016-11-04 12:02:00 -07:00
Dan Finlay	1bbe0ed9e8	Scaffold new account view	2016-11-04 12:01:41 -07:00
Dan Finlay	e3fb7fa7bb	Remove insane actions hash	2016-11-04 10:48:24 -07:00
Kevin Serrano	8f3db0dbc0	Add reveal of seed words.	2016-11-01 22:19:04 -07:00
Dan Finlay	f2bfdd7f8c	Make identicon tolerant of changing state	2016-11-01 17:06:18 -07:00
Dan Finlay	b5f6ef8c01	Fixed bugs related to clearing caches when restoring to a new vault	2016-11-01 17:00:17 -07:00
Dan Finlay	72729060dc	Make forgot password button.	2016-11-01 15:00:28 -07:00
Dan Finlay	498b30bddc	Fix seed phrase restore	2016-11-01 11:51:51 -07:00
Kevin Serrano	db356a181a	Made progress on parity for MultiVault ... - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.	2016-11-01 11:30:10 -07:00
Kevin Serrano	0643c35936	Linted	2016-10-31 11:38:48 -07:00
Kevin Serrano	96643c222a	Implement seed word confirmation page. ... Remove logs. Move HD render files to ui/app.	2016-10-31 11:35:09 -07:00
Dan Finlay	18cf635735	Fix github link on info page	2016-10-31 09:30:55 -07:00
Kevin Serrano	25c46a1636	Make case condition more consistent. Remove extra action. Fix incorrect display of network.	2016-10-30 16:01:12 -07:00
Kevin Serrano	625c54b7ec	Add focus to password field.	2016-10-30 14:08:14 -07:00
Kevin Serrano	02b0cf2e6d	Add password warning div.	2016-10-30 14:00:04 -07:00
Kevin Serrano	2418197041	Modify first-screen design to match docs.	2016-10-30 13:38:37 -07:00
Kevin Serrano	9b4f3825e7	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-28 16:19:14 -07:00
Kevin Serrano	6eb6968037	Merge branch 'master' into i328-MultiVault	2016-10-28 16:19:03 -07:00
Dan Finlay	6ec471c6dc	Configure BIP44 Keychain as default one	2016-10-28 12:10:35 -07:00
Dan Finlay	ed3814bff8	Fix identicon rendering	2016-10-27 16:16:28 -07:00
Dan Finlay	28eec68f85	Update first screen to match design.	2016-10-27 16:02:34 -07:00
Dan Finlay	b1fb8da3b0	Fix provider menu selection indication	2016-10-25 14:16:04 -07:00
Kevin Serrano	678301a20e	Phase out extra warning screen.	2016-10-25 13:24:03 -07:00
Dan Finlay	152419a79b	Merge branch 'master' into i328-MultiVault	2016-10-21 17:58:18 -07:00
Frankie	7d9e295b75	Change regex in isHex function	2016-10-21 16:39:14 -07:00
Frankie	d79424e9c0	clean up the isHex function	2016-10-21 16:05:39 -07:00
Dan Finlay	a462fc82e0	Fix duplicate provider menu item bug	2016-10-21 15:19:16 -07:00
Dan Finlay	957b7a72b5	Improved simple account generation	2016-10-20 17:29:25 -07:00
Dan Finlay	55d56f77cf	Began adding first basic keyring	2016-10-20 16:45:58 -07:00
Dan Finlay	0deed17752	Fix tests	2016-10-20 12:07:53 -07:00
Dan Finlay	383f8ea7dc	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
Dan Finlay	e5c95d68f8	Fix state updating after vault creation and unlocking	2016-10-20 11:00:38 -07:00
Dan Finlay	f090828f99	Commented out useless advanced not on init screen	2016-10-20 09:58:44 -07:00
Dan Finlay	f14fdf7a25	Change actions reference to keyringController to background	2016-10-20 09:58:33 -07:00
Dan Finlay	40f175c06f	Linted	2016-10-20 09:50:29 -07:00
Frankie	aa4746f4c7	Add test and ability for isHex to handle hex strings with hex-prefix	2016-10-19 19:35:44 -07:00
Frankie	ac7dca22c3	Fix up wording	2016-10-19 17:39:41 -07:00
Kevin Serrano	afbc4c832b	Git merge resolution.	2016-10-19 14:57:30 -07:00
Kevin Serrano	ad3fa24a28	Intermediary commit.	2016-10-19 14:55:08 -07:00
Frankie	5fb1e492fb	Add valdations to txData param	2016-10-19 14:33:30 -07:00
Kevin Serrano	1481a3ef8e	Initial work on UI side	2016-10-15 10:48:12 -07:00
Frankie	aace26c4bd	Create callback and Clean-up details	2016-10-13 16:53:32 -07:00
Frankie	328f8b0cac	fix spelling	2016-10-13 16:22:45 -07:00
Frankie	67eba9f542	Specify base 10 in bignumber	2016-10-13 16:04:23 -07:00
Frankie	c400f7c0f6	Fix gasPrice range	2016-10-13 15:10:29 -07:00
Dan Finlay	cd2c00a318	Add minimal method signatures to new keyring controller	2016-10-12 17:05:39 -07:00
Dan Finlay	93ed918caa	Remove additional deprecated action	2016-10-12 16:43:35 -07:00
Dan Finlay	5c9969e126	Remove opinionated seed word code ... Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.	2016-10-12 16:31:15 -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
Dan Finlay	6d6130e2a6	Camelcase dataset key for react	2016-09-10 11:23:11 -07:00
Kevin Serrano	69aa2ed25f	Merge branch 'master' into FixLogoPasswordFollow	2016-09-09 09:40:35 -07:00
Dan Finlay	a4e4c85453	Fix fox logo password following ... The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.	2016-09-08 20:31:42 -07:00
Dan Finlay	7b6c018c39	Show loading indication during unlocking.	2016-09-08 19:53:54 -07:00
Dan Finlay	4a7eab5b1a	Merge branch 'master' into FixLogoLeak	2016-09-08 15:43:51 -07:00
Dan Finlay	6c05c221cd	Fix new logo related errors ... Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.	2016-09-08 15:41:21 -07:00
Frankie	079c1a8972	Merge branch 'master' into i#589pendingTxsIssue	2016-09-08 13:45:27 -07:00
Frankie	0d4bfe8038	Remove console.log	2016-09-08 13:44:32 -07:00
Frankie	7d8491de10	Add to CHANGELOG.md and Remove unnecessary catch	2016-09-08 13:13:43 -07:00
Frankie	69580480bc	Merge branch 'master' into i#589pendingTxsIssue	2016-09-08 12:56:48 -07:00
Frankie	6f86c5f8ee	Add network checks for unconfirmed Txs	2016-09-08 12:56:04 -07:00
Dan Finlay	762bf2f48a	Merge branch 'master' into AddNewLogo	2016-09-08 12:49:57 -07:00
Dan Finlay	20ae4c2689	Fix logo usage for metamask-logo v2.0.0 ... - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624	2016-09-08 11:22:04 -07:00
Dan Finlay	ab3b409438	Restore broken variable reference	2016-09-08 11:03:47 -07:00
Dan Finlay	c42b37a6e7	Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance	2016-09-08 10:57:31 -07:00
Dan Finlay	c3dbcb5b02	Fix double tooltip	2016-09-08 10:57:10 -07:00
Dan Finlay	d1e91766da	Merge branch 'master' into ModularFiatBalance	2016-09-08 10:50:05 -07:00
Frankie	5f8d3085d7	Filter out pending txs based on network from tx history	2016-09-07 20:56:51 -07:00
John Weldon	d6619a25e9	Fix typo	2016-09-07 14:44:56 -07:00
Dan Finlay	2ca58f5bf7	Merge branch 'master' into ModularFiatBalance	2016-09-06 19:36:40 -07:00
Dan Finlay	0186e05a0d	Linted	2016-09-06 17:30:38 -07:00
Dan Finlay	1537e3f5da	Add fiat balances to tx conf view	2016-09-06 17:28:25 -07:00
Dan Finlay	c46de79c10	Got basic fiat display modularized	2016-09-06 17:08:56 -07:00
Dan Finlay	90638f95c0	Fix fiat-value	2016-09-06 16:55:52 -07:00
Dan Finlay	09dd854a96	Nearly finished factoring fiat value into eth-balance	2016-09-06 16:45:06 -07:00
Kevin Serrano	f4e131da0a	Fix capitalization.	2016-09-06 11:04:54 -07:00
Kevin Serrano	f213ca695c	Fix typos and refine wording.	2016-09-06 10:03:10 -07:00
Dan Finlay	b2ebb6032d	Continuing fiat balance modularization	2016-09-03 14:20:27 -07:00
Dan Finlay	7b1bbb7a19	Show conf screen after send request	2016-09-01 11:30:42 -07:00
Dan Finlay	7f947f8ab2	Skip loading indication from send screen	2016-09-01 11:29:17 -07:00
Dan Finlay	a804629606	Show custom rpc menu item always	2016-08-29 12:36:47 -07:00
Dan Finlay	62179a37f7	Fix spelling error	2016-08-26 15:08:02 -07:00
Frankie	ae33586660	make the back button its own function	2016-08-26 11:30:07 -07:00
Frankie	547894ed39	Merge branch 'master' into i#563forgotPassword	2016-08-25 16:06:54 -07:00
Frankie	250cf8cc23	Change style on back button to be more like the rest of the app	2016-08-25 16:05:44 -07:00
Dan Finlay	8b81009a30	Merge branch 'master' into PopupNotifications	2016-08-25 15:42:35 -07:00
Dan Finlay	a8e40ffe7a	Persist shapeshift form input values	2016-08-25 14:19:09 -07:00
Frankie	11c6c63d76	Merge branch 'master' into i#563forgotPassword	2016-08-25 14:17:29 -07:00
Frankie	483a7fee0a	Add a back button on lock screen to go back to init menu	2016-08-25 14:13:32 -07:00
Dan Finlay	b39bd5333b	Persist send tx form field values	2016-08-25 14:10:07 -07:00
Dan Finlay	d81bde9f6c	Make restore vault form persist	2016-08-25 12:18:04 -07:00
Dan Finlay	793ad6b8d8	Merge branch 'master' into PopupNotifications	2016-08-24 16:59:22 -07:00
Dan Finlay	8c06463e80	Linted	2016-08-24 15:46:31 -07:00
Dan Finlay	44ff75c7e1	Improve msg signing padding	2016-08-24 15:43:00 -07:00
Dan Finlay	4f78ae56b2	Fix empty sign message bug	2016-08-24 15:40:40 -07:00
Dan Finlay	bc43e3d140	Merge branch 'master' into PopupNotifications	2016-08-23 16:02:06 -07:00
Dan Finlay	65f7656487	Linted	2016-08-23 15:48:16 -07:00
Dan Finlay	671ca33abb	Close notification on opening main UI	2016-08-23 15:44:50 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	6363a80b49	Linting.	2016-08-23 14:32:12 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
Dan Finlay	4fb49dfb4b	Close popup even if last tx is dismissed from main UI	2016-08-23 11:40:08 -07:00
Dan Finlay	49ab51d825	Merge branch 'master' into PopupNotifications	2016-08-22 20:06:59 -07:00
Dan Finlay	5d24621b56	More linting	2016-08-22 17:37:16 -07:00
Dan Finlay	a9b53530b6	Fix back button hiding on popup	2016-08-22 17:29:47 -07:00
Dan Finlay	17f3f90d80	Linted	2016-08-22 17:21:54 -07:00
Dan Finlay	6e1000f361	Merge branch 'master' into PopupNotifications	2016-08-22 15:03:36 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Kevin Serrano	cec88cc9ac	Merge branch 'master' into fox-sub	2016-08-22 11:58:59 -07:00
Frankie	edfb0eb968	Fix issue where if given a balance that does not need to be parsed will not be parsed	2016-08-19 17:18:11 -07:00
Kevin Serrano	7a466697d3	Modify logic for component update.	2016-08-19 16:59:04 -07:00
Kevin Serrano	43e28788d7	Create replacement logo for non-webgl	2016-08-19 14:47:49 -07:00
Dan Finlay	8592ffd855	Merge branch 'master' into i390-TransactionLimit	2016-08-19 07:57:35 -07:00
Dan Finlay	9cd85aea2f	Merge branch 'master' into shapeshiftTx	2016-08-19 07:50:57 -07:00