| Commit message (Expand) | Author | Age | Files | Lines |
* | Change styling for network dropdown | Alexander Tseung | 2018-01-12 | 2 | -58/+25 |
* | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 16 | -125/+83 |
* | Update main view styling | Alexander Tseung | 2018-01-11 | 13 | -85/+198 |
* | 4.0.9 | kumavis | 2018-01-09 | 1 | -1/+1 |
* | ui - fix font path name | kumavis | 2018-01-09 | 1 | -2/+2 |
* | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 12 | -1313/+2204 |
|\ |
|
| * | Merge pull request #2845 from alextsg/NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 10 | -14/+115 |
| |\ |
|
| | * | Fix merge conflict | Alexander Tseung | 2018-01-04 | 1 | -1/+0 |
| | * | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 338 | -3279/+38277 |
| | |\
| | |/
| |/| |
|
| * | | Fix sign typed data | Alexander Tseung | 2017-12-30 | 2 | -1298/+2088 |
| * | | Fix mascara first time flow button colors | Alexander Tseung | 2017-12-30 | 1 | -3/+3 |
| | * | Merge pull request #2783 from MetaMask/tx-param-vaalidation | kumavis | 2018-01-03 | 2 | -2/+10 |
| | |\ |
|
| | | * | tx-gas-utils - tx-param-validation - use more intuitive check | kumavis | 2018-01-03 | 1 | -2/+2 |
| | | * | Merge branch 'master' into tx-param-vaalidation | Frankie | 2017-12-22 | 5 | -18/+122 |
| | | |\ |
|
| | | * | | Spelling | Dan Finlay | 2017-12-22 | 1 | -1/+1 |
| | | * | | add to CHANGELOG.md | frankiebee | 2017-12-21 | 1 | -0/+2 |
| | | * | | transactions - throw error if dapp provides txParams whos value has a decimal | frankiebee | 2017-12-21 | 1 | -2/+9 |
| | * | | | Merge pull request #2840 from oosthuizenr/master | kumavis | 2018-01-03 | 1 | -5/+6 |
| | |\ \ \ |
|
| | | * | | | fix comment | oosthuizenr | 2018-01-03 | 1 | -1/+1 |
| | | * | | | Fixes #2834 | Renier Oosthuizen | 2018-01-03 | 1 | -5/+6 |
| | |/ / / |
|
| | * | | | Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0 | kumavis | 2018-01-03 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | chore(package): update vinyl-source-stream to version 2.0.0 | greenkeeper[bot] | 2017-12-23 | 1 | -1/+1 |
| | * | | | | Merge pull request #2817 from MetaMask/i#2810 | Frankie | 2017-12-29 | 2 | -3/+63 |
| | |\ \ \ \ |
|
| | | * | | | | tests - be more verbose in test messages | frankiebee | 2017-12-29 | 1 | -2/+2 |
| | | * | | | | add tests for #_checkIfNonceIsTaken | frankiebee | 2017-12-28 | 1 | -2/+61 |
| | | * | | | | transactions:pending - only check nonces of transactions who's from adress ma... | frankiebee | 2017-12-28 | 1 | -1/+2 |
| | | |/ / / |
|
| | * | | | | Merge pull request #2818 from MetaMask/i2782-ethroundingerror | Dan Finlay | 2017-12-29 | 6 | -3/+35 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | Bump Changelog | Kevin Serrano | 2017-12-28 | 1 | -0/+1 |
| | | * | | | Add frontend validation to ensure that ether inputs are valid. | Kevin Serrano | 2017-12-28 | 1 | -2/+12 |
| | | * | | | Add frontend validation to check if send ether input is a valid number. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
| | | * | | | Add additional test to ui utils to account for exact wei values. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
| | | * | | | Add backend fix for util in normalizeethstringtowei. | Kevin Serrano | 2017-12-28 | 1 | -0/+3 |
| | | * | | | Fix some silly linting issues. | Kevin Serrano | 2017-12-28 | 2 | -2/+2 |
| | | * | | | Add test for edge case. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
| | |/ / / |
|
* | | | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 193 | -659/+21414 |
|\| | | | |
|
| * | | | | Merge pull request #2798 from alextsg/NewUI-flat-4.0.5 | Alexander Tseung | 2017-12-23 | 3 | -8/+1 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | |\ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Update manifest.json version from 4.0.4 to 4.0.5 (#2797) | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | * | | | | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 337 | -2146/+36353 |
| | |\ \ \ \
| | |/ / / /
| |/| / / /
| | |/ / / |
|
| * | | | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 9 | -17/+125 |
| * | | | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) | Dan J Miller | 2017-12-22 | 6 | -8/+12 |
| * | | | | Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 20 | -79/+1114 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 0 | -0/+0 |
| | |\ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 8 | -74/+98 |
| | |\ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Clone transaction while editing instead of mutating object from state. | Dan | 2017-12-21 | 1 | -6/+7 |
| * | | | | | Add constanst for token transfer function signature. | Dan | 2017-12-21 | 2 | -1/+5 |
| * | | | | | Lint fixes. | Dan | 2017-12-21 | 4 | -6/+2 |
| * | | | | | Adds updateTransaction to background and used it to update after editing in s... | Dan | 2017-12-21 | 8 | -101/+85 |
| * | | | | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 5 | -2/+41 |
| | * | | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 20 | -79/+1114 |
| |/| | | |
| | | |_|/
| | |/| | |
|
| * | | | | [NewUI] Hide UI toggle in mascara (#2772) | Dan J Miller | 2017-12-21 | 4 | -19/+23 |
| * | | | | Hide fiat values on account details screen when eth/token value is 0. | Dan | 2017-12-21 | 3 | -3/+8 |
| * | | | | Hides the sidebar after the an account menu actions changes the screen behind... | Dan | 2017-12-21 | 1 | -0/+6 |
| * | | | | 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 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 #2793 from MetaMask/i2681-DoNotFailPending | Kevin Serrano | 2017-12-22 | 3 | -8/+1 |
| | | |/| | |
|
| | | | * | | Remove retryTimePeriod from tx controller | Dan Finlay | 2017-12-22 | 1 | -1/+0 |
| | | | * | | Bump changelog | Dan Finlay | 2017-12-22 | 1 | -0/+1 |
| | | | * | | Stop failing pending transactions after any period of time | Dan Finlay | 2017-12-22 | 1 | -7/+0 |
| | | |/ / |
|
| | | * | | Merge pull request #2763 from MetaMask/AddRecentBlocksController | Thomas Huang | 2017-12-21 | 2 | -14/+69 |
| | | |\ \ |
|
| | | | * | | Do not log whole txs in recent block controller. | Dan Finlay | 2017-12-20 | 1 | -1/+8 |
| | | | * | | Add Recent Blocks controller | Dan Finlay | 2017-12-18 | 2 | -14/+62 |
| | | * | | | Merge pull request #2771 from MetaMask/i2173-UpdateTokenValues | Thomas Huang | 2017-12-20 | 3 | -4/+54 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | | * | | Bump changelog | Dan Finlay | 2017-12-19 | 1 | -0/+2 |
| | | | * | | Allow updating token details | Dan Finlay | 2017-12-19 | 1 | -4/+4 |
| | | | * | | Add failing test for updating token details | Dan Finlay | 2017-12-19 | 1 | -0/+48 |
| | | |/ / |
|
| | | * | | Merge pull request #2751 from MetaMask/i#2720 | Thomas Huang | 2017-12-19 | 1 | -1/+5 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Merge branch 'master' into i#2720 | frankiebee | 2017-12-16 | 2 | -2/+2 |
| | | | |\ |
|
| | | | * | | transactions:gas-utils - handle new type of estimateGas error | frankiebee | 2017-12-15 | 1 | -1/+5 |
| | | * | | | Merge pull request #2757 from MetaMask/kumavis-patch-2 | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | | * | | readme - fix "plugin" to "extension" | kumavis | 2017-12-16 | 1 | -1/+1 |
| | | |/ / |
|
| | | * | | Merge pull request #2755 from MetaMask/tests | Frankie | 2017-12-16 | 2 | -2/+2 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Change console.log for opts in _configureInfuraProvider | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | | | * | Add exit flag to mocha to exit after tests run | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | | |/ |
|
| | | * | Merge pull request #2747 from MetaMask/Version-3.13.3 | Thomas Huang | 2017-12-15 | 2 | -1/+4 |
| | | |\ |
|
| | | | * | Version 3.13.3v3.13.3 | Dan Finlay | 2017-12-15 | 2 | -1/+4 |
| | | * | | Merge pull request #2706 from danjm/MM-fix-buy-cancel-button | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | Fixes the cancel button in the buy screen to take the user home. | Dan | 2017-12-09 | 1 | -1/+1 |
| | | * | | | Merge pull request #2662 from williamchong007/master | Thomas Huang | 2017-12-15 | 1 | -2/+10 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | | * | | fix #1398, prevent injecting xml without xml suffix | William Chong | 2017-12-05 | 1 | -2/+10 |
| | | * | | | Merge pull request #2733 from MetaMask/i2380-ShowNoBalance | Thomas Huang | 2017-12-15 | 2 | -4/+3 |
| | | |\ \ \ |
|
| | | | * | | | Bump changelog | Dan Finlay | 2017-12-13 | 1 | -0/+2 |
| | | | * | | | Show watched tokens with no balance | Dan Finlay | 2017-12-13 | 1 | -4/+1 |
| | | * | | | | Merge pull request #2744 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
| | | |\ \ \ \ |
|
| | | | * | | | | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 2 | -8/+51 |
| | | | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc... | kumavis | 2017-12-14 | 3 | -53/+8 |
| | | | |\ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker | Thomas Huang | 2017-12-14 | 2 | -52/+8 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 2 | -52/+8 |
| | | |/ / / / / |
|
| | | * | | | | | Merge pull request #2741 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
| | | |\ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge pull request #2740 from MetaMask/i#2729infura-chill-out | kumavis | 2017-12-14 | 1 | -2/+0 |
| | | |\ \ \ \ \ \
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| | | | * | | | | | dont aggresively query account data | frankiebee | 2017-12-14 | 1 | -2/+0 |
| | | |/ / / / / |
|
| | | | | * / / | deps - bump eth-json-rpc-infura | kumavis | 2017-12-14 | 1 | -1/+1 |
| | | | |/ / / |
|
| | | | * / / | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 2 | -8/+52 |
| | | |/ / / |
|
| | | * | | | Merge pull request #2718 from MetaMask/ReducePollingInterval | kumavis | 2017-12-10 | 4 | -3/+11 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | | * | | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 3 | -2/+4 |
| | | | * | | Bump changelog | Dan Finlay | 2017-12-10 | 1 | -0/+2 |
| | | | * | | Pass polling interval to zero client provider | Dan Finlay | 2017-12-10 | 1 | -1/+5 |
| | | |/ / |
|
| | | * | | Merge pull request #2699 from MetaMask/patch-2v3.13.1 | kumavis | 2017-12-08 | 4 | -9/+21 |
| | | |\ \ |
|
| | | | * | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 2 | -7/+9 |
| | | | * | | Version 3.13.1 | Dan Finlay | 2017-12-08 | 2 | -1/+3 |
| | | | * | | Bump changelog | Dan Finlay | 2017-12-08 | 1 | -0/+2 |
| | | | * | | Do not allow nonces larger than the next valid nonce | Dan Finlay | 2017-12-08 | 1 | -0/+4 |
| | | | * | | Merge branch 'master' into patch-2 | Dan Finlay | 2017-12-08 | 10 | -37/+885 |
| | | | |\ \ |
|
| | | | * | | | A more expressive way | vicnaum | 2017-12-07 | 1 | -5/+2 |
| | | | * | | | Fix for #2644 - Specified Nonce isn't used | vicnaum | 2017-12-07 | 1 | -1/+6 |
| | | |/ / /
| | |/| | | |
|
| | | * | | | Merge pull request #2654 from abitrolly/patch-2 | Kevin Serrano | 2017-12-07 | 1 | -1/+1 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Download State Logs with .json extension | Anatoli Babenia | 2017-12-05 | 1 | -1/+1 |
| | | | |/ |
|
| | | * | | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0 | Kevin Serrano | 2017-12-07 | 1 | -1/+3 |
| | | |\ \ |
|
| | | | * | | Add 10% price bump to retry attempts. | Dan Finlay | 2017-12-07 | 1 | -1/+3 |
| | | |/ / |
|
| | | * | | Merge pull request #2684 from MetaMask/RetryTransaction | Dan Finlay | 2017-12-07 | 10 | -37/+883 |
| | |/| | |
|
| | | * | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 2 | -1/+11 |
| | | |\ \ |
|
| | | | * | | Show retry button on submitted transactions greater than 30 seconds, add hove... | Alexander Tseung | 2017-12-07 | 2 | -1/+11 |
| | | * | | | Version 3.13.0 | Dan Finlay | 2017-12-07 | 2 | -1/+3 |
| | | |/ / |
|
| | | * | | Bump changelog | Dan Finlay | 2017-12-07 | 1 | -0/+2 |
| | | * | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 1 | -4/+4 |
| | | |\ \ |
|
| | | | * | | Fix styling of Retry buton | Alexander Tseung | 2017-12-07 | 1 | -4/+4 |
| | | * | | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 2 | -2/+13 |
| | | |/ / |
|
| | | * | | Fix retry action | Dan Finlay | 2017-12-07 | 2 | -3/+11 |
| | | * | | View tx after editing state to unconfirmed | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | | * | | Fix action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | | * | | Add development state | Dan Finlay | 2017-12-07 | 1 | -0/+739 |
| | | * | | Connect to redux for retryTransaction | Alexander Tseung | 2017-12-07 | 1 | -2/+10 |
| | | * | | Add button to retry transaction | Alexander Tseung | 2017-12-07 | 1 | -34/+69 |
| | | * | | Add retry background method and action | Dan Finlay | 2017-12-07 | 5 | -1/+24 |
| | |/ / |
|
| | * | | 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 pull request #2591 from MetaMask/NewUI-flat | Chi Kei Chan | 2017-11-16 | 40 | -180/+780 |
|\| | | | |
|
| * | | | | 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 |