1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Commit Graph

4464 Commits

Author SHA1 Message Date
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
kumavis
b17a799de6 Update network.js 2017-10-23 12:10:49 -07:00
Frankie
61eea51310 Merge pull request #2429 from MetaMask/i2428-AltEnsTlds
Add support for alternative ENS TLDs
2017-10-23 11:49:04 -07:00
Dan Finlay
6d05238469 Try to fix intermittent test failure in NonceTracker tests 2017-10-22 22:24:50 -07:00
Dan Finlay
926abc12b1 Add support for alternative ENS TLDs
Fixes #2428
2017-10-22 22:12:12 -07:00
Dan Finlay
e564ed8d4c Version 3.11.2 2017-10-21 15:40:57 -07:00
Thomas Huang
1c273b50d3 Merge pull request #2423 from MetaMask/json-rpc-fix
Temporarily reversal of json-rpc-engine
2017-10-21 18:08:15 -04:00
Kevin Serrano
721019bc2b
Temporarily reversal of json-rpc-engine 2017-10-21 14:47:12 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
2017-10-21 21:06:39 +02:00
Daijiro Wachi
c1eb8f16dc Add lint:fix command to gulp and npm-scripts 2017-10-21 21:04:24 +02:00
Chi Kei Chan
f503120b82 Add Import With Seed Phrase 2017-10-20 22:31:59 -07:00
Chi Kei Chan
2b26496826 Add mobile responsiveness 2017-10-20 21:51:37 -07:00
Chi Kei Chan
213cf6aa09 Remove import option 2017-10-20 21:51:37 -07:00
Chi Kei Chan
63a5eca967 Fix import 2017-10-20 21:51:37 -07:00
Chi Kei Chan
25f4f69706 Fix capitialization 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan
d9735ed5b3 Fixing integraiton test 2017-10-20 21:51:37 -07:00
Chi Kei Chan
996523c790 Fix unit test 2017-10-20 21:51:37 -07:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5cbbb476b3 ShapeShift Integration 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Chi Kei Chan
e88baff2ee Add missing presets 2017-10-20 21:51:37 -07:00
Jacky Chan
ad647050d6 Move "Skip this step" to side panel 2017-10-20 21:51:37 -07:00
Jacky Chan
a4ad88c331 Disable CTA unless notice is scrolled to bottom 2017-10-20 21:51:37 -07:00
Jacky Chan
945cc5d18d Fix Buy Ether flow 2017-10-20 21:51:37 -07:00
Jacky Chan
638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan
85e485128f Add Go to Coinbase; Show Buy Ether after signup 2017-10-20 21:51:37 -07:00
Jacky Chan
4ecd28ca9b Hide Warning after changing import options 2017-10-20 21:51:37 -07:00
Jacky Chan
0cc521e130 Implement Buy Ether Screen UI 2017-10-20 21:51:37 -07:00
Jacky Chan
449bce5eea Implement Import Account Screen 2017-10-20 21:51:37 -07:00
Jacky Chan
1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
fd4fbdc0cd Add NoticeScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
4e446410eb Add Breadcrumbs 2017-10-20 21:51:37 -07:00
Jacky Chan
537f8a6ce1 CreatePasswordScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
0264ecaad7 Adding CreatePasswordScreen 2017-10-20 21:51:37 -07:00
Thomas Huang
20cb6a76dd Merge pull request #2419 from MetaMask/Version-3.11.1
Version 3.11.1
2017-10-20 21:58:18 -04:00
Dan Finlay
56dcf7c011 Version 3.11.1 2017-10-20 14:07:54 -07:00
Frankie
09e04606cd Merge pull request #2401 from MetaMask/filter-fix-maybe
filters bug fix
2017-10-20 13:13:18 -07:00
kumavis
a71c95b987 changelog entry for filter fix 2017-10-20 12:32:15 -07:00
kumavis
61e1b821d4 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe 2017-10-20 12:31:40 -07:00
kumavis
8472ca406a deps - bump eth-json-rpc-filters for log filter fix 2017-10-20 12:29:12 -07:00
kumavis
2a18f732c7 Merge pull request #2412 from MetaMask/x-frame-options
mascara - set x-frame-options header to DENY
2017-10-20 11:04:11 -07:00
Thomas Huang
e3a7da961d Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault
Select first account on create or restore vault
2017-10-20 12:09:44 -04:00
Thomas Huang
c24e266118 Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-20 09:04:57 -04:00
frankiebee
5c902423d9 mascara - set x-frame-options header to DENY 2017-10-20 02:30:46 -07:00
kumavis
87ad6a29f0 Merge pull request #2409 from chikeichan/fix-account-creation
Update eth-keyring-controller dependency
2017-10-19 17:59:41 -07:00
Chi Kei Chan
69d8359639 Update eth-keyring-controller dependency 2017-10-19 17:48:45 -07:00
Dan Finlay
a10a600cce Linted 2017-10-19 12:33:43 -07:00