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

4502 Commits

Author SHA1 Message Date
Thomas Huang
7a4097e6a6
Merge pull request #2596 from MetaMask/issue-template-support-link
Point issue template at new support center
2017-11-20 10:52:52 -06:00
greenkeeper[bot]
fac516e5eb fix(package): update react-markdown to version 3.0.0 2017-11-20 09:08:48 +00:00
Dan Finlay
db321d95cc
Point issue template at new support center 2017-11-17 11:27:02 -08:00
Thomas Huang
707a10548d
Merge pull request #2540 from doraemondrian/master
newUnaprovedTx => newUnapprovedTx
2017-11-14 09:41:11 -08:00
Dora E. Mondrian
41fea44af3 newUnaprovedTx => newUnapprovedTx
This typo tripped me up when I was reading through the code and trying to understand what's going on.
2017-11-06 04:35:51 -08:00
Dan Finlay
5ce94e69b3 Add useful error when duplicate web3 is detected.
Fixes #2507
2017-10-31 09:59:26 -07:00
Thomas Huang
7bfb08cf3b
Merge pull request #2508 from watilde/fixes-1192
Remove warning message when show import page
2017-10-31 06:08:29 -07:00
Daijiro Wachi
6574499165 Use const and fix lint warnings 2017-10-30 20:08:10 +01:00
Daijiro Wachi
0bfa10e501 Remove warning message when show import page
Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
2017-10-30 20:04:44 +01:00
Kevin Serrano
e0030a8bf8
Merge pull request #2291 from MetaMask/gasPriceSpecified
Add boolean for specified gas price
2017-10-27 14:01:08 -07:00
Kevin Serrano
4ac198eebc Merge pull request #2275 from MetaMask/version-debugging
Add OS Version and Browser Version to State Logs
2017-10-26 17:06:33 -07:00
Kevin Serrano
3deeb6df0b
Add option to copy directly to clipboard. 2017-10-26 16:40:13 -07:00
Kevin Serrano
c89ea954e5
Correct changelog. 2017-10-26 16:23:58 -07:00
Kevin Serrano
fc7ca17aa8
Bump Changelog 2017-10-26 16:23:18 -07:00
Kevin Serrano
1e9c0a9db2
Resolve merge conflicts 2017-10-26 16:22:08 -07:00
Frankie
19afb63819 Merge pull request #2489 from MetaMask/3.12.0
3.12.0
2017-10-25 21:06:32 -07:00
kumavis
a7424f0c0d 3.12.0 2017-10-25 20:06:26 -07:00
Kevin Serrano
988dd8fd61 Merge pull request #2100 from ChainsawBaby/patch-1
Remove annoying console.log on each run
2017-10-25 16:03:48 -07:00
Kevin Serrano
23daca0e08
Bump Changelog 2017-10-25 15:52:08 -07:00
Kevin Serrano
b9bbf8f329
Resolving that ugly merge. 2017-10-25 15:45:26 -07:00
Dan Finlay
2489caddd4 Merge pull request #2476 from MetaMask/100MweiMinGasPrice
Reduce minimum gas price to 100 MWEI
2017-10-25 13:53:03 -07:00
Kevin Serrano
4903f3e71a
Add labels to clarify warning. 2017-10-25 11:52:16 -07:00
Kevin Serrano
e7a22fc62b
Account for non-submitted mins and max 2017-10-25 11:47:40 -07:00
Kevin Serrano
b3b9e16ec0
Add clarifying comment about wei conversion. 2017-10-25 11:40:07 -07:00
Kevin Serrano
7f093f67a7
Cut out intermediary wei steps. 2017-10-25 11:38:32 -07:00
Kevin Serrano
dee172fb3a
Remove unneeded toString conversions. 2017-10-25 11:36:12 -07:00
Kevin Serrano
e1b9734cbf
Move upsize conversions for input warning at front of fn. 2017-10-25 11:35:18 -07:00
Kevin Serrano
cb7d07ebae
Fix mismatched decimal/hex conversion in pending-tx 2017-10-25 11:32:38 -07:00
Dan Finlay
c0e0522c30 Remove css build bundle from uat 2017-10-25 10:39:03 -07:00
Dan Finlay
074f10575f Update changelog 2017-10-25 10:29:46 -07:00
Frankie
bba2980d0a Merge pull request #2478 from MetaMask/mascaraHeadersFix
Fix X-Frame-Options for mascara
2017-10-25 10:12:43 -07:00
tmashuang
81d11ecd59 Fix X-Frame-Options for mascara 2017-10-25 08:50:58 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Kevin Serrano
242456ba6a
Resolve merge conflict. 2017-10-24 16:44:25 -07:00
Kevin Serrano
98d8275743
Fix for gas price to be lowered. 2017-10-24 16:43:03 -07:00
Dan Finlay
35ca7e83bd Reduce minimum gas price to 100 MWEI
Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.
2017-10-24 15:10:03 -07:00
Thomas Huang
ae56b865e8 Merge pull request #1990 from chikeichan/firsttimeflow
Implement Mascara First Time Flow
2017-10-24 11:22:31 -07:00
tmashuang
099078d13b Add error messages when importing an account 2017-10-24 08:40:07 -07:00
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