Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add promise polyfill for PhantomJS | Dan Finlay | 2016-07-23 | 3 | -0/+3 |
* | Fix testem runner page | Dan Finlay | 2016-07-23 | 3 | -7/+2 |
* | Remove phantom from build deps | Dan Finlay | 2016-07-23 | 1 | -1/+0 |
* | Move pre scripts to dependencies key | Dan Finlay | 2016-07-23 | 1 | -0/+1 |
* | Fix circle pre script | Dan Finlay | 2016-07-23 | 1 | -3/+3 |
* | Add testem and phantom to circleCI pre-script | Dan Finlay | 2016-07-23 | 1 | -0/+3 |
* | Add UI tests to CI test script | Dan Finlay | 2016-07-23 | 1 | -1/+1 |
* | Separate UI tests from normal unit test suite | Dan Finlay | 2016-07-23 | 3 | -6/+11 |
* | Add UI Testing Framework and Simple UI Test | Dan Finlay | 2016-07-23 | 6 | -0/+63 |
* | Merge pull request #477 from MetaMask/MockDev | Kevin Serrano | 2016-07-22 | 9 | -19/+237 |
|\ | |||||
| * | Add mock dev mode | Dan Finlay | 2016-07-22 | 9 | -19/+237 |
|/ | |||||
* | Manifest fix for firefox-specific field (#475) | Kevin Serrano | 2016-07-22 | 2 | -5/+1 |
* | Buy button (#474) | Frankie | 2016-07-22 | 11 | -3/+211 |
* | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 14 | -35/+139 |
* | Make injected web3 fail hard on sync methods (#471) | Dan Finlay | 2016-07-21 | 2 | -1/+11 |
* | Version 2.6.2 (#470)2.6.2 | Dan Finlay | 2016-07-21 | 2 | -1/+3 |
* | Add instructions for taking a state dump (#469) | Dan Finlay | 2016-07-21 | 1 | -0/+15 |
* | Merge pull request #465 from MetaMask/i447 | kumavis | 2016-07-19 | 1 | -2/+10 |
|\ | |||||
| * | typo fix | kumavis | 2016-07-19 | 1 | -1/+1 |
| * | inpage - add try/catch to cleanContextForImports | kumavis | 2016-07-19 | 1 | -2/+10 |
|/ | |||||
* | Merge pull request #455 from MetaMask/FixReopeningBug | Kevin Serrano | 2016-07-19 | 3 | -1/+13 |
|\ | |||||
| * | Update Changelog to account for last PR | Kevin Serrano | 2016-07-19 | 1 | -0/+1 |
| * | Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into Fi... | Kevin Serrano | 2016-07-19 | 3 | -1/+12 |
|/| | |||||
| * | Merge branch 'master' into FixReopeningBug | Dan Finlay | 2016-07-16 | 1 | -0/+8 |
| |\ | |||||
| * | | Bump changelog | Dan Finlay | 2016-07-16 | 1 | -0/+2 |
| * | | Add ui state logging function | Dan Finlay | 2016-07-16 | 1 | -0/+8 |
| * | | Triage a strange undefined balance error | Dan Finlay | 2016-07-16 | 1 | -1/+2 |
* | | | Merge pull request #464 from MetaMask/test-branch | Kevin Serrano | 2016-07-19 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of github.com:MetaMask/metamask-plugin | Kevin Serrano | 2016-07-19 | 1 | -1/+1 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #463 from MetaMask/aust-zero-changes | Kevin Serrano | 2016-07-19 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | Readd string to conform to tests. Will discuss later. | Kevin Serrano | 2016-07-19 | 1 | -1/+1 |
| | * | | | Merge branch 'AustP-master' | Kevin Serrano | 2016-07-19 | 1 | -2/+7 |
| |/| | | |/|/ / / | |||||
| * | | | Remove unused None string. | Kevin Serrano | 2016-07-19 | 1 | -1/+1 |
| * | | | Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-... | Kevin Serrano | 2016-07-19 | 1 | -1/+6 |
|/| | | | |||||
| * | | | Add eslint config to pass tests | Aust | 2016-07-19 | 1 | -0/+1 |
| * | | | Make zero balance display 0. Fixes #449 | Aust | 2016-07-18 | 1 | -1/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #459 from Schaeff/transaction-typo-fix | kumavis | 2016-07-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix typo | Thibaut SCHAEFFER | 2016-07-18 | 1 | -1/+1 |
|/ / | |||||
* / | Add simple build instructions (#454) | Dan Finlay | 2016-07-16 | 1 | -0/+8 |
|/ | |||||
* | Merge pull request #448 from MetaMask/user-agreement-proofread | Kevin Serrano | 2016-07-15 | 1 | -11/+11 |
|\ | |||||
| * | Merge branch 'master' into user-agreement-proofread | Kevin Serrano | 2016-07-15 | 6 | -26/+83 |
| |\ | |/ |/| | |||||
* | | Merge pull request #443 from MetaMask/legal-beagal | kumavis | 2016-07-15 | 1 | -0/+34 |
|\ \ | |||||
| * \ | Merge branch 'master' into legal-beagal | kumavis | 2016-07-15 | 8 | -30/+59 |
| |\ \ | |/ / |/| | | |||||
* | | | Version 2.6.1 (#442) | Dan Finlay | 2016-07-14 | 2 | -1/+3 |
* | | | new tx - calculate estimatedGas and show thing in tx-details (#441) | kumavis | 2016-07-14 | 4 | -25/+46 |
| * | | license | kumavis | 2016-07-15 | 1 | -0/+34 |
| | * | Proofread and fix spelling errors of user agreement. | Kevin Serrano | 2016-07-15 | 1 | -11/+11 |
| |/ |/| | |||||
* | | Fix eth balance tooltip to show 6 decimals (#440) | Frankie | 2016-07-14 | 4 | -4/+10 |
|/ | |||||
* | Merge pull request #439 from MetaMask/japan-localization | kumavis | 2016-07-14 | 2 | -1/+11 |
|\ | |||||
| * | Add Japanese localization file. | Kevin Serrano | 2016-07-14 | 1 | -0/+10 |
| * | Fix MetaMask title for EN. | Kevin Serrano | 2016-07-14 | 1 | -1/+1 |
|/ | |||||
* | Bump provider-engine from 7.8.1 to 7.8.3 (#435) | Kevin Serrano | 2016-07-14 | 2 | -1/+3 |
* | Move fox logo with filled in eyes into design folder (#433) | Frankie | 2016-07-14 | 1 | -0/+0 |
* | Merge pull request #431 from MetaMask/one-wallet-one-future | kumavis | 2016-07-13 | 2 | -1/+2 |
|\ | |||||
| * | Update changelog. | Kevin Serrano | 2016-07-13 | 1 | -0/+1 |
| * | Add one wallet to new accounts instead of three. | Kevin Serrano | 2016-07-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #423 from MetaMask/FixMenuBug | kumavis | 2016-07-12 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug | kumavis | 2016-07-12 | 14 | -191/+106 |
| |\ | |/ |/| | |||||
* | | Merge pull request #428 from MetaMask/FixSvgIcons | Dan Finlay | 2016-07-12 | 7 | -21/+20 |
|\ \ | |||||
| * \ | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 7 | -169/+83 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #427 from MetaMask/balance-refactor | Dan Finlay | 2016-07-12 | 7 | -169/+83 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into balance-refactor | Kevin Serrano | 2016-07-12 | 3 | -3/+12 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
| | * | | Linted | Dan Finlay | 2016-07-12 | 4 | -17/+10 |
| | * | | Fix svg icon in notification | Dan Finlay | 2016-07-12 | 1 | -0/+2 |
| | * | | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 2 | -1/+3 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #426 from MetaMask/Version26 | Dan Finlay | 2016-07-12 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Version 2.6 | Dan Finlay | 2016-07-12 | 2 | -1/+3 |
|/ / / / | |||||
| | * | | Rebuild states object | Dan Finlay | 2016-07-12 | 1 | -1/+1 |
| | * | | Fix imageification of recipient | Dan Finlay | 2016-07-12 | 1 | -3/+4 |
| | * | | Add coin sending tx state | Dan Finlay | 2016-07-12 | 1 | -0/+1 |
| | * | | Add notification global for development | Dan Finlay | 2016-07-12 | 1 | -1/+3 |
| |/ / |/| | | |||||
| | * | Merge branch 'master' into FixMenuBug | Dan Finlay | 2016-07-12 | 1 | -2/+9 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #424 from MetaMask/UpdateScript | Dan Finlay | 2016-07-12 | 1 | -2/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated script for what I recorded. | Dan Finlay | 2016-07-12 | 1 | -2/+9 |
|/ / | |||||
| * | Fix main dropdown animation | Dan Finlay | 2016-07-12 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #418 from MetaMask/ui-fixth-width-tx-history | kumavis | 2016-07-09 | 5 | -7/+100 |
|\ | |||||
| * | 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 ui-fixth-wi... | kumavis | 2016-07-08 | 2 | -18/+51 |
| |\ | |/ |/| | |||||
* | | Merge pull request #419 from MetaMask/ConfirmationStyle | kumavis | 2016-07-08 | 2 | -18/+51 |
|\ \ | |||||
| * | | 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 Confirmatio... | kumavis | 2016-07-08 | 1 | -10/+1 |
| |\ \ | |/ / |/| | | |||||
| * | | 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 | Dan Finlay | 2016-07-08 | 1 | -10/+1 |
|/ / | |||||
* | | Merge pull request #406 from MetaMask/ConfirmationStyle | Dan Finlay | 2016-07-08 | 21 | -73/+603 |
|\ \ | |||||
| * \ | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio... | kumavis | 2016-07-08 | 5 | -3/+116 |
| |\ \ | |/ / |/| | | |||||
| * | | lint fix | kumavis | 2016-07-08 | 1 | -1/+1 |
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio... | kumavis | 2016-07-08 | 2 | -21/+48 |
| |\ \ | |||||
| * | | | 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 |
| |\ \ \ \ | |||||
| | * | | | | 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 fixe... | Kevin Serrano | 2016-07-08 | 3 | -2/+72 |
| | | | | | | * | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| | | | | | | * | 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 hist... | Kevin Serrano | 2016-07-08 | 5 | -3/+117 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #412 from MetaMask/ethBalance | Dan Finlay | 2016-07-08 | 2 | -17/+34 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 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 |
|/ / / / / | |||||
* | | | | | Merge pull request #410 from MetaMask/cleanupEthbug | Dan Finlay | 2016-07-08 | 3 | -45/+45 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 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 | kumavis | 2016-07-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #403 from MetaMask/fastinject | kumavis | 2016-07-07 | 3 | -5/+7 |
|\ \ \ \ | |||||
| * \ \ \ | 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. | 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" | Frankie | 2016-07-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #399 from MetaMask/ethBalance | Dan Finlay | 2016-07-07 | 6 | -46/+49 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 | kumavis | 2016-07-07 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #387 from MetaMask/ui-formatting | Dan Finlay | 2016-07-07 | 2 | -23/+26 |
|\ \ | |||||
| * | | 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 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 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Simplify error log | Dan Finlay | 2016-07-06 | 1 | -2/+1 |
| * | | | Improve metamask-controller error logging | Dan Finlay | 2016-07-06 | 1 | -2/+5 |
| | |/ | |/| | |||||
* | | | 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 | 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 | Dan Finlay | 2016-07-02 | 7 | -8/+46 |
|/ | |||||
* | Merge pull request #380 from MetaMask/FrankieDisclaimer | Dan Finlay | 2016-07-02 | 12 | -114/+119 |
|\ | |||||
| * | 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 |
| * | Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into ... | kumavis | 2016-07-01 | 2 | -25/+2 |
| |\ | |||||
| | * | 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 |
|\ \ | |||||
| * | | 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 | kumavis | 2016-07-01 | 1 | -1/+1 |
* | | | | Merge pull request #375 from MetaMask/compactLayout | kumavis | 2016-07-01 | 6 | -89/+146 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi... | kumavis | 2016-06-30 | 9 | -41/+131 |
| | |\ | | |/ | |/| | |||||
| | * | 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 |
| | * | | 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 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Unify tooltip styles | Dan Finlay | 2016-06-30 | 4 | -26/+59 |
| * | | 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 |
| * | | 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 |
|\ | |||||
| * | 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 |
* | | 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 |
|\ | |||||
| * | Merge branch 'master' into pr/351 | kumavis | 2016-06-29 | 6 | -87/+39 |
| |\ | |/ |/| | |||||
* | | Merge pull request #350 from MetaMask/notif2 | kumavis | 2016-06-29 | 3 | -82/+28 |
|\ \ | |||||
| * \ | 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 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into FixSomeFormatting | kumavis | 2016-06-29 | 6 | -5/+30 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
| | |/| | | | |/ / | |/| | |