7969 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	585284cb88	Lints.	2016-11-15 13:44:22 -08:00
Kevin Serrano	2ae62a4573	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-11-15 13:43:42 -08:00
Kevin Serrano	64296df309	Resolve merge conflicts.	2016-11-15 13:43:15 -08:00
Kevin Serrano	14e6b92e29	Resolve merge conflicts.	2016-11-15 13:41:09 -08:00
Kevin Serrano	1db0bc4b2a	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-11-15 13:31:58 -08:00
Kevin Serrano	a4666de0ce	Minimize repeated code.	2016-11-15 13:31:22 -08:00
Kevin Serrano	b1fee2a1d3	Minimize repeated code.	2016-11-15 11:19:21 -08:00
kumavis	68d5b459ed	Merge pull request #811 from MetaMask/deadly-fix ... Fix error display in confirmation screen	2016-11-14 22:39:17 -05: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	92edc63d6e	Add idStore tests again.	2016-11-14 16:23:52 -08:00
Kevin Serrano	acf02c9290	Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix	2016-11-14 11:21:51 -08:00
Kevin Serrano	205205f7cd	Add to changelog.	2016-11-14 11:19:58 -08:00
Kevin Serrano	d891869eff	First attempt at fixing errors in confirmation screen.	2016-11-14 11:19:01 -08:00
Kevin Serrano	26a548a7a3	First attempt at fixing errors in confirmation screen.	2016-11-14 11:17:53 -08:00
Kevin Serrano	eea3bfb0b3	Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests.	2016-11-11 17:06:37 -08:00
Kevin Serrano	4826f7c0a0	Revert to previous anonymous function for promise.	2016-11-11 17:06:07 -08:00
Kevin Serrano	20cea5b2f5	Various keyring changes ... - Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters.	2016-11-11 15:41:04 -08:00
Kevin Serrano	bfeaae69f2	Clarify functions names. Package normalize inside util file. Fix require headers.	2016-11-11 15:40:12 -08:00
Kevin Serrano	7012747fb5	Package normalize inside sig util file.	2016-11-11 15:37:54 -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
kumavis	115fdc36fe	Merge pull request #807 from MetaMask/cssIsAwesome ... Fix funny looking errors in conf-tx	2016-11-11 01:31:23 -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	f88079c6b9	Merge pull request #805 from MetaMask/i804 ... detect tx error - show warning and fix gasLimit	2016-11-11 00:37:09 -05:00
kumavis	1d0abc4771	changelog - update	2016-11-10 21:26:10 -08:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Kevin Serrano	ad290d3edc	Merge pull request #802 from MetaMask/confTxFix ... Conf tx fix	2016-11-10 20:36:50 -08:00
Frankie	17aac2dbc5	fix tx data so it has the network id	2016-11-10 19:07:12 -08:00
Frankie	f665b779cb	Merge branch 'master' into i328-MultiVault	2016-11-10 16:53:47 -08:00
Kevin Serrano	3775a4bf79	Merge pull request #801 from MetaMask/deadly ... Properly implement 20% gas bump	2016-11-09 16:42:10 -08:00
Kevin Serrano	e2b2083df0	remove gas field, due to alias redundancy.	2016-11-09 16:38:28 -08:00
Kevin Serrano	b6b4be61d9	Fix bug for increasing gas by 20 percent.	2016-11-09 16:29:24 -08:00
Kevin Serrano	14a833f5c0	Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly	2016-11-09 14:28:23 -08:00
Frankie	ebcdb7a491	Merge pull request #797 from MetaMask/Version-2.13.7 ... Version 2.13.7	2016-11-08 09:22:10 -08:00
Dan Finlay	b57009493b	Hard coding jazzicon at working version	2016-11-08 08:54:30 -08:00
Dan Finlay	4a0197012e	Version 2.13.7	2016-11-08 08:51:14 -08:00
Dan Finlay	2160eb35aa	Merge pull request #796 from MetaMask/IncreaseGasBuffer ... Increase gas buffer	2016-11-08 08:49:43 -08:00
Dan Finlay	7068d2e71c	Adjust gas buffer to be 20% over estimate	2016-11-08 08:39:41 -08:00
Dan Finlay	6f39924e60	Increase gas buffer ... Fixes #795	2016-11-08 08:32:34 -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	93c0a6826a	Fix integration test suite	2016-11-07 14:11:01 -08:00
Dan Finlay	798e057854	Fix nickname test	2016-11-07 12:19:56 -08:00
Dan Finlay	7b420c6e15	Fix BN reference	2016-11-07 12:18:02 -08:00
Kevin Serrano	62a15fc59e	Merge pull request #793 from MetaMask/i787-HighGasBug ... i787 High gas bug	2016-11-07 12:06:08 -08:00
Dan Finlay	553a6da011	Fix 787 gas buffer bug	2016-11-07 12:00:14 -08:00