Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
* | Bump provider engine | Dan Finlay | 2017-05-01 | 1 | -1/+1 |
* | Merge pull request #1358 from MetaMask/kumavis-patch-1 | Dan Finlay | 2017-04-29 | 2 | -3/+2 |
|\ | |||||
| * | Update CHANGELOG.md | kumavis | 2017-04-29 | 1 | -0/+2 |
| * | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #1356 from MetaMask/mascaraTuneUps | kumavis | 2017-04-29 | 15 | -84/+281 |
|\ | |||||
| * | clean up code | frankiebee | 2017-04-29 | 3 | -5/+3 |
| * | General cleanup and window reload if an update is found | frankiebee | 2017-04-28 | 4 | -12/+17 |
| * | break out IndexDbController && Run the first time test on mascara | frankiebee | 2017-04-28 | 9 | -81/+47 |
| * | Setup test enviroment for mascara | frankiebee | 2017-04-28 | 10 | -1/+236 |
| * | Update README for mascara | frankiebee | 2017-04-27 | 2 | -12/+5 |
| * | bump client-sw-ready-event | frankiebee | 2017-04-27 | 1 | -1/+1 |
* | | Merge pull request #1343 from MetaMask/Version-3.5.4v3.6.0Version-3.6.0 | Thomas Huang | 2017-04-28 | 2 | -2/+7 |
|\ \ | |||||
| * | | Version 3.6.0 | Dan Finlay | 2017-04-28 | 2 | -2/+5 |
| * | | Merge branch 'master' into Version-3.5.4 | Dan Finlay | 2017-04-28 | 54 | -140/+209 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1352 from MetaMask/rinkeby | Thomas Huang | 2017-04-28 | 14 | -2/+84 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 43 | -137/+124 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1351 from MetaMask/lint | Dan Finlay | 2017-04-28 | 41 | -135/+124 |
|\ \ \ \ | |||||
| * | | | | Fix linting warnings | Thomas Huang | 2017-04-27 | 41 | -135/+124 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1347 from MetaMask/gulp-fail-fix | Dan Finlay | 2017-04-28 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | build - make gulp return non-zero error code on bundle fail | kumavis | 2017-04-26 | 1 | -2/+0 |
| |/ / / | |||||
* | | | | Merge pull request #1345 from MetaMask/docker-node7 | Dan Finlay | 2017-04-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | mascara - docker - bump to node7 | kumavis | 2017-04-26 | 1 | -1/+1 |
| | * | | Add to changelog. | Kevin Serrano | 2017-04-26 | 1 | -0/+1 |
| | * | | Add (vague) instructions to adding a new network to the dropdown. | Kevin Serrano | 2017-04-26 | 1 | -0/+25 |
| | * | | Linting. | Kevin Serrano | 2017-04-26 | 2 | -2/+2 |
| | * | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 9 | -6/+26 |
| | * | | change network name to rinkeby when selected | Nickyg | 2017-04-26 | 1 | -1/+10 |
| | * | | add rinkeby network | Nickyg | 2017-04-26 | 6 | -1/+28 |
| |/ / |/| | | |||||
| | * | Version 3.5.4v3.5.4 | Dan Finlay | 2017-04-26 | 2 | -1/+3 |
| |/ |/| | |||||
* | | Merge pull request #1342 from MetaMask/AllowBigSignatureV | kumavis | 2017-04-26 | 2 | -1/+2 |
|\ \ | |||||
| * | | Allow signature V values over 1 byte | Dan Finlay | 2017-04-26 | 2 | -1/+2 |
|/ / | |||||
* | | Merge pull request #1339 from MetaMask/BumpProviderEngine | Kevin Serrano | 2017-04-25 | 2 | -1/+4 |
|\ \ | |||||
| * | | Bump provider-engine | Dan Finlay | 2017-04-25 | 1 | -1/+1 |
| * | | Bump provider engine | Dan Finlay | 2017-04-25 | 2 | -1/+4 |
|/ / | |||||
* | | Merge pull request #1338 from MetaMask/Version-3.5.3 | kumavis | 2017-04-25 | 2 | -1/+5 |
|\ \ | |||||
| * | | Version 3.5.3v3.5.3 | Dan Finlay | 2017-04-25 | 2 | -1/+5 |
|/ / | |||||
* | | Merge pull request #1336 from MetaMask/buyButtonRedo | Dan Finlay | 2017-04-25 | 10 | -244/+216 |
|\ \ | |/ |/| | |||||
| * | fix spelling | frankiebee | 2017-04-25 | 2 | -4/+4 |
| * | Css fixes | frankiebee | 2017-04-24 | 2 | -7/+9 |
| * | make buy button green | frankiebee | 2017-04-24 | 1 | -1/+1 |
| * | Fix issue where stopPropagation didnt stop submitting the tx when clicking bu... | frankiebee | 2017-04-24 | 1 | -1/+1 |
| * | Merge pull request #1335 from MetaMask/buyButtonRedoCleanUp | Frankie | 2017-04-24 | 5 | -70/+1 |
| |\ | |||||
| | * | remove updateCoinBaseAmount action | Jared Pereira | 2017-04-24 | 3 | -25/+0 |
| | * | remove updateBuyAddress action | Jared Pereira | 2017-04-24 | 4 | -29/+1 |
| | * | remove case buyForm | Jared Pereira | 2017-04-23 | 1 | -3/+0 |
| | * | remove buyButtonDeligator function | Jared Pereira | 2017-04-23 | 1 | -12/+0 |
| | * | remove extra buyAddress in state | Jared Pereira | 2017-04-23 | 1 | -1/+0 |
| |/ | |||||
| * | Initial redo attempt of the buy view to look like vladt's desighn | frankiebee | 2017-04-19 | 6 | -195/+173 |
| * | Create a custom radio list component | frankiebee | 2017-04-19 | 1 | -0/+61 |
* | | Merge pull request #1331 from MetaMask/i1323-kovanNoticeRemoval | Dan Finlay | 2017-04-25 | 3 | -2/+5 |
|\ \ | |||||
| * | | Add more detailed instructions on generating and deleting notices. | Kevin Serrano | 2017-04-18 | 1 | -0/+4 |
| * | | Remove kovan notice. | Kevin Serrano | 2017-04-18 | 2 | -2/+1 |
| |/ | |||||
* | | Merge pull request #1333 from MetaMask/firefoxIDB | kumavis | 2017-04-22 | 2 | -57/+40 |
|\ \ | |/ |/| | |||||
| * | Clean up code | frankiebee | 2017-04-22 | 1 | -14/+13 |
| * | Reduce wakeup time for firefox | frankiebee | 2017-04-21 | 1 | -1/+1 |
| * | Fix for firefox | frankiebee | 2017-04-21 | 1 | -55/+39 |
|/ | |||||
* | Merge pull request #1313 from MetaMask/wakeUp2 | kumavis | 2017-04-07 | 3 | -5/+6 |
|\ | |||||
| * | fix syntax | frankiebee | 2017-04-07 | 1 | -1/+1 |
| * | uncomment intervalDelay | frankiebee | 2017-04-07 | 1 | -1/+1 |
| * | match intervals | frankiebee | 2017-04-07 | 1 | -1/+2 |
| * | Fix wakeUps: | frankiebee | 2017-04-07 | 3 | -6/+6 |
* | | Merge pull request #1312 from MetaMask/WakeUp | kumavis | 2017-04-07 | 3 | -2/+8 |
|\| | |||||
| * | Bump sw-client version | frankiebee | 2017-04-07 | 1 | -1/+1 |
| * | remove unnecessary listner | frankiebee | 2017-04-07 | 1 | -6/+1 |
| * | Ping service worker to keep it from going idle | frankiebee | 2017-04-07 | 3 | -3/+14 |
|/ | |||||
* | Merge pull request #1311 from MetaMask/mascara-publish | Frankie | 2017-04-06 | 6 | -21/+56 |
|\ | |||||
| * | mascara - ready to deploy via docker | kumavis | 2017-04-06 | 4 | -4/+40 |
| * | mascara - mascara lib - read mascara origin from env var | kumavis | 2017-04-06 | 1 | -17/+14 |
| * | build - add envify to bundle process | kumavis | 2017-04-06 | 1 | -0/+2 |
* | | Merge pull request #1310 from MetaMask/account-transition-fix | kumavis | 2017-04-06 | 3 | -2/+3 |
|\ \ | |/ |/| | |||||
| * | Changelog. | Kevin Serrano | 2017-04-06 | 1 | -0/+1 |
| * | Fix account detail transition fix. | Kevin Serrano | 2017-04-06 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1309 from MetaMask/mascara2 | Frankie | 2017-04-05 | 22 | -150/+236 |
|\ | |||||
| * | mascara - rename popup to ui | kumavis | 2017-04-05 | 2 | -3/+3 |
| * | mascara - rename things + break out mascara asset server | kumavis | 2017-04-05 | 11 | -114/+135 |
| * | clean - remove unused extension ref | kumavis | 2017-04-05 | 1 | -3/+2 |
| * | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
| * | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 10 | -31/+97 |
|/ | |||||
* | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 18 | -220/+328 |
|\ | |||||
| * | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| * | Remove out of date comments | frankiebee | 2017-04-04 | 1 | -9/+1 |
| * | Fix first install flow | frankiebee | 2017-04-04 | 2 | -11/+4 |
| * | Update todos on README | frankiebee | 2017-04-03 | 1 | -0/+4 |
| * | Update MetaMascara README | frankiebee | 2017-04-03 | 1 | -11/+3 |
| * | Rename mascara root directory | frankiebee | 2017-04-03 | 12 | -0/+0 |
| * | Check to see if connection is from popup | frankiebee | 2017-04-03 | 1 | -1/+1 |
| * | Make Popup close after approving a transaction | frankiebee | 2017-04-03 | 1 | -7/+14 |
| * | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 19 | -334/+213 |
| |\ | |||||
| * \ | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 15 | -82/+197 |
| |\ \ | |||||
| * | | | Rename and move around files | frankiebee | 2017-04-03 | 11 | -110/+21 |
| * | | | Clean up | frankiebee | 2017-03-31 | 6 | -181/+11 |
| * | | | fix stream | frankiebee | 2017-03-30 | 1 | -1/+1 |
| * | | | Bump sw-stream and setup "untrusted and trusted comunication" | frankiebee | 2017-03-30 | 4 | -6/+12 |
| * | | | Create a Transaction from within the dapp | frankiebee | 2017-03-30 | 1 | -1/+1 |
| * | | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 8 | -24/+14 |
| * | | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 33 | -593/+720 |
| |\ \ \ | |||||
| * | | | | WIP: Untrusted external connections eg: dapps | frankiebee | 2017-03-29 | 9 | -54/+221 |
| * | | | | add versioning and migrateing data | frankiebee | 2017-03-24 | 2 | -51/+28 |
| * | | | | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 67 | -1037/+573 |
| |\ \ \ \ | |||||
| * | | | | | Fix state persistence | frankiebee | 2017-03-24 | 1 | -1/+1 |
| * | | | | | Clean up messy merge | frankiebee | 2017-03-24 | 1 | -11/+2 |
| * | | | | | Merge branch 'mascaraMix' into mascara | frankiebee | 2017-03-24 | 2 | -23/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | Get mascara to send a transaction in the ui | frankiebee | 2017-03-24 | 5 | -18/+11 |
| * | | | | | | WIP: indexdb is at an err state "provider is undefined" | frankiebee | 2017-03-24 | 5 | -13/+26 |
| |/ / / / / | |||||
| * | | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 10 | -54/+96 |
| * | | | | | WIP:stream | frankiebee | 2017-03-22 | 3 | -12/+13 |
| * | | | | | notes and clean up | frankiebee | 2017-03-10 | 3 | -179/+7 |
| * | | | | | put background in service worker | frankiebee | 2017-03-10 | 7 | -2/+378 |
* | | | | | | Merge pull request #1308 from MetaMask/FixFaucet | Kevin Serrano | 2017-04-05 | 2 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 2 | -0/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #1306 from MetaMask/redoAutoFaucetAsFetch | Kevin Serrano | 2017-04-05 | 1 | -5/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #1300 from MetaMask/platform | Frankie | 2017-04-03 | 19 | -334/+213 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 2 | -11/+11 |
| * | | | | ui - use global.platform for extension interaction | kumavis | 2017-04-01 | 6 | -22/+21 |
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-04-01 | 5 | -50/+101 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1297 from MetaMask/eip155 | Dan Finlay | 2017-04-01 | 4 | -35/+83 |
|\ \ \ \ \ | |||||
| * | | | | | tests - tx-manager - fix assert and clean formatting | kumavis | 2017-03-31 | 2 | -10/+2 |
| * | | | | | tx-manager - add eip155 support | kumavis | 2017-03-31 | 3 | -35/+91 |
* | | | | | | Merge pull request #1299 from MetaMask/test-notice-fix | Dan Finlay | 2017-04-01 | 1 | -15/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test - fix notice-controller test | kumavis | 2017-03-31 | 1 | -15/+18 |
|/ / / / / / | |||||
| | * | | | | ui - move popup auto-close after tx conf to ui entrypoint | kumavis | 2017-04-01 | 2 | -6/+9 |
| | * | | | | ui - startPopup returns store after boot | kumavis | 2017-04-01 | 4 | -39/+46 |
| | * | | | | ui - reducer - app - code cleanup | kumavis | 2017-04-01 | 1 | -27/+20 |
| | * | | | | etc - fix notification-manager ref, remove duplicated test file | kumavis | 2017-03-31 | 2 | -79/+4 |
| | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-03-31 | 1 | -1/+1 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1298 from MetaMask/tests-fix | Frankie | 2017-03-31 | 3 | -10/+54 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | tests - add missing done | kumavis | 2017-03-31 | 1 | -1/+1 |
| | * | | | | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
| | * | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 7 | -80/+117 |
| | * | | | | extension - prefer extensionizer module | kumavis | 2017-03-31 | 7 | -7/+7 |
| |/ / / / | |||||
| * | | | | meta - package.json - rename npm test scripts | kumavis | 2017-03-31 | 1 | -5/+5 |
| * | | | | tests - helper - add note | kumavis | 2017-03-31 | 1 | -9/+11 |
| * | | | | tests - unit - fail on unhandled promise rejection | kumavis | 2017-03-31 | 2 | -4/+46 |
|/ / / / | |||||
* | | | | Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks | Kevin Serrano | 2017-03-30 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Fix currency checking for firefox | Dan Finlay | 2017-03-30 | 1 | -1/+2 |
* | | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 2 | -14/+21 |
|\ \ \ \ \ | |||||
| * | | | | | tests - tx-utils gasBuffer calc - fix bug and user easier numbers | kumavis | 2017-03-30 | 1 | -11/+17 |
| * | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
* | | | | | | Merge pull request #1287 from MetaMask/kumavis-patch-1 | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | deps - bump provider-engine | kumavis | 2017-03-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #1283 from MetaMask/i1267-textfix | kumavis | 2017-03-30 | 2 | -4/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix potential formatting issues for seed word display. | Kevin Serrano | 2017-03-29 | 2 | -4/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1284 from MetaMask/FixFirefoxPopup | kumavis | 2017-03-30 | 3 | -2/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
| * | | | | | Bump changelog | Dan Finlay | 2017-03-30 | 1 | -0/+2 |
| * | | | | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #1281 from MetaMask/migration-enable | Dan Finlay | 2017-03-29 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add missing migration. | Kevin Serrano | 2017-03-29 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1277 from MetaMask/Version-2.5.2 | Dan Finlay | 2017-03-29 | 2 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | Version 2.5.2v3.5.2v2.5.2 | Dan Finlay | 2017-03-29 | 2 | -1/+4 |
|/ / / / | |||||
* | | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 3 | -2/+14 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 12 | -177/+108 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Kevin Serrano | 2017-03-28 | 3 | -1/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add to changelog. | Kevin Serrano | 2017-03-28 | 1 | -0/+2 |
| * | | | | | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 2 | -2/+13 |
* | | | | | | | Merge pull request #1273 from MetaMask/i1267-seedfix | Dan Finlay | 2017-03-29 | 4 | -33/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 4 | -33/+6 |
* | | | | | | | Merge pull request #1272 from MetaMask/hideseedwordsfromlogstate | Dan Finlay | 2017-03-29 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove a note | Dan Finlay | 2017-03-29 | 1 | -1/+0 |
| * | | | | | | | Merge branch 'master' into hideseedwordsfromlogstate | Dan Finlay | 2017-03-29 | 3 | -3/+17 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add to changelog. | Kevin Serrano | 2017-03-28 | 1 | -0/+2 |
| * | | | | | | | | Remove seedWords from UI state dump. | Kevin Serrano | 2017-03-28 | 1 | -1/+5 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1276 from MetaMask/ImproveGasEstimates | kumavis | 2017-03-29 | 8 | -173/+86 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'ImproveGasEstimates' of github.com:MetaMask/metamask-plugin int... | kumavis | 2017-03-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Filter txs by txMeta network value in account detail | Dan Finlay | 2017-03-29 | 1 | -1/+1 |
| * | | | | | | | Filter txs by txMeta network value in account detail | kumavis | 2017-03-29 | 2 | -3/+3 |
| * | | | | | | | tx manager - emit update on new unapproved tx | kumavis | 2017-03-29 | 1 | -1/+2 |
| |/ / / / / / | |||||
| * | | | | | | Detect tx network from txMeta | Dan Finlay | 2017-03-29 | 1 | -1/+1 |
| * | | | | | | tx manager - add eth-query | kumavis | 2017-03-29 | 1 | -1/+3 |
| * | | | | | | tx manager - adjust new tx flow and txMeta decorations | kumavis | 2017-03-29 | 2 | -41/+32 |
| * | | | | | | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 4 | -127/+46 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #1275 from MetaMask/injection-polish | Dan Finlay | 2017-03-29 | 1 | -3/+16 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix injection logic. | Kevin Serrano | 2017-03-29 | 1 | -3/+16 |
|/ / / / / | |||||
* | | | | | Merge pull request #1271 from MetaMask/i1223-InjectIFrames | Dan Finlay | 2017-03-28 | 3 | -2/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Bump changelog | Dan Finlay | 2017-03-28 | 1 | -0/+2 |
| * | | | | Merge branch 'master' into master | Dan Finlay | 2017-03-28 | 7 | -11/+25 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1269 from MetaMask/notice-fix | Dan Finlay | 2017-03-28 | 3 | -1/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Version 3.5.1v3.5.1 | Dan Finlay | 2017-03-28 | 2 | -1/+3 |
| * | | | | Add to changelog. | Kevin Serrano | 2017-03-28 | 1 | -0/+2 |
| * | | | | Fix edge case where notice does not require scrollbar. | Kevin Serrano | 2017-03-28 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1266 from MetaMask/Version-3.5.0 | Frankie | 2017-03-28 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Version 3.5.0v3.5.0 | Dan Finlay | 2017-03-28 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1265 from MetaMask/ropsten-fix | Dan Finlay | 2017-03-28 | 4 | -10/+15 |
|\ \ \ \ | |||||
| * | | | | explorer - fix ropsten explorer link tests | kumavis | 2017-03-28 | 2 | -8/+13 |
| * | | | | Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into rops... | kumavis | 2017-03-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | block explorer - ropsten | kumavis | 2017-03-28 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
| * | | | | tests - fix ropsten link check | kumavis | 2017-03-28 | 1 | -2/+2 |
| * | | | | block explorer - account link - ropsten | kumavis | 2017-03-28 | 1 | -1/+1 |
|/ / / / | |||||
| * / / | Allow injection in IFrames + dynamic IFrames | Stefaan Ponnet | 2017-03-26 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #1253 from MetaMask/i1210-txdisappearance | Dan Finlay | 2017-03-25 | 3 | -10/+34 |
|\ \ \ | |||||
| * \ \ | Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin i... | Kevin Serrano | 2017-03-25 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 18 | -458/+627 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | correct bug in test. | Kevin Serrano | 2017-03-25 | 1 | -1/+1 |
| * | | | | Add tests. | Kevin Serrano | 2017-03-25 | 1 | -0/+11 |
| * | | | | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 18 | -458/+627 |
| |\ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
* | | | | Merge pull request #1249 from MetaMask/kovan-notice | Kevin Serrano | 2017-03-25 | 4 | -3/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into kovan-notice | Dan Finlay | 2017-03-25 | 4 | -0/+51 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1250 from MetaMask/notice-modification | Dan Finlay | 2017-03-25 | 4 | -0/+51 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into notice-modification | Dan Finlay | 2017-03-25 | 10 | -455/+569 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Create migration to erase body in read notices. | Kevin Serrano | 2017-03-23 | 1 | -0/+36 |
| * | | | | | Add migration tests to ensure that bodies are erased properly in notices. | Kevin Serrano | 2017-03-23 | 2 | -0/+14 |
| * | | | | | Remove notice body after reading. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | * | | | | Merge branch 'master' into kovan-notice | Dan Finlay | 2017-03-25 | 10 | -455/+569 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-25 | 8 | -451/+565 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add personalMessages to function to calculate pending tx index. | Kevin Serrano | 2017-03-25 | 1 | -1/+2 |
| * | | | | | | Fix tx selecting bug | Dan Finlay | 2017-03-25 | 2 | -2/+3 |
| * | | | | | | Remove goHome action causing erratic UI behavior. | Kevin Serrano | 2017-03-25 | 1 | -1/+0 |
| * | | | | | | Remove unnecessary log | Dan Finlay | 2017-03-25 | 1 | -2/+0 |
| * | | | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas... | Dan Finlay | 2017-03-25 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-24 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParam | Kevin Serrano | 2017-03-24 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
|/ / / / / / / | |||||
| * / / / / / | Disable accept button when gas limit is too low | Dan Finlay | 2017-03-25 | 1 | -8/+5 |
| |/ / / / / | |||||
| * | | | | | Make gas calculations on render more consistent | Dan Finlay | 2017-03-24 | 1 | -10/+16 |
| * | | | | | Fix initial tx fee estimation | Dan Finlay | 2017-03-24 | 2 | -4/+5 |
| * | | | | | Fix a couple things | Dan Finlay | 2017-03-24 | 2 | -15/+42 |
| * | | | | | Make reset button clear errors | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | | | | | Fix initial gas price estimate | Dan Finlay | 2017-03-24 | 1 | -4/+5 |
| * | | | | | Prevent default for reset and reject buttons | Dan Finlay | 2017-03-24 | 2 | -1/+3 |
| * | | | | | Override browser default validation message | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | | | | | Fix some broken refs | Dan Finlay | 2017-03-24 | 1 | -2/+2 |
| * | | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas... | Dan Finlay | 2017-03-24 | 18 | -22/+65 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-24 | 1 | -1/+1 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1251 from MetaMask/kovan-tx-etherscan | Dan Finlay | 2017-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Enable etherscan linking on Kovan transaction list items. | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
|/ / / / / / | |||||
| | * | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 14 | -17/+53 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-23 | 4 | -4/+11 |
| | |\ \ \ \ | |||||
| * | | | | | | Combine pending-tx-details component into pending-tx-details | Dan Finlay | 2017-03-24 | 2 | -370/+346 |
| |/ / / / / | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-03-23 | 1 | -0/+3 |
| * | | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 8 | -52/+227 |
| |\ \ \ \ \ | |||||
| * | | | | | | Got basic validations working | Dan Finlay | 2017-03-23 | 5 | -108/+199 |
| * | | | | | | Some progress | Dan Finlay | 2017-03-23 | 2 | -7/+16 |
| | | | * | | | Reset disabled state for confirm button after every notice. | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
| | | | * | | | Create announcement for Kovan. | Kevin Serrano | 2017-03-23 | 3 | -2/+3 |
| |_|_|/ / / |/| | | | | | |||||
| | | | * | | Add to changelog. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | | | * | | Fix persistence of transactions between networks. | Kevin Serrano | 2017-03-23 | 1 | -10/+22 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #1243 from MetaMask/i238-kovan | Dan Finlay | 2017-03-23 | 10 | -4/+45 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1241 from MetaMask/i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 2 | -4/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 3 | -3/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 3 | -6/+12 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Modify logic for injection conditions. | Kevin Serrano | 2017-03-23 | 1 | -9/+5 |
| | | | | | * | | | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 3 | -4/+3 |
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1247 from MetaMask/hide-password | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into hide-password | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |