Dan Finlay
77d2deb176
Merged master into dev
2016-12-19 13:37:27 -08:00
Dan Finlay
6ce0bc4b11
Merge pull request #935 from MetaMask/kumavis-patch-1
...
inpage - temporarily disable ping stream
2016-12-19 13:30:54 -08:00
kumavis
e1d6a1ea94
changelog - add whitespace
2016-12-19 13:24:38 -08:00
kumavis
b88fbf8da9
Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into kumavis-patch-1
2016-12-19 13:24:02 -08:00
kumavis
5ea7d738d2
changelog - inf reload detection hotfix
2016-12-19 13:23:32 -08:00
kumavis
695f6800e2
Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into kumavis-patch-1
2016-12-19 13:22:24 -08:00
kumavis
6f8370fce8
changelog - add note on inf reload detection hotfix
2016-12-19 13:22:02 -08:00
kumavis
c591845e5b
Merge branch 'master' into kumavis-patch-1
2016-12-19 15:31:39 -05:00
kumavis
b4a298e1a3
inpage - temporarily disable ping stream
2016-12-19 12:25:35 -08:00
Dan Finlay
abf1f6ec79
Merge pull request #929 from MetaMask/Version-2.14.0
...
Version 2.14.0
2016-12-19 11:58:31 -08:00
Dan Finlay
3b68d9e1e7
Version 2.14.0
2016-12-16 13:55:04 -08:00
Dan Finlay
d24acc5f13
Merge pull request #927 from MetaMask/AddNotices
...
Add notices
2016-12-16 13:50:07 -08:00
Dan Finlay
a5024aa372
Clean up first notice
...
Remove redundant title from notice component.
Make link color the same orange as the rest of the UI.
2016-12-16 13:40:32 -08:00
Kevin Serrano
8d0f4c2799
Add date to notices display.
2016-12-16 13:31:12 -08:00
kumavis
73998feeb2
move notice code from metamask-controller + config-manager, in to notice-controller
2016-12-16 12:44:47 -08:00
kumavis
ff13f40d1f
meta - add npm-debug.log to gitignore
2016-12-16 12:43:37 -08:00
kumavis
4c390a6221
clean - code style
2016-12-16 11:58:15 -08:00
Kevin Serrano
1458b8c68e
Deactivate polling for now.
2016-12-16 11:39:41 -08:00
Dan Finlay
c8d7f777eb
Merge branch 'AddNotices' of github.com:MetaMask/metamask-plugin into AddNotices
2016-12-16 11:29:16 -08:00
Dan Finlay
2b1d821da3
Cleanup
2016-12-16 11:26:39 -08:00
Kevin Serrano
085abb79cf
remove duplicate controller.
2016-12-16 11:24:05 -08:00
Kevin Serrano
0abb42cbb8
Clean notices.
2016-12-16 11:22:59 -08:00
Kevin Serrano
58cc9b9e67
The first notice, the fall of morden.
2016-12-16 11:21:16 -08:00
Dan Finlay
55fdf06d53
Rebuild development states before ci tests
2016-12-16 11:16:36 -08:00
Kevin Serrano
851ba66cdd
Add ability to show notices to user & get confirmation.
...
Implement generation of markdown for notice files.
Create npm command. Enhance notice generation.
Add test files to test multiple notices.
Add basic markdown support to notices.
Interval checks for updates.
Add extensionizer and linker
Add terms and conditions state file
Add link support to disclaimer.
Changelog addition.
2016-12-16 10:55:42 -08:00
Kevin Serrano
8819475a2e
Add ability to show notices to user & get confirmation.
...
Implement generation of markdown for notice files.
Create npm command. Enhance notice generation.
Add test files to test multiple notices.
Add basic markdown support to notices.
Interval checks for updates.
Add extensionizer and linker
Add terms and conditions state file
Add link support to disclaimer.
Changelog addition.
2016-12-16 10:44:52 -08:00
Dan Finlay
1b6ee56cac
Merge pull request #926 from MetaMask/revert-920-dev
...
Revert "Interface enhancements"
2016-12-16 10:08:47 -08:00
Dan Finlay
6d13ef691f
Revert "Interface enhancements"
2016-12-16 10:04:57 -08:00
Frankie
d5569781ba
Merge pull request #923 from MetaMask/RemoveMorden
...
Remove morden
2016-12-16 09:48:03 -08:00
Dan Finlay
4f3ba6e0b8
Bump changelog for removing morden
2016-12-15 16:12:03 -08:00
Dan Finlay
83880a5c92
Remove morden testnet provider
...
Instances configured to point at Morden will now point at Ropsten.
2016-12-15 16:12:03 -08:00
Dan Finlay
e6c01abba4
Merge pull request #920 from luisivan/dev
...
Interface enhancements
2016-12-14 16:46:36 -08:00
Luis Iván Cuende
3969526403
Fixed header h1 alignment and network name
2016-12-14 14:35:36 -08:00
Luis Iván Cuende
4a8bc63c8d
Better account details view
2016-12-14 10:03:56 -08:00
Luis Iván Cuende
c65db9290d
Better editable label
2016-12-14 09:38:20 -08:00
Luis Iván Cuende
b8ee336f0d
Better buttons
2016-12-13 23:46:50 -08:00
Luis Iván Cuende
233094e19d
Beautified disclaimer
2016-12-13 23:38:55 -08:00
kumavis
ff94cf6d10
Merge pull request #918 from MetaMask/i915-txPermaCache
...
deps - bump provider-engine for bug fix
2016-12-12 19:23:13 -05:00
kumavis
84ff919f73
deps - bump provider-engine for bug fix
2016-12-12 16:09:52 -08:00
Dan Finlay
9e3fa3cfba
Merge pull request #914 from MetaMask/FixUnitTestSuite
...
Remove .only from unit test suite
2016-12-08 10:01:59 -08:00
Dan Finlay
c93227ea72
Cranked up CI test suite wait duration to alleviate their nondeterminism for now
2016-12-07 16:55:15 -08:00
Dan Finlay
fe01ceb857
Remove .only from unit test suite
2016-12-07 16:32:49 -08:00
Dan Finlay
3d0129b753
Merge pull request #912 from MetaMask/kumavis-patch-1
...
changelog - "fix reload detection"
2016-12-07 15:06:00 -08:00
kumavis
3632173afa
changelog - "fix reload detection"
2016-12-07 14:59:20 -08:00
Dan Finlay
0e83b26710
Merge pull request #911 from MetaMask/i873-reloadBroken
...
Fix broken disconnect detector
2016-12-07 14:56:09 -08:00
kumavis
26b60f1b5a
inpage - correctly listen for incomming messages
2016-12-07 14:42:38 -08:00
kumavis
eb7cf2bf31
Merge pull request #904 from MetaMask/BetterIntegrationTest
...
Made integration test suite better, added a step to story
2016-12-01 13:30:31 -05:00
Dan Finlay
c431783602
Remove redundant logging block
2016-12-01 10:21:56 -08:00
Dan Finlay
1880cda9b9
Fix vault encrypting & unlocking bug
...
This is only a bug in dev, but was committed yesterday.
Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults.
To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
2016-11-30 19:36:24 -08:00
Dan Finlay
049e351c9d
Add integration tests for logging out and back in
2016-11-30 16:01:51 -08:00
