Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 43 | -1468/+2065 |
* | Fix edit to field bug. (#2738) | Dan J Miller | 2017-12-13 | 1 | -6/+7 |
* | Remove inline style. | Dan | 2017-12-13 | 3 | -4/+4 |
* | Make transaction list and item more flexible. | Dan | 2017-12-13 | 2 | -4/+4 |
* | Flex account-data-subsection | Dan | 2017-12-13 | 3 | -19/+20 |
* | Fix old ui width in mobile and extension. | Dan | 2017-12-13 | 2 | -24/+21 |
* | Fix height of login screen | Dan | 2017-12-13 | 1 | -27/+25 |
* | Fix isMascara and update yarn.lock | Chi Kei Chan | 2017-12-13 | 2 | -290/+464 |
* | Substitute isMascara check for explicit check if user is on mobile browser. | Dan | 2017-12-13 | 2 | -13/+2 |
* | Hide open in browser button on mobile (but still show on extension); adds a f... | Dan | 2017-12-13 | 3 | -3/+15 |
* | Adds button for opening app in main browser window in extension. | Dan | 2017-12-13 | 4 | -0/+29 |
* | Delete uneeded files from old-ui. | Dan | 2017-12-13 | 9 | -2106/+0 |
* | Merge pull request #2639 from alextsg/cb-372 | Chi Kei Chan | 2017-12-08 | 5 | -23/+28 |
|\ | |||||
| * | Merge branch 'NewUI-flat' into cb-372 | Chi Kei Chan | 2017-12-08 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
| * | Merge branch 'NewUI-flat' into cb-372 | Chi Kei Chan | 2017-12-08 | 162 | -152/+21152 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 138 | -43/+20783 |
|\ \ | |||||
| * \ | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
| * | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 28 | -109/+369 |
| |\ \ | |/ / |/| | | |||||
* | | | Update max amount behaviour to meet new specs. | Dan | 2017-12-07 | 6 | -15/+55 |
* | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-12-07 | 3 | -23/+88 |
|\ \ \ | |||||
| * \ \ | Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff | Frankie | 2017-12-07 | 3 | -23/+88 |
| |\ \ \ | |||||
| | * | | | Add tests for exponential backoff code in _resubmitTx | Dan | 2017-12-07 | 1 | -17/+63 |
| | * | | | Update resubmitPendingTxs tests. | Dan | 2017-12-07 | 1 | -3/+4 |
| | * | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in... | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | Correct note for updateTx after block-update event in transaction.js | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | Fix undefined latestBlockNumber in _resubmitTx | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | Exponentional backoff on transaction retry in pending-tx-tracker | Dan | 2017-12-06 | 2 | -2/+20 |
| |/ / / | |||||
| * | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 12 | -54/+127 |
| |\ \ \ | |||||
| | * | | | Bump changelog | Dan Finlay | 2017-11-30 | 1 | -0/+2 |
| | * | | | Remove debugger | Dan Finlay | 2017-11-30 | 1 | -1/+0 |
| | * | | | Add markdown class to mascara ui markdown field | Dan Finlay | 2017-11-30 | 2 | -4/+5 |
| | * | | | Bump version to 3.12.1 | Dan Finlay | 2017-11-30 | 1 | -1/+1 |
| | * | | | Fix test reference | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | Make notice skipping async | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | Redundantly skip notices | Dan Finlay | 2017-11-30 | 1 | -25/+22 |
| | * | | | Make test more resilient | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | Remove duplicate button declaration | Dan Finlay | 2017-11-30 | 1 | -2/+2 |
| | * | | | Fix test selector | Dan Finlay | 2017-11-30 | 1 | -0/+1 |
| | * | | | Fix migration comment | Dan Finlay | 2017-11-30 | 1 | -2/+3 |
| | * | | | Accept all notices in integration tests | Dan Finlay | 2017-11-30 | 1 | -18/+3 |
| | * | | | Fix test to skip screens before privacy notice | Dan Finlay | 2017-11-29 | 1 | -1/+7 |
| | * | | | Migrate old data to include firstVersion info | Dan Finlay | 2017-11-29 | 3 | -1/+42 |
| | * | | | Bump changelog | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | * | | | Linted | Dan Finlay | 2017-11-29 | 2 | -2/+2 |
| | * | | | Add seed phrase bounty award notice | Dan Finlay | 2017-11-29 | 4 | -3/+4 |
| | * | | | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 4 | -24/+38 |
| | * | | | Add firstVersion field to notices selector | Dan Finlay | 2017-11-29 | 2 | -1/+5 |
| | * | | | Add optional version field to notices | Dan Finlay | 2017-11-29 | 3 | -1/+21 |
| * | | | | Merge pull request #2627 from MetaMask/reload-fix | kumavis | 2017-11-30 | 4 | -7/+11 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 2 | -8/+8 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #2620 from MetaMask/update-deps | Dan Finlay | 2017-11-29 | 1 | -7/+7 |
| |\ \ \ \ | |||||
| | * | | | | Update greenkeeper deps for master | Thomas Huang | 2017-11-28 | 1 | -7/+7 |
| * | | | | | Merge pull request #2441 from MetaMask/kumavis-patch-3 | Dan Finlay | 2017-11-28 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | network controller - warn via log.warn | kumavis | 2017-11-28 | 1 | -1/+1 |
| | * | | | | | Update network.js | kumavis | 2017-10-24 | 1 | -1/+1 |
| | | | * | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 4 | -7/+11 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug | Thomas Huang | 2017-11-28 | 4 | -5/+68 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Bump changelog | Dan Finlay | 2017-11-21 | 1 | -0/+1 |
| | * | | | | Remove logs | Dan Finlay | 2017-11-21 | 1 | -6/+0 |
| | * | | | | Get test passing | Dan Finlay | 2017-11-21 | 1 | -4/+25 |
| | * | | | | Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-Test | Dan Finlay | 2017-11-21 | 2 | -5/+34 |
| | |\ \ \ \ | |||||
| | | * | | | | Prevent multiple submissions of first time form | Dan Finlay | 2017-11-21 | 1 | -1/+6 |
| | | * | | | | Prevent creation of multiple vaults | Dan Finlay | 2017-11-21 | 1 | -31/+20 |
| | | * | | | | Add reproduction and mutex code | Dan Finlay | 2017-11-21 | 1 | -2/+37 |
| | * | | | | | Add failing test for #2577 Seed Phrase Bug | Dan Finlay | 2017-11-21 | 1 | -0/+18 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #2607 from MetaMask/i2504-OperaFix | Thomas Huang | 2017-11-28 | 1 | -1/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Ensure Opera build excludes chromereload file | Dan Finlay | 2017-11-22 | 1 | -1/+7 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0 | Thomas Huang | 2017-11-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | fix(package): update react-markdown to version 3.0.0 | greenkeeper[bot] | 2017-11-20 | 1 | -1/+1 |
| * | | | | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error | Thomas Huang | 2017-11-21 | 2 | -0/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 2 | -0/+9 |
| * | | | | | | Merge pull request #2596 from MetaMask/issue-template-support-link | Thomas Huang | 2017-11-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Point issue template at new support center | Dan Finlay | 2017-11-18 | 1 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 19 | -71/+226 |
| | | | * | | User is automatically added to new UI if they meet conditions at time of login. | Dan | 2017-12-07 | 2 | -3/+47 |
| | | | * | | Show user notifications after switch between UIs | Dan | 2017-12-05 | 8 | -3/+185 |
| | | | * | | Update newUI UI for switching back to old UI. | Dan | 2017-12-05 | 2 | -8/+24 |
| | | | * | | Lint fix | Dan | 2017-12-05 | 2 | -3/+3 |
| | | | * | | Css selected in background based on betaUI state. | Dan | 2017-12-05 | 1 | -6/+15 |
| | | | * | | New-ui actions accomodates old-ui. | Dan | 2017-12-05 | 2 | -8/+11 |
| | | | * | | Use newui actions in old-ui | Dan | 2017-12-05 | 26 | -25/+28 |
| | | | * | | Add UI selection | Dan | 2017-12-05 | 11 | -51/+136 |
| | | | * | | Add old-ui directory | Dan | 2017-12-05 | 122 | -0/+20398 |
| |_|_|/ / |/| | | | | |||||
| | | | * | Update font weights to 300, remove animation from network dropdown, fix netwo... | Alexander Tseung | 2017-12-02 | 5 | -23/+28 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #2615 from jpclark/NewUI-flat | Thomas Huang | 2017-11-29 | 10 | -28/+494 |
|\ \ \ \ | |||||
| * | | | | Remove useBlockie in props for render | Thomas Huang | 2017-11-29 | 1 | -1/+1 |
| * | | | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 3 | -2/+4 |
| * | | | | more eslint fixes | Jason Clark | 2017-11-26 | 2 | -2/+2 |
| * | | | | adding blockies lib to eslint ignore so it doesn't blow up the style checker ... | Jason Clark | 2017-11-26 | 1 | -1/+2 |
| * | | | | making eslint happy | Jason Clark | 2017-11-26 | 3 | -7/+8 |
| * | | | | fixing blockies display issues | Jason Clark | 2017-11-26 | 2 | -5/+9 |
| * | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden... | Jason Clark | 2017-11-26 | 4 | -86/+413 |
| * | | | | tweaking styling | Jason Clark | 2017-11-25 | 2 | -9/+27 |
| * | | | | incremental commit of working blockie component | Jason Clark | 2017-11-25 | 3 | -18/+57 |
| * | | | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 6 | -26/+47 |
| * | | | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 7 | -5/+58 |
* | | | | | Merge pull request #2618 from MetaMask/NewUI-flat-update-deps | Dan Finlay | 2017-11-29 | 6 | -17/+27 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Update babelify to 8.0.0 | Thomas Huang | 2017-11-28 | 1 | -1/+1 |
| * | | | | Update react, react-dom, and react-test-renderer to 15.6.2 | Thomas Huang | 2017-11-27 | 1 | -3/+3 |
| * | | | | Update ethjs-query to v0.3.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| * | | | | Update Qunit to QunitJS v2.4.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| * | | | | Update to Enzyme 3.2.0 | Thomas Huang | 2017-11-26 | 6 | -11/+21 |
|/ / / / | |||||
* | | | | Remove unneeded type casting | Dan Finlay | 2017-11-21 | 1 | -1/+1 |
* | | | | Fix bug where gas param was not a string | Dan Finlay | 2017-11-21 | 2 | -3/+3 |
* | | | | Merge pull request #2590 from MetaMask/merge-master | Chi Kei Chan | 2017-11-16 | 10 | -17/+53 |
|\ \ \ \ | |||||
| * | | | | Version Bump | Chi Kei Chan | 2017-11-16 | 2 | -1/+5 |
| * | | | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 8 | -16/+48 |
|/| | | | | |/ / / | |||||
| * | | | Merge pull request #2540 from doraemondrian/master | Thomas Huang | 2017-11-15 | 3 | -6/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 3 | -6/+6 |
| |/ / | |||||
| * | | Merge pull request #2508 from watilde/fixes-1192 | Thomas Huang | 2017-10-31 | 3 | -2/+4 |
| |\ \ | |||||
| | * | | Use const and fix lint warnings | Daijiro Wachi | 2017-10-31 | 1 | -2/+2 |
| | * | | Remove warning message when show import page | Daijiro Wachi | 2017-10-31 | 2 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
| * | | | Merge pull request #2275 from MetaMask/version-debugging | Kevin Serrano | 2017-10-27 | 4 | -12/+45 |
| |\ \ \ | |||||
| | * | | | Add option to copy directly to clipboard. | Kevin Serrano | 2017-10-27 | 1 | -3/+11 |
| | * | | | Correct changelog. | Kevin Serrano | 2017-10-27 | 1 | -1/+0 |
| | * | | | Bump Changelog | Kevin Serrano | 2017-10-27 | 1 | -0/+1 |
| | * | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 72 | -232/+12470 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #2489 from MetaMask/3.12.0 | Frankie | 2017-10-26 | 2 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | 3.12.0v3.12.0 | kumavis | 2017-10-26 | 2 | -1/+3 |
| |/ / / / | |||||
| | * | | | Changelog addition. | Kevin Serrano | 2017-10-10 | 1 | -0/+1 |
| | * | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-10 | 21 | -24/+539 |
| | |\ \ \ | |||||
| | * | | | | Make the function callback friendly. | Kevin Serrano | 2017-10-10 | 3 | -8/+15 |
| | * | | | | Simplify try catch | Kevin Serrano | 2017-10-06 | 1 | -4/+2 |
| | * | | | | Catch an error if this is not defined. | Kevin Serrano | 2017-10-06 | 1 | -1/+8 |
| | * | | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-06 | 15 | -98/+94 |
| | |\ \ \ \ | |||||
| | * | | | | | lint | Kevin Serrano | 2017-10-05 | 1 | -1/+1 |
| | * | | | | | Further adjustment to maintain API | Kevin Serrano | 2017-10-05 | 1 | -2/+2 |
| | * | | | | | Rename to maintain API | Kevin Serrano | 2017-10-05 | 2 | -2/+8 |
| | * | | | | | Configured for callback-required function.' | Kevin Serrano | 2017-10-05 | 3 | -11/+14 |
| | * | | | | | change global to window | Kevin Serrano | 2017-10-05 | 1 | -1/+1 |
| | * | | | | | Include browser version | Kevin Serrano | 2017-10-05 | 1 | -0/+2 |
| | * | | | | | Include OS version | Kevin Serrano | 2017-10-05 | 2 | -0/+6 |
* | | | | | | | Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimator | Daniel Tsui | 2017-11-16 | 2 | -5/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Gas customzier does not consider amount when sending tokens. | Dan | 2017-11-16 | 1 | -1/+1 |
| * | | | | | | | Use currency input component in input number, to improve input behaviour in g... | Dan | 2017-11-16 | 1 | -4/+7 |
|/ / / / / / / | |||||
* | | | | | | | Show tokens with zero balance | Alexander Tseung | 2017-11-15 | 1 | -4/+1 |
* | | | | | | | Create single action for updating all of send in redux state. | Dan | 2017-11-15 | 5 | -13/+38 |
* | | | | | | | Allow editing of token transactions. | Dan | 2017-11-15 | 2 | -11/+91 |
* | | | | | | | Fix lint errors. | Dan | 2017-11-15 | 4 | -18/+15 |
* | | | | | | | Allow editing of send ether. | Dan | 2017-11-15 | 5 | -23/+131 |
* | | | | | | | Improve variable name. | Dan | 2017-11-14 | 1 | -2/+2 |
* | | | | | | | Deposit button shows link to faucet on testnet networks. | Dan | 2017-11-14 | 1 | -15/+23 |
* | | | | | | | Cursor pointer and hover background on from and to dropdown items. | Dan | 2017-11-11 | 4 | -0/+15 |
* | | | | | | | Focus amount input when click anywhere in amount field container | Dan | 2017-11-11 | 2 | -0/+4 |
* | | | | | | | Rounding of vals < 0.01 in currency display consistent with master. | Dan | 2017-11-11 | 2 | -2/+3 |
* | | | | | | | Linting | Thomas Huang | 2017-11-11 | 5 | -9/+9 |
* | | | | | | | Network loading does not block network loading. | Dan | 2017-11-10 | 5 | -16/+27 |
* | | | | | | | darker backdrop style for modal | cjeria | 2017-11-10 | 1 | -1/+1 |
* | | | | | | | Merge pull request #2549 from danjm/NewUI-flat-send-amount-fixes | Daniel Tsui | 2017-11-08 | 2 | -20/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Calculate max amount for send ether based on minimum gas total. | Dan | 2017-11-08 | 2 | -10/+1 |
| * | | | | | | | Fix amount max for sending token. | Dan | 2017-11-08 | 2 | -10/+28 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2510 from danjm/NewUI-flat-token-balance | Daniel Tsui | 2017-11-08 | 17 | -82/+387 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add currency-input component to correct send amount behaviour and move curren... | Dan | 2017-11-08 | 3 | -32/+103 |
| * | | | | | | | Lint fixes. | Dan | 2017-11-07 | 5 | -15/+3 |
| * | | | | | | | Allow sending 0 eth or tokens | Dan | 2017-11-07 | 1 | -3/+3 |
| * | | | | | | | Set gas price allows for WEI precision. | Dan | 2017-11-07 | 4 | -10/+30 |
| * | | | | | | | Insufficient balance warning in gas customizer works for send token | Dan | 2017-11-07 | 1 | -3/+1 |
| * | | | | | | | Adds max amount feature for send token | Dan | 2017-11-07 | 1 | -5/+12 |
| * | | | | | | | Adds max amount feature for send-ether | Dan | 2017-11-07 | 5 | -2/+65 |
| * | | | | | | | Token balance in send state; validating sufficient tokens, validation updates... | Dan | 2017-11-07 | 11 | -33/+191 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2530 from MetaMask/uat | Chi Kei Chan | 2017-11-03 | 54 | -1019/+952 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update classnames for integration tests and add output/index.css to integrati... | Dan | 2017-11-03 | 3 | -38/+25 |
| * | | | | | | | Get current NewUI-flat tests working. | Dan | 2017-11-03 | 6 | -137/+113 |
| * | | | | | | | Merge pull request #2519 from danjm/NewUI-flat-lintfixes | Thomas Huang | 2017-11-03 | 57 | -986/+1158 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | More lint fixes | Dan | 2017-11-02 | 33 | -115/+108 |
| | * | | | | | | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 35 | -726/+703 |
| * | | | | | | | | 4.0.3 | kumavis | 2017-10-26 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'NewUI-flat' into uat | Chi Kei Chan | 2017-10-26 | 117 | -953/+5652 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 4.0.2 | kumavis | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'NewUI-flat' into uat | Chi Kei Chan | 2017-10-21 | 11 | -62/+74 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 4.0.1 | kumavis | 2017-10-21 | 1 | -1/+1 |
* | | | | | | | | | | | Fixes width of from and to dropdowns in extension and on mobile views. | Dan | 2017-11-03 | 2 | -2/+3 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Add utility for getting token data; get token data in tx-list even if token h... | Dan | 2017-10-28 | 4 | -29/+89 |
* | | | | | | | | | | Provide default new account name | Alexander Tseung | 2017-10-27 | 1 | -63/+78 |
* | | | | | | | | | | Fix Settings/Info screen being visible on logout (#2490) | Alexander Tseung | 2017-10-27 | 2 | -6/+43 |
* | | | | | | | | | | Correct rendering of conversions when conversion rate is a token. (#2498) | Dan J Miller | 2017-10-27 | 3 | -20/+52 |
* | | | | | | | | | | Clear import error state on logout. | Dan | 2017-10-27 | 2 | -0/+5 |
* | | | | | | | | | | eth_sign warning color | Dan | 2017-10-27 | 2 | -3/+18 |
* | | | | | | | | | | Change min gas price to 0.1 GWEI | Dan | 2017-10-27 | 7 | -31/+68 |
* | | | | | | | | | | Fix input border rendering on mobile | Alexander Tseung | 2017-10-27 | 1 | -0/+1 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Add Token styling fix | Chi Kei Chan | 2017-10-26 | 2 | -5/+29 |
* | | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-26 | 4 | -10/+20 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #2100 from ChainsawBaby/patch-1 | Kevin Serrano | 2017-10-26 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bump Changelog | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| | * | | | | | | | | Resolving that ugly merge. | Kevin Serrano | 2017-10-26 | 1 | -3/+7 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #2476 from MetaMask/100MweiMinGasPrice | Dan Finlay | 2017-10-26 | 3 | -12/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add labels to clarify warning. | Kevin Serrano | 2017-10-26 | 1 | -4/+4 |
| | * | | | | | | | | Account for non-submitted mins and max | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| | * | | | | | | | | Add clarifying comment about wei conversion. | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| | * | | | | | | | | Cut out intermediary wei steps. | Kevin Serrano | 2017-10-26 | 1 | -4/+2 |
| | * | | | | | | | | Remove unneeded toString conversions. | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| | * | | | | | | | | Move upsize conversions for input warning at front of fn. | Kevin Serrano | 2017-10-26 | 1 | -3/+5 |
| | * | | | | | | | | Fix mismatched decimal/hex conversion in pending-tx | Kevin Serrano | 2017-10-26 | 1 | -1/+1 |
| | * | | | | | | | | Remove css build bundle from uat | Dan Finlay | 2017-10-26 | 1 | -4491/+0 |
| | * | | | | | | | | Update changelog | Dan Finlay | 2017-10-26 | 1 | -1/+1 |
| | * | | | | | | | | Resolve merge conflict. | Kevin Serrano | 2017-10-25 | 3 | -1/+4493 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Reduce minimum gas price to 100 MWEI | Dan Finlay | 2017-10-25 | 3 | -7/+4499 |
| | * | | | | | | | | | Fix for gas price to be lowered. | Kevin Serrano | 2017-10-25 | 2 | -11/+13 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #2478 from MetaMask/mascaraHeadersFix | Frankie | 2017-10-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix X-Frame-Options for mascara | tmashuang | 2017-10-25 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Allow editing account name in account details modal | Alexander Tseung | 2017-10-26 | 7 | -64/+149 |
* | | | | | | | | | | Sign Typed Request styling fixes | Chi Kei Chan | 2017-10-26 | 3 | -10/+18 |
* | | | | | | | | | | Signature request fixes. | Dan | 2017-10-26 | 4 | -26/+30 |
* | | | | | | | | | | Fix Import an Account link not working in Create Account modal | Alexander Tseung | 2017-10-26 | 1 | -6/+10 |
* | | | | | | | | | | Signature Request | Dan | 2017-10-26 | 7 | -60/+613 |
* | | | | | | | | | | Fix send token bug. | Dan | 2017-10-26 | 1 | -1/+2 |
* | | | | | | | | | | Adds revert feature to customize gas modal. | Dan | 2017-10-26 | 2 | -15/+16 |
* | | | | | | | | | | Add Info section | Alexander Tseung | 2017-10-26 | 5 | -6/+173 |
* | | | | | | | | | | Add GWEI to gas price unit | Chi Kei Chan | 2017-10-25 | 2 | -2/+1 |
* | | | | | | | | | | From and To field cannot be the same | Chi Kei Chan | 2017-10-25 | 1 | -2/+8 |
* | | | | | | | | | | Fix gas input styling on mobile view | Chi Kei Chan | 2017-10-25 | 4 | -14/+34 |
* | | | | | | | | | | Update Import Account Help Link | Chi Kei Chan | 2017-10-25 | 1 | -1/+1 |
* | | | | | | | | | | Show home page when metafox is clicked | Chi Kei Chan | 2017-10-25 | 2 | -4/+12 |
* | | | | | | | | | | Fix alignment on right arrow of confirm tx screens | Chi Kei Chan | 2017-10-25 | 5 | -4/+12 |
* | | | | | | | | | | Fix styling on notification view | Chi Kei Chan | 2017-10-25 | 3 | -3/+12 |
* | | | | | | | | | | Add ellipsis to super long account name | Chi Kei Chan | 2017-10-25 | 1 | -1/+9 |
* | | | | | | | | | | Change download to show in Export Private Key Modal | Chi Kei Chan | 2017-10-25 | 1 | -2/+2 |
* | | | | | | | | | | Remove memo input | Chi Kei Chan | 2017-10-25 | 2 | -7/+18 |
* | | | | | | | | | | Add BuyEtherWidget for future use in buy ether modal | Chi Kei Chan | 2017-10-25 | 1 | -0/+197 |
* | | | | | | | | | | Styling and UX changes on sidebar | Chi Kei Chan | 2017-10-25 | 2 | -11/+14 |
* | | | | | | | | | | Add token list and buy modal alignment fix | Chi Kei Chan | 2017-10-25 | 3 | -15/+36 |
* | | | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 21 | -48/+60 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 22 | -49/+55 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 20 | -49/+47 |
| | * | | | | | | | | Add lint:fix command to gulp and npm-scripts | Daijiro Wachi | 2017-10-22 | 2 | -0/+8 |
* | | | | | | | | | | Hide sidebar on add token | Chi Kei Chan | 2017-10-25 | 2 | -2/+5 |
* | | | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 41 | -163/+2966 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1990 from chikeichan/firsttimeflow | Thomas Huang | 2017-10-25 | 36 | -64/+12257 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Add error messages when importing an account | tmashuang | 2017-10-24 | 2 | -17/+24 |
| | * | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 35 | -63/+12249 |
| |/| | | | | | | | | |||||
| | * | | | | | | | | Add Import With Seed Phrase | Chi Kei Chan | 2017-10-21 | 6 | -19/+156 |
| | * | | | | | | | | Add mobile responsiveness | Chi Kei Chan | 2017-10-21 | 2 | -177/+192 |
| | * | | | | | | | | Remove import option | Chi Kei Chan | 2017-10-21 | 1 | -1/+3 |
| | * | | | | | | | | Fix import | Chi Kei Chan | 2017-10-21 | 1 | -21/+31 |
| | * | | | | | | | | Fix capitialization | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | * | | | | | | | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 4 | -15/+61 |
| | * | | | | | | | | Fixing integraiton test | Chi Kei Chan | 2017-10-21 | 2 | -3/+130 |
| | * | | | | | | | | Fix unit test | Chi Kei Chan | 2017-10-21 | 2 | -2/+3 |
| | * | | | | | | | | Fix linter | Chi Kei Chan | 2017-10-21 | 10 | -123/+245 |
| | * | | | | | | | | ShapeShift Integration | Chi Kei Chan | 2017-10-21 | 6 | -90/+287 |
| | * | | | | | | | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 6 | -80/+353 |
| | * | | | | | | | | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 8 | -29/+9558 |
| | * | | | | | | | | Add missing presets | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | Move "Skip this step" to side panel | Jacky Chan | 2017-10-21 | 2 | -12/+17 |
| | * | | | | | | | | Disable CTA unless notice is scrolled to bottom | Jacky Chan | 2017-10-21 | 2 | -4/+29 |
| | * | | | | | | | | Fix Buy Ether flow | Jacky Chan | 2017-10-21 | 2 | -2/+5 |
| | * | | | | | | | | Shuffle tokens | Jacky Chan | 2017-10-21 | 4 | -25/+44 |
| | * | | | | | | | | Add Go to Coinbase; Show Buy Ether after signup | Jacky Chan | 2017-10-21 | 10 | -74/+125 |