Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into balance-refactor | Kevin Serrano | 2016-07-12 | 3 | -3/+12 |
|\ | |||||
| * | Merge pull request #426 from MetaMask/Version26 | Dan Finlay | 2016-07-12 | 2 | -1/+3 |
| |\ | | | | | | | Version 2.6 | ||||
| | * | Version 2.6 | Dan Finlay | 2016-07-12 | 2 | -1/+3 |
| |/ | |||||
| * | Merge pull request #424 from MetaMask/UpdateScript | Dan Finlay | 2016-07-12 | 1 | -2/+9 |
| |\ | | | | | | | Updated script for what I recorded | ||||
| | * | Updated script for what I recorded. | Dan Finlay | 2016-07-12 | 1 | -2/+9 |
| |/ | |||||
* | | Update changelog. | Kevin Serrano | 2016-07-12 | 1 | -0/+2 |
| | | |||||
* | | Integrate changes back into eth-balance | Kevin Serrano | 2016-07-12 | 5 | -111/+54 |
| | | |||||
* | | Move shorten balance to util. Add as property of generateBalance object output. | Kevin Serrano | 2016-07-12 | 3 | -23/+28 |
| | | |||||
* | | Remove unused functions. Readd if necessary. | Kevin Serrano | 2016-07-12 | 2 | -37/+4 |
| | | |||||
* | | Refactor util tests. | Kevin Serrano | 2016-07-12 | 1 | -11/+8 |
|/ | |||||
* | Merge pull request #418 from MetaMask/ui-fixth-width-tx-history | kumavis | 2016-07-09 | 5 | -7/+100 |
|\ | | | | | Fixed width applied on transaction history components | ||||
| * | lint | Kevin Serrano | 2016-07-09 | 1 | -5/+5 |
| | | |||||
| * | Implement alternate shortening scheme. | Kevin Serrano | 2016-07-09 | 3 | -7/+26 |
| | | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 2 | -18/+51 |
| |\ | |/ |/| | | | ui-fixth-width-tx-history | ||||
* | | Merge pull request #419 from MetaMask/ConfirmationStyle | kumavis | 2016-07-08 | 2 | -18/+51 |
|\ \ | | | | | | | Tx Confirmation - fixes | ||||
| * | | eth-balance fix | kumavis | 2016-07-08 | 1 | -1/+10 |
| | | | |||||
| * | | lint - dingle dangle comma tangle | kumavis | 2016-07-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 1 | -10/+1 |
| |\ \ | |/ / |/| | | | | | ConfirmationStyle | ||||
| * | | notif - add support for forward carrat | kumavis | 2016-07-08 | 1 | -13/+41 |
| | | | |||||
| * | | ui - remove doubled eth-balance | kumavis | 2016-07-08 | 2 | -5/+1 |
| | | | |||||
| | * | Resolve merge conflict. | Kevin Serrano | 2016-07-08 | 21 | -72/+593 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #417 from MetaMask/FixEthBalanceStyle | Dan Finlay | 2016-07-08 | 1 | -10/+1 |
|\ \ \ | |/ / |/| | | Fixed eth_balance style, completing partial merge | ||||
| * | | Fixed eth_balance style, completing partial merge | Dan Finlay | 2016-07-08 | 1 | -10/+1 |
|/ / | |||||
* | | Merge pull request #406 from MetaMask/ConfirmationStyle | Dan Finlay | 2016-07-08 | 21 | -73/+603 |
|\ \ | | | | | | | Update transaction confirmation style | ||||
| * \ | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 5 | -3/+116 |
| |\ \ | |/ / |/| | | | | | ConfirmationStyle | ||||
| * | | lint fix | kumavis | 2016-07-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 2 | -21/+48 |
| |\ \ | | | | | | | | | | | | | ConfirmationStyle | ||||
| * | | | Restore button naming consistency | Dan Finlay | 2016-07-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add nickname rendering for recipient address | Dan Finlay | 2016-07-08 | 3 | -5/+63 |
| | | | | |||||
| * | | | Linted | Dan Finlay | 2016-07-08 | 2 | -2/+2 |
| | | | | |||||
| * | | | Refined tx confirmation button styles | Dan Finlay | 2016-07-08 | 1 | -7/+19 |
| | | | | |||||
| * | | | Implement tx confirmation style refinements | Dan Finlay | 2016-07-08 | 4 | -24/+38 |
| | | | | |||||
| * | | | Add configurable params to eth-balance | Dan Finlay | 2016-07-08 | 1 | -10/+17 |
| | | | | |||||
| * | | | Make mini account panel labels fully configurable | Dan Finlay | 2016-07-08 | 2 | -28/+42 |
| | | | | |||||
| * | | | Remove formatBalance.formatted references | Dan Finlay | 2016-07-08 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-08 | 4 | -52/+52 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ConfirmationStyle' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-07-07 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | ConfirmationStyle | ||||
| | * | | | | Correct data length calculation | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Correct data length calculation | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Update gas cost | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix sender balance rendering in pending tx details | Dan Finlay | 2016-07-07 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Simplify ui dev mode style | Dan Finlay | 2016-07-07 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Bump changelog | Dan Finlay | 2016-07-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-07 | 5 | -9/+12 |
| |\ \ \ \ | |||||
| * | | | | | Linted | Dan Finlay | 2016-07-07 | 2 | -29/+6 |
| | | | | | | |||||
| * | | | | | Fixed up pending-tx-details | Dan Finlay | 2016-07-07 | 5 | -25/+29 |
| | | | | | | |||||
| * | | | | | Fleshed out pending tx view | Dan Finlay | 2016-07-07 | 6 | -32/+87 |
| | | | | | | |||||
| * | | | | | Merged latest balance formatting code | Dan Finlay | 2016-07-07 | 6 | -46/+48 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-07 | 10 | -41/+55 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Began reworking tx conf view | Dan Finlay | 2016-07-07 | 14 | -19/+394 |
| | | | | | | | | |||||
| * | | | | | | | Simplify empty account balance rendering | Dan Finlay | 2016-07-06 | 2 | -2/+2 |
| | | | | | | | | |||||
| | | | | | | * | Pass the linters. | Kevin Serrano | 2016-07-08 | 1 | -5/+5 |
| | | | | | | | | |||||
| | | | | | | * | Remove reducer console log. | Kevin Serrano | 2016-07-08 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | | | | | * | Modify changelog. | Kevin Serrano | 2016-07-08 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | | | | | * | Add new component for tx-history to avoid messing with other styles. Add ↵ | Kevin Serrano | 2016-07-08 | 3 | -2/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed width specifically to this style. | ||||
| | | | | | | * | Modified test views again. Added fixed length to center tx information. | Kevin Serrano | 2016-07-08 | 4 | -4/+8 |
| | | | | | | | | |||||
| | | | | | | * | Merge branch 'master' into ui-fixth-width-tx-history | Kevin Serrano | 2016-07-08 | 0 | -0/+0 |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #413 from MetaMask/ui-fix | Dan Finlay | 2016-07-08 | 5 | -3/+116 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Add new test state with tx history. Fix alignment issue with transact… | ||||
| | | | | | | * | Modify development states to account for long domains. | Kevin Serrano | 2016-07-08 | 2 | -3/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Remove logging for states. | Kevin Serrano | 2016-07-08 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Add new test state with tx history. Fix alignment issue with transaction ↵ | Kevin Serrano | 2016-07-08 | 5 | -3/+117 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | history text. | ||||
* | | | | | | Merge pull request #412 from MetaMask/ethBalance | Dan Finlay | 2016-07-08 | 2 | -17/+34 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add method to deal with small decimals | ||||
| * | | | | | Change function name to generateBalanceObject | Frankie | 2016-07-08 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | Add method to deal with small decimals and create the object for eth-balance ↵ | Frankie | 2016-07-08 | 2 | -17/+34 |
|/ / / / / | | | | | | | | | | | | | | | | component | ||||
* | | | | | Merge pull request #410 from MetaMask/cleanupEthbug | Dan Finlay | 2016-07-08 | 3 | -45/+45 |
|\ \ \ \ \ | | | | | | | | | | | | | Revert back to original formatBalance | ||||
| * | | | | | Revert back to original formatBalance | Frankie | 2016-07-08 | 3 | -45/+45 |
|/ / / / / | |||||
* | | | | | Merge pull request #408 from MetaMask/FixNoDeclineCallback | kumavis | 2016-07-08 | 1 | -8/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix bug where rejected tx would not call back | ||||
| * | | | | Fix bug where rejected tx would not call back | Dan Finlay | 2016-07-08 | 1 | -8/+7 |
|/ / / / | |||||
* | | | | Merge pull request #404 from MetaMask/fastinject | kumavis | 2016-07-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | contentscript - remove timeout before stream setup | ||||
| * | | | | contentscript - remove timeout before stream setup | kumavis | 2016-07-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #403 from MetaMask/fastinject | kumavis | 2016-07-07 | 3 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | Improve web3 injection times | ||||
| * \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject | kumavis | 2016-07-07 | 2 | -3/+4 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #402 from MetaMask/z-position-fix | Dan Finlay | 2016-07-07 | 2 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix dropdown z-index issue. | ||||
| * | | | | | Fix dropdown z-index issue. | Kevin Serrano | 2016-07-07 | 2 | -3/+4 |
|/ / / / / | |||||
| * | | | | appease the linting gods | kumavis | 2016-07-07 | 2 | -4/+1 |
| | | | | | |||||
| * | | | | changelog - add web3 min dist | kumavis | 2016-07-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject | kumavis | 2016-07-07 | 6 | -46/+49 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #401 from MetaMask/ethBalance | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Handle to small of balances with "<0.00001" | ||||
| * | | | | Handle to small of balances with "<0.00001" | Frankie | 2016-07-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #399 from MetaMask/ethBalance | Dan Finlay | 2016-07-07 | 6 | -46/+49 |
|\ \ \ \ | |_|_|/ |/| | | | Eth balance | ||||
| * | | | Add a postion option for tool tip | Frankie | 2016-07-07 | 3 | -1/+4 |
| | | | | |||||
| * | | | Add decimal hendeling to ETH balance | Frankie | 2016-07-07 | 4 | -45/+45 |
|/ / / | |||||
| * / | web3 injection - use web3 dist for faster injection | kumavis | 2016-07-07 | 2 | -5/+9 |
|/ / | |||||
* | | Merge pull request #392 from MetaMask/kumavis-patch-1 | Kevin Serrano | 2016-07-07 | 1 | -2/+2 |
|\ \ | | | | | | | readme - camel case MetaMask | ||||
| * | | readme - camel case MetaMask | kumavis | 2016-07-07 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #387 from MetaMask/ui-formatting | Dan Finlay | 2016-07-07 | 2 | -23/+26 |
|\ \ | | | | | | | Ui formatting for account details | ||||
| * | | Add to changelog. | Kevin Serrano | 2016-07-06 | 1 | -0/+1 |
| | | | |||||
| * | | Move account balance down a row. Adjusted positioning of buttons. | Kevin Serrano | 2016-07-06 | 1 | -23/+25 |
| | | | |||||
* | | | Merge pull request #388 from MetaMask/script-edits | Dan Finlay | 2016-07-06 | 1 | -9/+9 |
|\ \ \ | | | | | | | | | Edits to the video script | ||||
| * | | | Edits to the script ya know. | Kevin Serrano | 2016-07-06 | 1 | -9/+9 |
| | | | | |||||
* | | | | Merge pull request #389 from MetaMask/thinFont | Dan Finlay | 2016-07-06 | 6 | -5/+14 |
|\ \ \ \ | |/ / / |/| | | | Thin font | ||||
| * | | | Merge branch 'master' into thinFont | Frankie | 2016-07-06 | 3 | -3/+32 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #385 from MetaMask/ImprovedLogging | Dan Finlay | 2016-07-06 | 1 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Improve metamask-controller error logging | ||||
| * | | | Simplify error log | Dan Finlay | 2016-07-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | Improve metamask-controller error logging | Dan Finlay | 2016-07-06 | 1 | -2/+5 |
| | |/ | |/| | | | | | | | Fixes #384 | ||||
* | | | Add video script draft | Dan Finlay | 2016-07-06 | 1 | -0/+27 |
| | | | |||||
* | | | Add state list rebuilding on ui task | Dan Finlay | 2016-07-06 | 1 | -1/+1 |
|/ / | |||||
| * | Add light and ultraLight fonts | Frankie | 2016-07-06 | 6 | -5/+14 |
|/ | |||||
* | Version 2.5.0 | Dan Finlay | 2016-07-02 | 2 | -1/+3 |
| | |||||
* | Merge pull request #383 from MetaMask/i377 | Dan Finlay | 2016-07-02 | 2 | -0/+5 |
|\ | | | | | Put network status checkmarks at end of row | ||||
| * | Put network status checkmarks at end of row | Dan Finlay | 2016-07-02 | 2 | -0/+5 |
|/ | |||||
* | Merge pull request #381 from MetaMask/ImproveUiDevMode | Dan Finlay | 2016-07-02 | 7 | -8/+46 |
|\ | | | | | Improved Ui Dev Mode | ||||
| * | Improved Ui Dev Mode | Dan Finlay | 2016-07-02 | 7 | -8/+46 |
|/ | | | | | | Dev mode now reloads on file changes (although it seems to sometimes reload too soon, not getting the update... we can tune the timeout interval in development/index.html) Dev mode now reloads on all non-`node_modules` file changes, so the `ui` and `app` folders are both being watched for live reloading. | ||||
* | Merge pull request #380 from MetaMask/FrankieDisclaimer | Dan Finlay | 2016-07-02 | 12 | -114/+119 |
|\ | | | | | Frankie disclaimer | ||||
| * | Linted | Dan Finlay | 2016-07-02 | 1 | -1/+0 |
| | | |||||
| * | Move main drop-down state to component state | Dan Finlay | 2016-07-02 | 3 | -35/+9 |
| | | |||||
| * | Formatted dev mode better | Dan Finlay | 2016-07-01 | 6 | -7/+23 |
| | | |||||
| * | Added some basic styles | Dan Finlay | 2016-07-01 | 1 | -1/+14 |
| | | |||||
| * | Simplify ui task command | Dan Finlay | 2016-07-01 | 1 | -1/+1 |
| | | |||||
| * | Clean up beefy usage | Dan Finlay | 2016-07-01 | 2 | -15/+3 |
| | | | | | | | | Now properly uses brfs transform so it can reload on state object changes. | ||||
| * | Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-01 | 2 | -25/+2 |
| |\ | | | | | | | | | | FrankieDisclaimer | ||||
| | * | Add query param restoring to mocker | Dan Finlay | 2016-07-01 | 1 | -2/+2 |
| | | | |||||
| | * | Remove debugs from development | Dan Finlay | 2016-07-01 | 1 | -23/+0 |
| | | | |||||
| * | | disclaimer - render via react-markdown | kumavis | 2016-07-01 | 2 | -2/+11 |
| |/ | |||||
| * | Remove scroll fixing from ui preview | Dan Finlay | 2016-07-01 | 1 | -20/+2 |
| | | |||||
| * | Remove old disclaimer | Dan Finlay | 2016-07-01 | 1 | -8/+0 |
| | | |||||
| * | Merge branch 'master' into FrankieDisclaimer | Dan Finlay | 2016-07-01 | 35 | -104/+969 |
| |\ | |/ |/| | |||||
* | | Merge pull request #378 from MetaMask/UiDev | kumavis | 2016-07-01 | 24 | -4/+811 |
|\ \ | | | | | | | Ui dev | ||||
| * | | Add ui mocking mode explanation | Dan Finlay | 2016-07-01 | 1 | -0/+7 |
| | | | |||||
| * | | Cleaned up some formatting for ui mocker | Dan Finlay | 2016-07-01 | 4 | -7/+14 |
| | | | |||||
| * | | Add ui mocking script | Dan Finlay | 2016-07-01 | 1 | -1/+2 |
| | | | |||||
| * | | Make info page not chrome dependent | Dan Finlay | 2016-07-01 | 1 | -1/+7 |
| | | | |||||
| * | | Add selector component to ui mocker | Dan Finlay | 2016-07-01 | 2 | -20/+42 |
| | | | |||||
| * | | First simple version of ui mocker | Dan Finlay | 2016-07-01 | 22 | -3/+767 |
| | | | |||||
* | | | Merge pull request #376 from MetaMask/typofix-sign-msg | kumavis | 2016-07-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix typo | ||||
| * | | | fix typo | kumavis | 2016-07-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #375 from MetaMask/compactLayout | kumavis | 2016-07-01 | 6 | -89/+146 |
|\ \ \ \ | |/ / / |/| | | | Compact layout | ||||
| * | | | Add to CHANGELOG | Frankie | 2016-07-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into compactLayout | Frankie | 2016-07-01 | 6 | -11/+12 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #373 from MetaMask/DoubleConfirmation | kumavis | 2016-07-01 | 5 | -10/+11 |
|\ \ \ \ | |_|/ / |/| | | | Double confirmation | ||||
| * | | | Bump changelog | Dan Finlay | 2016-07-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | Remove useless and buggy clearWallet function | Dan Finlay | 2016-07-01 | 3 | -16/+0 |
| | | | | |||||
| * | | | Emphasizing how weird this bug is by removing all behavior from the method. | Dan Finlay | 2016-07-01 | 1 | -5/+1 |
| | | | | |||||
| * | | | Replicated really strange bug with test | Dan Finlay | 2016-07-01 | 2 | -2/+17 |
| | | | | |||||
| * | | | Fix broken action reference | Dan Finlay | 2016-07-01 | 1 | -0/+5 |
|/ / / | |||||
| * | | Implemt new account layout | Frankie | 2016-07-01 | 6 | -35/+59 |
| | | | |||||
| * | | WIP: Working on new layout | Frankie | 2016-07-01 | 4 | -82/+114 |
| | | | |||||
| | * | Add new user agreement | Dan Finlay | 2016-07-01 | 2 | -1/+56 |
| |/ |/| | |||||
* | | Fix gitattributes | Dan Finlay | 2016-06-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:MetaMask/metamask-plugin | Dan Finlay | 2016-06-30 | 5 | -10/+82 |
|\| | |||||
| * | Merge pull request #370 from MetaMask/networkIndication | kumavis | 2016-06-30 | 5 | -10/+82 |
| |\ | | | | | | | Network indication | ||||
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-06-30 | 9 | -41/+131 |
| | |\ | | |/ | |/| | | | | networkIndication | ||||
| | * | Merge branch 'master' into networkIndication | Frankie | 2016-06-30 | 4 | -6/+10 |
| | |\ | |||||
| | * | | Add to change log | Frankie | 2016-06-30 | 4 | -21/+22 |
| | | | | |||||
| | * | | Add network name to indicator and some css fixes | Frankie | 2016-06-30 | 4 | -11/+51 |
| | | | | | | | | | | | | | | | | | | | | -also fix custom net work bug in drop down where it thinks local:8545 is custom. | ||||
| | * | | Add ✓ charchter to indicate active network | Frankie | 2016-06-30 | 2 | -0/+31 |
| | | | | |||||
* | | | | Add gitattributes file for the changelog | Dan Finlay | 2016-06-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #368 from MetaMask/CopyTxHash | kumavis | 2016-06-30 | 9 | -41/+131 |
|\ \ \ | |_|/ |/| | | Copy tx hash | ||||
| * | | Unify tooltip styles | Dan Finlay | 2016-06-30 | 4 | -26/+59 |
| | | | | | | | | | | | | | | | | | | Made a local tooltip component for replicating our tooltip styles wherever we use tooltips. Applied that tooltip to other items that had tooltips. | ||||
| * | | Merge branch 'master' into CopyTxHash | Dan Finlay | 2016-06-30 | 3 | -5/+6 |
| |\ \ | |/ / |/| | | |||||
* | | | Unify wording for transaction options (#369) | Kevin Serrano | 2016-06-30 | 3 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing. | ||||
| * | | Add tooltip to copy button | Dan Finlay | 2016-06-30 | 3 | -10/+43 |
| | | | |||||
| * | | Bump changelog | Dan Finlay | 2016-06-30 | 1 | -0/+2 |
| | | | |||||
| * | | Use clipboard icon for copy button | Dan Finlay | 2016-06-30 | 1 | -3/+8 |
| | | | |||||
| * | | Add copy button to transaction list | Dan Finlay | 2016-06-30 | 1 | -0/+3 |
| | | | |||||
| * | | Replace manual copy buttons with new CopyButton component | Dan Finlay | 2016-06-30 | 2 | -17/+6 |
| | | | |||||
| * | | Add CopyButton component | Dan Finlay | 2016-06-30 | 1 | -0/+26 |
|/ / | |||||
* / | Version 2.4.5 | Dan Finlay | 2016-06-30 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #356 from MetaMask/networkDropdownFix | kumavis | 2016-06-30 | 1 | -0/+21 |
|\ | | | | | Network dropdown fix | ||||
| * | Remove missused action | Frankie | 2016-06-29 | 1 | -1/+0 |
| | | |||||
| * | Make it so that when you click the custom rpc url it closes the dropdown menu | Frankie | 2016-06-29 | 1 | -1/+1 |
| | | |||||
| * | fix lint | Frankie | 2016-06-29 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'master' into networkDropdownFix | Frankie | 2016-06-29 | 4 | -18/+18 |
| |\ | |/ |/| | |||||
* | | Modify network icons to reflect current design. (#355) | Kevin Serrano | 2016-06-29 | 4 | -16/+14 |
| | | | | | | | | | | | | * Modify network icons to reflect current design. * Switch icons around. | ||||
* | | Fix out-of-place positioning of pending tx badges. (#354) | Kevin Serrano | 2016-06-29 | 2 | -2/+4 |
| | | |||||
| * | Add custom to drop down menu | Frankie | 2016-06-29 | 1 | -0/+22 |
|/ | |||||
* | fix bad merge | kumavis | 2016-06-29 | 1 | -6/+1 |
| | |||||
* | Merge pull request #352 from MetaMask/pr/351 | kumavis | 2016-06-29 | 3 | -7/+5 |
|\ | | | | | Limit account nicknames | ||||
| * | Merge branch 'master' into pr/351 | kumavis | 2016-06-29 | 6 | -87/+39 |
| |\ | |/ |/| | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js | ||||
* | | Merge pull request #350 from MetaMask/notif2 | kumavis | 2016-06-29 | 3 | -82/+28 |
|\ \ | | | | | | | Notifications - improved readability and data | ||||
| * \ | Merge branch 'master' into notif2 | kumavis | 2016-06-29 | 8 | -7/+33 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #345 from MetaMask/FixSomeFormatting | kumavis | 2016-06-29 | 4 | -4/+13 |
|\ \ \ | | | | | | | | | Fix some formatting | ||||
| * \ \ | Merge branch 'master' into FixSomeFormatting | kumavis | 2016-06-29 | 6 | -5/+30 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js | ||||
| * | | | Merge branch 'master' into FixSomeFormatting | kumavis | 2016-06-29 | 1 | -3/+3 |
| |\ \ \ | |||||
| * | | | | Simplify `send ether` button to `send`. | Dan Finlay | 2016-06-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix formatting on terms & conditions page | Dan Finlay | 2016-06-29 | 2 | -1/+2 |
| | | | | | |||||
| | | * | | clean - remove svg notifications doc | kumavis | 2016-06-29 | 1 | -38/+0 |
| | | | | | |||||
| | | * | | fix typo | kumavis | 2016-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | background - prepare state for notifcations | kumavis | 2016-06-29 | 2 | -44/+28 |
| | | | | | |||||
| | | * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into notif2 | kumavis | 2016-06-29 | 4 | -2/+8 |
| | |/| | | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin | kumavis | 2016-06-28 | 5 | -5/+7 |
| | |\ \ | |||||
| | * | | | notif - change size for better readability | kumavis | 2016-06-28 | 1 | -3/+3 |
| | | | | | |||||
| | | | * | Second layer of 20 character check modified. | Kevin Serrano | 2016-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Changelog update and reduce allowed characters from 30 to 20. | Kevin Serrano | 2016-06-29 | 2 | -2/+3 |
| | | | | | |||||
| | | | * | Merge branch 'master' into title-truncate | Kevin Serrano | 2016-06-29 | 6 | -6/+23 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #344 from Zanibas/character-limit | kumavis | 2016-06-29 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Character limit implemented for wallet names | ||||
| * | | | | | Code style fix. | Kevin Serrano | 2016-06-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge changelog. | Kevin Serrano | 2016-06-29 | 4 | -2/+9 |
| |\| | | | | |||||
| * | | | | | Additional length check just in case. | Kevin Serrano | 2016-06-29 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Enforce 30 character limit on wallet name. | Kevin Serrano | 2016-06-29 | 2 | -0/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #348 from MetaMask/i341 | kumavis | 2016-06-29 | 4 | -4/+17 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Clear notifications on extension open + guard against negative sends | ||||
| * | | | | Move clearNotifications to popup.js | Frankie | 2016-06-29 | 2 | -9/+10 |
| | | | | | |||||
| * | | | | fix for linting | Frankie | 2016-06-29 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i340+1 | Frankie | 2016-06-29 | 7 | -2/+12 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | fix #341 close notifications when oppening pop up | Frankie | 2016-06-29 | 2 | -2/+10 |
| | | | | | |||||
| * | | | | Fix it so you cant send a negitavie amount of ETH | Frankie | 2016-06-28 | 1 | -1/+5 |
| | | | | | |||||
| | | | * | Wallet name now is properly truncated. | Kevin Serrano | 2016-06-29 | 2 | -2/+2 |
| | | | | | |||||
| | | | * | Truncate account name further. | Kevin Serrano | 2016-06-29 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Change color of failure to yellow. Change pending to ellipsis. (#338) | Kevin Serrano | 2016-06-29 | 4 | -2/+8 |
| |/ / |/| | | | | | | | | | | | | | | * Change color of failure to yellow. Change pending to ellipsis. * Modify changelog. | ||||
* | | | Merge pull request #335 from Zanibas/title-additions | kumavis | 2016-06-28 | 3 | -0/+4 |
|\ \ \ | |/ / |/| | | Add alt titles to most critical icons | ||||
| * | | Add alt titles to most critical icons | Kevin Serrano | 2016-06-28 | 3 | -0/+4 |
|/ / | | | | | | | We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo. | ||||
* | | Merge pull request #327 from MetaMask/uiFixes | kumavis | 2016-06-26 | 2 | -5/+3 |
|\ \ | |/ |/| | fix button positioning && mailto link | ||||
| * | Merge branch 'master' into uiFixes | Frankie | 2016-06-25 | 17 | -454/+669 |
| |\ | |/ |/| | |||||
* | | Merge pull request #326 from MetaMask/conf-tx-refactor | kumavis | 2016-06-25 | 8 | -141/+221 |
|\ \ | | | | | | | Tx/Msg Conf page + notifcation refactor | ||||
| * | | clean - appease the linting machine | kumavis | 2016-06-25 | 3 | -28/+9 |
| | | | |||||
| * | | svg notif now work for msg signatures | kumavis | 2016-06-25 | 5 | -84/+141 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-06-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | conf-tx-refactor | ||||
| * | | | breakout pending-tx-details | kumavis | 2016-06-25 | 5 | -35/+77 |
| | | | | |||||
* | | | | Merge pull request #323 from MetaMask/RefactorBackground | kumavis | 2016-06-25 | 9 | -313/+448 |
|\ \ \ \ | |_|/ / |/| | | | Refactored background.js controller apart from chrome + transport | ||||
| * | | | Debugged by using a real dapp | Dan Finlay | 2016-06-25 | 1 | -3/+4 |
| | | | | |||||
| * | | | Manually debugged refactor | Dan Finlay | 2016-06-25 | 2 | -13/+14 |
| | | | | |||||
| * | | | Fixed tests | Dan Finlay | 2016-06-25 | 7 | -20/+87 |
| | | | | |||||
| * | | | Rename background-controller metamask-controller | Dan Finlay | 2016-06-25 | 2 | -4/+4 |
| | | | | |||||
| * | | | Improve refactor | Dan Finlay | 2016-06-25 | 6 | -105/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | Replace config-manager-singleton with one that is instantiated within the `background-controller`, and takes its persistence callbacks from its instantiated options. Replaced class getters with more familiar get___() functions. | ||||
| * | | | Refactored background.js controller apart from chrome + transport | Dan Finlay | 2016-06-25 | 2 | -254/+301 |
| | | | | | | | | | | | | | | | | Still needs linting fixes, probably bugs, this commit should be used as a draft of what a separation of these concerns might look like. | ||||
| | | * | Fix for the mailto link | Frankie | 2016-06-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | Fix editable button so that it dosent float above the drop down menue | Frankie | 2016-06-25 | 1 | -4/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #322 from MetaMask/i321 | kumavis | 2016-06-25 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | identicon - default to imageify | ||||
| * | | identicon - default to imageify | kumavis | 2016-06-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #320 from MetaMask/i318 | kumavis | 2016-06-25 | 2 | -5/+7 |
|\ \ | |/ |/| | send-tx remove account select button | ||||
| * | send-tx remove account select button | kumavis | 2016-06-25 | 2 | -5/+7 |
|/ | |||||
* | Bump changelog | Dan Finlay | 2016-06-25 | 1 | -0/+3 |
| | |||||
* | Merge pull request #319 from MetaMask/pdf | kumavis | 2016-06-25 | 1 | -32/+48 |
|\ | | | | | contentscript - skip web3 injection if domain appears to be a pdf | ||||
| * | contentscript - skip web3 injection if domain appears to be a pdf | kumavis | 2016-06-25 | 1 | -32/+48 |
|/ | |||||
* | Merge pull request #312 from MetaMask/svg-notif | kumavis | 2016-06-24 | 11 | -164/+184 |
|\ | | | | | initial svg notifications | ||||
| * | notif - remove dummy dev notif | kumavis | 2016-06-24 | 1 | -7/+0 |
| | | |||||
| * | some legit linting fixes | kumavis | 2016-06-24 | 2 | -2/+2 |
| | | |||||
| * | stop pedantic linting | kumavis | 2016-06-24 | 2 | -5/+5 |
| | | |||||
| * | pending-tx pass the identicon pref on | kumavis | 2016-06-24 | 2 | -0/+2 |
| | | |||||
| * | svg notif - use actual txParams | kumavis | 2016-06-24 | 1 | -15/+5 |
| | | |||||
| * | account-panel combine panel into account-panel | kumavis | 2016-06-24 | 2 | -66/+37 |
| | | |||||
| * | accounts - rename account list item so it doesnt overlap | kumavis | 2016-06-24 | 2 | -2/+3 |
| | | |||||
| * | icon-factory - overhaul to provide svg or imagified el | kumavis | 2016-06-24 | 4 | -63/+37 |
| | | |||||
| * | tx-conf add non-interactive mode for notification | kumavis | 2016-06-24 | 3 | -11/+21 |
| | | |||||
| * | svg notifications - remove unneeded deps and clean code | kumavis | 2016-06-24 | 3 | -57/+36 |
| | | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif | kumavis | 2016-06-24 | 34 | -10724/+123 |
| |\ | |||||
| * | | initial svg notifications | kumavis | 2016-06-23 | 4 | -21/+121 |
| | | | |||||
* | | | Merge pull request #315 from MetaMask/UpdatedMenuBar | kumavis | 2016-06-24 | 2 | -40/+65 |
|\ \ \ | |_|/ |/| | | Updated menu bar | ||||
| * | | Add fox logo back to left of menu | Dan Finlay | 2016-06-24 | 1 | -8/+29 |
| | | | | | | | | | | | | Re-centered metamask h1 manually. | ||||
| * | | Moved account change button to menu bar | Dan Finlay | 2016-06-24 | 2 | -32/+36 |
|/ / | |||||
* | | deps - bump web3-stream-provider | kumavis | 2016-06-24 | 1 | -1/+1 |
| | | |||||
* | | 2.4.4 | kumavis | 2016-06-24 | 2 | -1/+7 |
| | | |||||
* | | deps - bump web3-stream-provider | kumavis | 2016-06-24 | 1 | -1/+1 |
| | | |||||
* | | 2.4.3 | kumavis | 2016-06-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #314 from MetaMask/stream-provider-fix | kumavis | 2016-06-24 | 1 | -1/+1 |
|\ \ | | | | | | | deps - bump stream-provider | ||||
| * | | deps - bump stream-provider | kumavis | 2016-06-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #311 from MetaMask/settings | Dan Finlay | 2016-06-23 | 2 | -37/+1 |
|\ \ | | | | | | | Remove network option buttons | ||||
| * | | close #309 | Frankie | 2016-06-23 | 2 | -1/+1 |
| | | | |||||
| * | | Remove redundant network option buttons from settings page | Frankie | 2016-06-23 | 1 | -37/+1 |
|/ / | |||||
* | | Merge pull request #310 from MetaMask/fontChange | Dan Finlay | 2016-06-23 | 31 | -10685/+114 |
|\ \ | |/ |/| | Font change |