aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add promise polyfill for PhantomJSDan Finlay2016-07-233-0/+3
|
* Fix testem runner pageDan Finlay2016-07-233-7/+2
|
* Remove phantom from build depsDan Finlay2016-07-231-1/+0
|
* Move pre scripts to dependencies keyDan Finlay2016-07-231-0/+1
|
* Fix circle pre scriptDan Finlay2016-07-231-3/+3
|
* Add testem and phantom to circleCI pre-scriptDan Finlay2016-07-231-0/+3
|
* Add UI tests to CI test scriptDan Finlay2016-07-231-1/+1
|
* Separate UI tests from normal unit test suiteDan Finlay2016-07-233-6/+11
|
* Add UI Testing Framework and Simple UI TestDan Finlay2016-07-236-0/+63
| | | | | | | | | | Added a Testem configuration that launches a Qunit page with an iFrame that builds and loads our mock-dev page and can interact with it and run tests on it. Wrote a simple test that accepts the terms and conditions and transitions to the next page. I am not doing any fancy redux-hooks for the async waiting, I've simply added a `tests/integration/helpers.js` file with a `wait()` function that returns a promise that should wait long enough. Long term we should hook into the app lifecycle by some means for testing, so we only wait the right amount of time, and wait long enough for slower processes to complete, but this may work for the time being, just enough to run some basic automated browser tests.
* Merge pull request #477 from MetaMask/MockDevKevin Serrano2016-07-229-19/+237
|\ | | | | Add mock dev mode
| * Add mock dev modeDan Finlay2016-07-229-19/+237
|/
* Manifest fix for firefox-specific field (#475)Kevin Serrano2016-07-222-5/+1
| | | | | | * Remove firefox-only manifest.json line. * Changelog change.
* Buy button (#474)Frankie2016-07-2211-3/+211
| | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension
* Implement some cross-browser practices (#473)Dan Finlay2016-07-2214-35/+139
| | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests
* Make injected web3 fail hard on sync methods (#471)Dan Finlay2016-07-212-1/+11
| | | Make injected web3 fail hard on sync methods
* Version 2.6.2 (#470)2.6.2Dan Finlay2016-07-212-1/+3
|
* Add instructions for taking a state dump (#469)Dan Finlay2016-07-211-0/+15
|
* Merge pull request #465 from MetaMask/i447kumavis2016-07-191-2/+10
|\ | | | | inpage - add try/catch to cleanContextForImports
| * typo fixkumavis2016-07-191-1/+1
| |
| * inpage - add try/catch to cleanContextForImportskumavis2016-07-191-2/+10
|/
* Merge pull request #455 from MetaMask/FixReopeningBugKevin Serrano2016-07-193-1/+13
|\ | | | | Fix reopening bug
| * Update Changelog to account for last PRKevin Serrano2016-07-191-0/+1
| |
| * Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-07-193-1/+12
|/| | | | | | | FixReopeningBug
| * Merge branch 'master' into FixReopeningBugDan Finlay2016-07-161-0/+8
| |\
| * | Bump changelogDan Finlay2016-07-161-0/+2
| | |
| * | Add ui state logging functionDan Finlay2016-07-161-0/+8
| | | | | | | | | | | | | | | | | | Now from the UI console, you can always call `logState()`, and it will print the state stringified into the console, ready to drop into the ui dev mode states folder, or other inspection. This should make it easier to diagnose user bugs in the future.
| * | Triage a strange undefined balance errorDan Finlay2016-07-161-1/+2
| | |
* | | Merge pull request #464 from MetaMask/test-branchKevin Serrano2016-07-190-0/+0
|\ \ \ | | | | | | | | Test branch
| * \ \ Merge branch 'master' of github.com:MetaMask/metamask-pluginKevin Serrano2016-07-191-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #463 from MetaMask/aust-zero-changesKevin Serrano2016-07-191-1/+6
|\ \ \ \ | | | | | | | | | | Aust zero changes
| * | | | Readd string to conform to tests. Will discuss later.Kevin Serrano2016-07-191-1/+1
| | | | |
| | * | | Merge branch 'AustP-master'Kevin Serrano2016-07-191-2/+7
| |/| | | |/|/ / /
| * | | Remove unused None string.Kevin Serrano2016-07-191-1/+1
| | | |
| * | | Merge branch 'master' of https://github.com/AustP/metamask-plugin into ↵Kevin Serrano2016-07-191-1/+6
|/| | | | | | | | | | | | | | | AustP-master
| * | | Add eslint config to pass testsAust2016-07-191-0/+1
| | | |
| * | | Make zero balance display 0. Fixes #449Aust2016-07-181-1/+5
| | |/ | |/|
* | | Merge pull request #459 from Schaeff/transaction-typo-fixkumavis2016-07-191-1/+1
|\ \ \ | |/ / |/| | Fix typo
| * | Fix typoThibaut SCHAEFFER2016-07-181-1/+1
|/ /
* / Add simple build instructions (#454)Dan Finlay2016-07-161-0/+8
|/
* Merge pull request #448 from MetaMask/user-agreement-proofreadKevin Serrano2016-07-151-11/+11
|\ | | | | Proofread and fix spelling errors of user agreement.
| * Merge branch 'master' into user-agreement-proofreadKevin Serrano2016-07-156-26/+83
| |\ | |/ |/|
* | Merge pull request #443 from MetaMask/legal-beagalkumavis2016-07-151-0/+34
|\ \ | | | | | | Meta - Add license
| * \ Merge branch 'master' into legal-beagalkumavis2016-07-158-30/+59
| |\ \ | |/ / |/| |
* | | Version 2.6.1 (#442)Dan Finlay2016-07-142-1/+3
| | |
* | | new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-144-25/+46
| | | | | | | | | | | | | | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog
| * | licensekumavis2016-07-151-0/+34
| | |
| | * Proofread and fix spelling errors of user agreement.Kevin Serrano2016-07-151-11/+11
| |/ |/|
* | Fix eth balance tooltip to show 6 decimals (#440)Frankie2016-07-144-4/+10
|/ | | | | | | | | | | | * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log
* Merge pull request #439 from MetaMask/japan-localizationkumavis2016-07-142-1/+11
|\ | | | | Japan localization
| * Add Japanese localization file.Kevin Serrano2016-07-141-0/+10
| |
| * Fix MetaMask title for EN.Kevin Serrano2016-07-141-1/+1
|/
* Bump provider-engine from 7.8.1 to 7.8.3 (#435)Kevin Serrano2016-07-142-1/+3
| | | | | | * Bump provider-engine from 7.8.1 to 7.8.3 * Modify changelog.
* Move fox logo with filled in eyes into design folder (#433)Frankie2016-07-141-0/+0
| | | | | | | | | | * Move fox logo with filled in eyes into design folder * Crop fox * Crop fox properly * Gah Crop fox properly
* Merge pull request #431 from MetaMask/one-wallet-one-futurekumavis2016-07-132-1/+2
|\ | | | | Add one wallet to new accounts instead of three.
| * Update changelog.Kevin Serrano2016-07-131-0/+1
| |
| * Add one wallet to new accounts instead of three.Kevin Serrano2016-07-131-1/+1
|/
* Merge pull request #423 from MetaMask/FixMenuBugkumavis2016-07-121-2/+2
|\ | | | | Fix main dropdown animation
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBugkumavis2016-07-1214-191/+106
| |\ | |/ |/|
* | Merge pull request #428 from MetaMask/FixSvgIconsDan Finlay2016-07-127-21/+20
|\ \ | | | | | | Fix svg icons
| * \ Merge branch 'master' into FixSvgIconsDan Finlay2016-07-127-169/+83
| |\ \ | |/ / |/| |
* | | Merge pull request #427 from MetaMask/balance-refactorDan Finlay2016-07-127-169/+83
|\ \ \ | | | | | | | | Balance refactor, less-than-one abbreviation for eth balances, util cleanup
| * \ \ Merge branch 'master' into balance-refactorKevin Serrano2016-07-123-3/+12
| |\ \ \ | |/ / / |/| | |
| * | | Update changelog.Kevin Serrano2016-07-121-0/+2
| | | |
| * | | Integrate changes back into eth-balanceKevin Serrano2016-07-125-111/+54
| | | |
| * | | Move shorten balance to util. Add as property of generateBalance object output.Kevin Serrano2016-07-123-23/+28
| | | |
| * | | Remove unused functions. Readd if necessary.Kevin Serrano2016-07-122-37/+4
| | | |
| * | | Refactor util tests.Kevin Serrano2016-07-121-11/+8
| | | |
| | * | LintedDan Finlay2016-07-124-17/+10
| | | |
| | * | Fix svg icon in notificationDan Finlay2016-07-121-0/+2
| | | |
| | * | Merge branch 'master' into FixSvgIconsDan Finlay2016-07-122-1/+3
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #426 from MetaMask/Version26Dan Finlay2016-07-122-1/+3
|\ \ \ \ | | | | | | | | | | Version 2.6
| * | | | Version 2.6Dan Finlay2016-07-122-1/+3
|/ / / /
| | * | Rebuild states objectDan Finlay2016-07-121-1/+1
| | | |
| | * | Fix imageification of recipientDan Finlay2016-07-121-3/+4
| | | |
| | * | Add coin sending tx stateDan Finlay2016-07-121-0/+1
| | | |
| | * | Add notification global for developmentDan Finlay2016-07-121-1/+3
| |/ / |/| | | | | | | | The background process now has a global `METAMASK_NOTIFIER` object that allows easy mocking of notification data.
| | * Merge branch 'master' into FixMenuBugDan Finlay2016-07-121-2/+9
| | |\ | |_|/ |/| |
* | | Merge pull request #424 from MetaMask/UpdateScriptDan Finlay2016-07-121-2/+9
|\ \ \ | |/ / |/| | Updated script for what I recorded
| * | Updated script for what I recorded.Dan Finlay2016-07-121-2/+9
|/ /
| * Fix main dropdown animationDan Finlay2016-07-121-2/+2
|/
* Merge pull request #418 from MetaMask/ui-fixth-width-tx-historykumavis2016-07-095-7/+100
|\ | | | | Fixed width applied on transaction history components
| * lintKevin Serrano2016-07-091-5/+5
| |
| * Implement alternate shortening scheme.Kevin Serrano2016-07-093-7/+26
| |
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-082-18/+51
| |\ | |/ |/| | | ui-fixth-width-tx-history
* | Merge pull request #419 from MetaMask/ConfirmationStylekumavis2016-07-082-18/+51
|\ \ | | | | | | Tx Confirmation - fixes
| * | eth-balance fixkumavis2016-07-081-1/+10
| | |
| * | lint - dingle dangle comma tanglekumavis2016-07-081-1/+1
| | |
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-081-10/+1
| |\ \ | |/ / |/| | | | | ConfirmationStyle
| * | notif - add support for forward carratkumavis2016-07-081-13/+41
| | |
| * | ui - remove doubled eth-balancekumavis2016-07-082-5/+1
| | |
| | * Resolve merge conflict.Kevin Serrano2016-07-0821-72/+593
| | |\ | |_|/ |/| |
* | | Merge pull request #417 from MetaMask/FixEthBalanceStyleDan Finlay2016-07-081-10/+1
|\ \ \ | |/ / |/| | Fixed eth_balance style, completing partial merge
| * | Fixed eth_balance style, completing partial mergeDan Finlay2016-07-081-10/+1
|/ /
* | Merge pull request #406 from MetaMask/ConfirmationStyleDan Finlay2016-07-0821-73/+603
|\ \ | | | | | | Update transaction confirmation style
| * \ Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-085-3/+116
| |\ \ | |/ / |/| | | | | ConfirmationStyle
| * | lint fixkumavis2016-07-081-1/+1
| | |
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-082-21/+48
| |\ \ | | | | | | | | | | | | ConfirmationStyle
| * | | Restore button naming consistencyDan Finlay2016-07-081-2/+2
| | | |
| * | | Add nickname rendering for recipient addressDan Finlay2016-07-083-5/+63
| | | |
| * | | LintedDan Finlay2016-07-082-2/+2
| | | |
| * | | Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| | | |
| * | | Implement tx confirmation style refinementsDan Finlay2016-07-084-24/+38
| | | |
| * | | Add configurable params to eth-balanceDan Finlay2016-07-081-10/+17
| | | |
| * | | Make mini account panel labels fully configurableDan Finlay2016-07-082-28/+42
| | | |
| * | | Remove formatBalance.formatted referencesDan Finlay2016-07-081-4/+4
| | | |
| * | | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-084-52/+52
| |\ \ \
| * \ \ \ Merge branch 'ConfirmationStyle' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-07-070-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ConfirmationStyle
| | * | | | Correct data length calculationDan Finlay2016-07-071-1/+1
| | | | | |
| * | | | | Correct data length calculationDan Finlay2016-07-071-1/+1
| |/ / / /
| * | | | Update gas costDan Finlay2016-07-071-1/+1
| | | | |
| * | | | Fix sender balance rendering in pending tx detailsDan Finlay2016-07-071-1/+4
| | | | |
| * | | | Simplify ui dev mode styleDan Finlay2016-07-072-2/+2
| | | | |
| * | | | Bump changelogDan Finlay2016-07-071-0/+1
| | | | |
| * | | | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-075-9/+12
| |\ \ \ \
| * | | | | LintedDan Finlay2016-07-072-29/+6
| | | | | |
| * | | | | Fixed up pending-tx-detailsDan Finlay2016-07-075-25/+29
| | | | | |
| * | | | | Fleshed out pending tx viewDan Finlay2016-07-076-32/+87
| | | | | |
| * | | | | Merged latest balance formatting codeDan Finlay2016-07-076-46/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-0710-41/+55
| |\ \ \ \ \ \
| * | | | | | | Began reworking tx conf viewDan Finlay2016-07-0714-19/+394
| | | | | | | |
| * | | | | | | Simplify empty account balance renderingDan Finlay2016-07-062-2/+2
| | | | | | | |
| | | | | | | * Pass the linters.Kevin Serrano2016-07-081-5/+5
| | | | | | | |
| | | | | | | * Remove reducer console log.Kevin Serrano2016-07-081-1/+0
| | | | | | | |
| | | | | | | * Modify changelog.Kevin Serrano2016-07-081-0/+1
| | | | | | | |
| | | | | | | * Add new component for tx-history to avoid messing with other styles. Add ↵Kevin Serrano2016-07-083-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed width specifically to this style.
| | | | | | | * Modified test views again. Added fixed length to center tx information.Kevin Serrano2016-07-084-4/+8
| | | | | | | |
| | | | | | | * Merge branch 'master' into ui-fixth-width-tx-historyKevin Serrano2016-07-080-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #413 from MetaMask/ui-fixDan Finlay2016-07-085-3/+116
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Add new test state with tx history. Fix alignment issue with transact…
| | | | | | | * Modify development states to account for long domains.Kevin Serrano2016-07-082-3/+3
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove logging for states.Kevin Serrano2016-07-081-1/+0
| | | | | | |
| * | | | | | Add new test state with tx history. Fix alignment issue with transaction ↵Kevin Serrano2016-07-085-3/+117
|/ / / / / / | | | | | | | | | | | | | | | | | | history text.
* | | | | | Merge pull request #412 from MetaMask/ethBalanceDan Finlay2016-07-082-17/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add method to deal with small decimals
| * | | | | Change function name to generateBalanceObjectFrankie2016-07-082-4/+4
| | | | | |
| * | | | | Add method to deal with small decimals and create the object for eth-balance ↵Frankie2016-07-082-17/+34
|/ / / / / | | | | | | | | | | | | | | | component
* | | | | Merge pull request #410 from MetaMask/cleanupEthbugDan Finlay2016-07-083-45/+45
|\ \ \ \ \ | | | | | | | | | | | | Revert back to original formatBalance
| * | | | | Revert back to original formatBalanceFrankie2016-07-083-45/+45
|/ / / / /
* | | | | Merge pull request #408 from MetaMask/FixNoDeclineCallbackkumavis2016-07-081-8/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix bug where rejected tx would not call back
| * | | | Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
|/ / / /
* | | | Merge pull request #404 from MetaMask/fastinjectkumavis2016-07-071-1/+1
|\ \ \ \ | | | | | | | | | | contentscript - remove timeout before stream setup
| * | | | contentscript - remove timeout before stream setupkumavis2016-07-071-1/+1
|/ / / /
* | | | Merge pull request #403 from MetaMask/fastinjectkumavis2016-07-073-5/+7
|\ \ \ \ | | | | | | | | | | Improve web3 injection times
| * \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-072-3/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #402 from MetaMask/z-position-fixDan Finlay2016-07-072-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix dropdown z-index issue.
| * | | | | Fix dropdown z-index issue.Kevin Serrano2016-07-072-3/+4
|/ / / / /
| * | | | appease the linting godskumavis2016-07-072-4/+1
| | | | |
| * | | | changelog - add web3 min distkumavis2016-07-071-0/+1
| | | | |
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-076-46/+49
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #401 from MetaMask/ethBalanceDan Finlay2016-07-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Handle to small of balances with "<0.00001"
| * | | | Handle to small of balances with "<0.00001"Frankie2016-07-071-1/+1
|/ / / /
* | | | Merge pull request #399 from MetaMask/ethBalanceDan Finlay2016-07-076-46/+49
|\ \ \ \ | |_|_|/ |/| | | Eth balance
| * | | Add a postion option for tool tipFrankie2016-07-073-1/+4
| | | |
| * | | Add decimal hendeling to ETH balanceFrankie2016-07-074-45/+45
|/ / /
| * / web3 injection - use web3 dist for faster injectionkumavis2016-07-072-5/+9
|/ /
* | Merge pull request #392 from MetaMask/kumavis-patch-1Kevin Serrano2016-07-071-2/+2
|\ \ | | | | | | readme - camel case MetaMask
| * | readme - camel case MetaMaskkumavis2016-07-071-2/+2
|/ /
* | Merge pull request #387 from MetaMask/ui-formattingDan Finlay2016-07-072-23/+26
|\ \ | | | | | | Ui formatting for account details
| * | Add to changelog.Kevin Serrano2016-07-061-0/+1
| | |
| * | Move account balance down a row. Adjusted positioning of buttons.Kevin Serrano2016-07-061-23/+25
| | |
* | | Merge pull request #388 from MetaMask/script-editsDan Finlay2016-07-061-9/+9
|\ \ \ | | | | | | | | Edits to the video script
| * | | Edits to the script ya know.Kevin Serrano2016-07-061-9/+9
| | | |
* | | | Merge pull request #389 from MetaMask/thinFontDan Finlay2016-07-066-5/+14
|\ \ \ \ | |/ / / |/| | | Thin font
| * | | Merge branch 'master' into thinFontFrankie2016-07-063-3/+32
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #385 from MetaMask/ImprovedLoggingDan Finlay2016-07-061-2/+4
|\ \ \ \ | |_|_|/ |/| | | Improve metamask-controller error logging
| * | | Simplify error logDan Finlay2016-07-061-2/+1
| | | |
| * | | Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
| | |/ | |/| | | | | | | Fixes #384
* | | Add video script draftDan Finlay2016-07-061-0/+27
| | |
* | | Add state list rebuilding on ui taskDan Finlay2016-07-061-1/+1
|/ /
| * Add light and ultraLight fontsFrankie2016-07-066-5/+14
|/
* Version 2.5.0Dan Finlay2016-07-022-1/+3
|
* Merge pull request #383 from MetaMask/i377Dan Finlay2016-07-022-0/+5
|\ | | | | Put network status checkmarks at end of row
| * Put network status checkmarks at end of rowDan Finlay2016-07-022-0/+5
|/
* Merge pull request #381 from MetaMask/ImproveUiDevModeDan Finlay2016-07-027-8/+46
|\ | | | | Improved Ui Dev Mode
| * Improved Ui Dev ModeDan Finlay2016-07-027-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/FrankieDisclaimerDan Finlay2016-07-0212-114/+119
|\ | | | | Frankie disclaimer
| * LintedDan Finlay2016-07-021-1/+0
| |
| * Move main drop-down state to component stateDan Finlay2016-07-023-35/+9
| |
| * Formatted dev mode betterDan Finlay2016-07-016-7/+23
| |
| * Added some basic stylesDan Finlay2016-07-011-1/+14
| |
| * Simplify ui task commandDan Finlay2016-07-011-1/+1
| |
| * Clean up beefy usageDan Finlay2016-07-012-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 ↵kumavis2016-07-012-25/+2
| |\ | | | | | | | | | FrankieDisclaimer
| | * Add query param restoring to mockerDan Finlay2016-07-011-2/+2
| | |
| | * Remove debugs from developmentDan Finlay2016-07-011-23/+0
| | |
| * | disclaimer - render via react-markdownkumavis2016-07-012-2/+11
| |/
| * Remove scroll fixing from ui previewDan Finlay2016-07-011-20/+2
| |
| * Remove old disclaimerDan Finlay2016-07-011-8/+0
| |
| * Merge branch 'master' into FrankieDisclaimerDan Finlay2016-07-0135-104/+969
| |\ | |/ |/|
* | Merge pull request #378 from MetaMask/UiDevkumavis2016-07-0124-4/+811
|\ \ | | | | | | Ui dev
| * | Add ui mocking mode explanationDan Finlay2016-07-011-0/+7
| | |
| * | Cleaned up some formatting for ui mockerDan Finlay2016-07-014-7/+14
| | |
| * | Add ui mocking scriptDan Finlay2016-07-011-1/+2
| | |
| * | Make info page not chrome dependentDan Finlay2016-07-011-1/+7
| | |
| * | Add selector component to ui mockerDan Finlay2016-07-012-20/+42
| | |
| * | First simple version of ui mockerDan Finlay2016-07-0122-3/+767
| | |
* | | Merge pull request #376 from MetaMask/typofix-sign-msgkumavis2016-07-011-1/+1
|\ \ \ | | | | | | | | fix typo
| * | | fix typokumavis2016-07-011-1/+1
| | | |
* | | | Merge pull request #375 from MetaMask/compactLayoutkumavis2016-07-016-89/+146
|\ \ \ \ | |/ / / |/| | | Compact layout
| * | | Add to CHANGELOGFrankie2016-07-011-0/+1
| | | |
| * | | Merge branch 'master' into compactLayoutFrankie2016-07-016-11/+12
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #373 from MetaMask/DoubleConfirmationkumavis2016-07-015-10/+11
|\ \ \ \ | |_|/ / |/| | | Double confirmation
| * | | Bump changelogDan Finlay2016-07-011-0/+1
| | | |
| * | | Remove useless and buggy clearWallet functionDan Finlay2016-07-013-16/+0
| | | |
| * | | Emphasizing how weird this bug is by removing all behavior from the method.Dan Finlay2016-07-011-5/+1
| | | |
| * | | Replicated really strange bug with testDan Finlay2016-07-012-2/+17
| | | |
| * | | Fix broken action referenceDan Finlay2016-07-011-0/+5
|/ / /
| * | Implemt new account layoutFrankie2016-07-016-35/+59
| | |
| * | WIP: Working on new layoutFrankie2016-07-014-82/+114
| | |
| | * Add new user agreementDan Finlay2016-07-012-1/+56
| |/ |/|
* | Fix gitattributesDan Finlay2016-06-301-1/+1
| |
* | Merge branch 'master' of github.com:MetaMask/metamask-pluginDan Finlay2016-06-305-10/+82
|\|
| * Merge pull request #370 from MetaMask/networkIndicationkumavis2016-06-305-10/+82
| |\ | | | | | | Network indication
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-06-309-41/+131
| | |\ | | |/ | |/| | | | networkIndication
| | * Merge branch 'master' into networkIndicationFrankie2016-06-304-6/+10
| | |\
| | * | Add to change logFrankie2016-06-304-21/+22
| | | |
| | * | Add network name to indicator and some css fixesFrankie2016-06-304-11/+51
| | | | | | | | | | | | | | | | | | | | -also fix custom net work bug in drop down where it thinks local:8545 is custom.
| | * | Add ✓ charchter to indicate active networkFrankie2016-06-302-0/+31
| | | |
* | | | Add gitattributes file for the changelogDan Finlay2016-06-301-1/+1
|/ / /
* | | Merge pull request #368 from MetaMask/CopyTxHashkumavis2016-06-309-41/+131
|\ \ \ | |_|/ |/| | Copy tx hash
| * | Unify tooltip stylesDan Finlay2016-06-304-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 CopyTxHashDan Finlay2016-06-303-5/+6
| |\ \ | |/ / |/| |
* | | Unify wording for transaction options (#369)Kevin Serrano2016-06-303-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing.
| * | Add tooltip to copy buttonDan Finlay2016-06-303-10/+43
| | |
| * | Bump changelogDan Finlay2016-06-301-0/+2
| | |
| * | Use clipboard icon for copy buttonDan Finlay2016-06-301-3/+8
| | |
| * | Add copy button to transaction listDan Finlay2016-06-301-0/+3
| | |
| * | Replace manual copy buttons with new CopyButton componentDan Finlay2016-06-302-17/+6
| | |
| * | Add CopyButton componentDan Finlay2016-06-301-0/+26
|/ /
* / Version 2.4.5Dan Finlay2016-06-302-1/+3
|/
* Merge pull request #356 from MetaMask/networkDropdownFixkumavis2016-06-301-0/+21
|\ | | | | Network dropdown fix
| * Remove missused actionFrankie2016-06-291-1/+0
| |
| * Make it so that when you click the custom rpc url it closes the dropdown menuFrankie2016-06-291-1/+1
| |
| * fix lintFrankie2016-06-291-4/+4
| |
| * Merge branch 'master' into networkDropdownFixFrankie2016-06-294-18/+18
| |\ | |/ |/|
* | Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-294-16/+14
| | | | | | | | | | | | * Modify network icons to reflect current design. * Switch icons around.
* | Fix out-of-place positioning of pending tx badges. (#354)Kevin Serrano2016-06-292-2/+4
| |
| * Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* fix bad mergekumavis2016-06-291-6/+1
|
* Merge pull request #352 from MetaMask/pr/351kumavis2016-06-293-7/+5
|\ | | | | Limit account nicknames
| * Merge branch 'master' into pr/351kumavis2016-06-296-87/+39
| |\ | |/ |/| | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
* | Merge pull request #350 from MetaMask/notif2kumavis2016-06-293-82/+28
|\ \ | | | | | | Notifications - improved readability and data
| * \ Merge branch 'master' into notif2kumavis2016-06-298-7/+33
| |\ \ | |/ / |/| |
* | | Merge pull request #345 from MetaMask/FixSomeFormattingkumavis2016-06-294-4/+13
|\ \ \ | | | | | | | | Fix some formatting
| * \ \ Merge branch 'master' into FixSomeFormattingkumavis2016-06-296-5/+30
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
| * | | Merge branch 'master' into FixSomeFormattingkumavis2016-06-291-3/+3
| |\ \ \
| * | | | Simplify `send ether` button to `send`.Dan Finlay2016-06-291-1/+1
| | | | |
| * | | | Fix formatting on terms & conditions pageDan Finlay2016-06-292-1/+2
| | | | |
| | | * | clean - remove svg notifications dockumavis2016-06-291-38/+0
| | | | |
| | | * | fix typokumavis2016-06-291-1/+1
| | | | |
| | | * | background - prepare state for notifcationskumavis2016-06-292-44/+28
| | | | |
| | | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into notif2kumavis2016-06-294-2/+8
| | |/| | | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 23:43:48 +0800