Frankie
6f7c23fd28
Merge branch 'dev' into TxManager
2016-12-21 14:31:07 -08:00
Frances Pangilinan
a85c691b71
Remove txManager in keyring controller
2016-12-21 14:06:15 -08:00
Frances Pangilinan
1ebcbe296b
Migrate all tx mutation code out of keyring controller and
...
Fix up txManager to reflect code review requests
2016-12-21 13:41:49 -08:00
Frances Pangilinan
6e78494846
First pass at revision requests
2016-12-21 13:41:32 -08:00
Dan Finlay
73cdf0bfd4
Merge pull request #944 from MetaMask/i938-uri-validation
...
I938 uri validation
2016-12-21 12:04:05 -08:00
Kevin Serrano
9110547465
Add to changelog.
2016-12-20 16:45:30 -08:00
Kevin Serrano
aea263a80d
Lint.
2016-12-20 16:45:22 -08:00
Kevin Serrano
572980402d
Validate URIs before entering them in.
2016-12-20 16:41:04 -08:00
Dan Finlay
674b268982
Merge pull request #916 from MetaMask/i894-DetectBadAccounts
...
I894 detect bad accounts
2016-12-20 11:50:26 -08:00
Dan Finlay
4fbea1c7b4
Merge pull request #939 from MetaMask/BrowserPassworder
...
Remove encryptor in favor of external browser-passworder
2016-12-20 11:49:40 -08:00
Dan Finlay
35d8f69e80
Merge pull request #942 from MetaMask/Version-2.14.1
...
Version 2.14.1
2016-12-20 11:48:15 -08:00
Dan Finlay
dea658a898
Bump passworder version
2016-12-20 10:24:58 -08:00
Dan Finlay
2988bc0723
Use security patched version of browser-passworder
2016-12-20 09:28:15 -08:00
Dan Finlay
3f2945dce0
Version 2.14.1
2016-12-20 08:58:18 -08:00
Dan Finlay
26f1e6cbd2
Remove encryptor in favor of external browser-passworder
...
I broke out the encryptor lib into its own module on npm called browser-passworder.
2016-12-19 21:55:02 -08:00
Dan Finlay
20d2204ce6
Made changes according to feedback.
2016-12-19 19:32:59 -08:00
Dan Finlay
ead8329877
Merge pull request #937 from MetaMask/i900-forgot-password-flow
...
I900 forgot password flow
2016-12-19 16:01:01 -08:00
Kevin Serrano
9c8345467c
Modify actions to support better transition.
2016-12-19 15:46:09 -08:00
kumavis
f7eec0b282
Merge pull request #936 from MetaMask/MergeMaster
...
Merge master
2016-12-19 18:28:43 -05:00
Kevin Serrano
92ddcba76b
Add to changelog.
2016-12-19 14:56:27 -08:00
Kevin Serrano
e9bea92ac3
Lint.
2016-12-19 14:55:52 -08:00
Kevin Serrano
20c043a4c2
Redirect to seed word screen for forgotten passwords.
2016-12-19 14:54:24 -08:00
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
