792 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Frankie	c152f98735	Add to changelog	2016-06-21 15:08:24 -07:00
Frankie	cf663f1104	Fix conflict	2016-06-21 15:04:00 -07:00
Dan Finlay	dc2ef96702	Fix badge token param	2016-06-21 14:54:56 -07:00
Dan Finlay	b7f7292a21	Add circle token to badge image	2016-06-21 14:33:37 -07:00
Dan Finlay	46b513cd00	Update build badge	2016-06-21 14:31:42 -07:00
Dan Finlay	7a049ae27f	Update CI status badge for Circle	2016-06-21 14:29:55 -07:00
kumavis	537328b529	Merge pull request #303 from MetaMask/AutoLint ... Auto lint	2016-06-21 14:24:28 -07:00
Dan Finlay	d7c3e8e9f5	Add circle.yml	2016-06-21 14:18:38 -07:00
Dan Finlay	3c01969fe3	Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint	2016-06-21 14:12:48 -07:00
Dan Finlay	bb7788373d	Merge pull request #302 from MetaMask/batch-payload-origin ... background - batch rpc fix for origin domain	2016-06-21 14:09:57 -07:00
Dan Finlay	1cafdb8b1d	Add linting to our mocha suite	2016-06-21 14:01:40 -07:00
Dan Finlay	8fde8a8921	Manually linted	2016-06-21 13:56:04 -07:00
Frankie	265725c6ed	Change the copy to cliboard icon	2016-06-21 13:40:02 -07:00
Frankie	bd1d67b219	add key.png	2016-06-21 13:39:25 -07:00
Dan Finlay	ab15b4c825	Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint	2016-06-21 13:19:44 -07:00
Dan Finlay	a08c3bc01b	Auto linted	2016-06-21 13:18:32 -07:00
kumavis	45d16d975b	background - batch rpc fix for origin domain	2016-06-21 13:14:21 -07:00
Frankie	5d349083f0	Change export icon to key	2016-06-21 13:10:28 -07:00
Dan Finlay	f7f8f8b1c5	Turn spaces back on	2016-06-21 13:06:41 -07:00
Dan Finlay	7b2f061fbb	Some manual fixes	2016-06-21 12:51:04 -07:00
Dan Finlay	45506d6758	Got eslint running correctly	2016-06-21 12:40:09 -07:00
Dan Finlay	7b9a1197c8	Began adding auto linting	2016-06-21 12:07:13 -07:00
Dan Finlay	cfc056e34b	Merge pull request #299 from MetaMask/balances-bug-fix ... added a failing case and fixed it by refactoring everything to strings	2016-06-21 09:19:37 -07:00
Zac Mitton	bd6ee81d09	tweek	2016-06-21 10:52:41 -05:00
kumavis	6fdece459d	2.4.1	2016-06-21 00:51:59 -07:00
kumavis	30da848611	id-mgmt - add missing deps	2016-06-21 00:39:27 -07:00
Zac Mitton	9132f08507	added a failing case and fixed it by refactoring everything to strings	2016-06-20 18:46:29 -04:00
Dan Finlay	d19c286ee8	Version 2.4.0	2016-06-20 15:36:47 -07:00
Dan Finlay	61459a6b51	Merge pull request #294 from MetaMask/SignFullDataNotHash ... Sign full data not hash	2016-06-20 15:08:27 -07:00
Dan Finlay	7ecc028c5d	Merge pull request #296 from MetaMask/i252 ... idStore - add DELEGATE_CALL detection	2016-06-17 10:48:44 -07:00
kumavis	c1e9444200	idStore - add DELEGATE_CALL detection	2016-06-16 19:51:34 -07:00
Dan Finlay	281ed1c2bb	Fix tx approval address formatting	2016-06-16 18:37:39 -07:00
Dan Finlay	451be3b10e	Merge branch 'master' into SignFullDataNotHash	2016-06-16 17:34:44 -07:00
kumavis	bdb113fabe	Merge pull request #295 from MetaMask/AddDisclaimer ... Create disclaimer view	2016-06-16 17:27:50 -07:00
Dan Finlay	65f9f997b0	Bump changelog	2016-06-16 17:22:26 -07:00
kumavis	6f19e9d5a9	Merge pull request #291 from MetaMask/AddContributingMd ... Add contributing.md file	2016-06-16 17:18:56 -07:00
Dan Finlay	69f628dbe2	Preserve disclaimer line breaks	2016-06-16 17:11:13 -07:00
Dan Finlay	79999109e2	Added some real text to top of disclaimer	2016-06-16 17:05:38 -07:00
Dan Finlay	9e7a9e6837	Increase disclaimer scroll box height	2016-06-16 16:57:56 -07:00
Dan Finlay	1f0de5588d	Remove dead code	2016-06-16 16:55:45 -07:00
Dan Finlay	2835112dbf	Conditionally display disclaimer	2016-06-16 16:55:32 -07:00
Dan Finlay	93fa97f86a	Add disclaimer component	2016-06-16 16:55:22 -07:00
Dan Finlay	f5fa0d3fa5	Improved template to not be invisible	2016-06-16 16:49:10 -07:00
Dan Finlay	08ecbcf242	Create disclaimer approval reducer	2016-06-16 16:41:57 -07:00
Dan Finlay	e8ef8f3d2d	Add confirmation status to metamask state branch	2016-06-16 16:41:33 -07:00
Dan Finlay	c5d334d372	Fix disclaimer approving action	2016-06-16 16:40:55 -07:00
Dan Finlay	af48b94f6f	Add disclaimer consent action	2016-06-16 15:58:45 -07:00
Dan Finlay	5d90167bcc	Expose disclaimer consent to dnode API	2016-06-16 15:58:11 -07:00
Dan Finlay	825bb4494b	Add placeholder disclaimer file	2016-06-16 15:51:57 -07:00
Dan Finlay	f6d1da7793	Improve template	2016-06-16 15:51:39 -07:00