aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into SmallerCopiedButtonkumavis2016-10-053-2/+3
|\
| * Add Opera compatibilityDan Finlay2016-10-053-2/+3
* | Make popup a little tallerDan Finlay2016-10-051-1/+1
|/
* Version 2.13.2Dan Finlay2016-10-051-1/+1
* Improve popup behavior for parity errorsDan Finlay2016-10-041-17/+5
* Fix for readabilityFrankie2016-10-021-1/+1
* Fix issue #688 where fiat conversion does not persist when switching networksFrankie2016-10-011-1/+2
* Version 2.13.12.13.1Dan Finlay2016-09-231-1/+1
* Version 2.13.0Dan Finlay2016-09-191-1/+1
* Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+5
* Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-162-17/+10
|\
| * Version 2.12.12.12.1Dan Finlay2016-09-151-1/+1
| * Merge branch 'master' into i#626Frankie2016-09-151-1/+1
| |\
| | * Version 2.12.02.12.0Dan Finlay2016-09-151-1/+1
| | * Version 2.11.2Dan Finlay2016-09-151-1/+1
| * | Remove unused argumentFrankie2016-09-151-1/+1
| * | Fix popup flag assignmentDan Finlay2016-09-151-2/+1
| * | Dont generate a popup notification when submiting a transaction from with in ...Frankie2016-09-151-17/+11
| |/
* / Change Testfaucet urlFrankie2016-09-161-1/+1
|/
* Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
|\
| * Fix port stream end bugDan Finlay2016-09-141-2/+1
|/
* Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-133-62/+91
|\
| * Fix cache clearing reference for OperaDan Finlay2016-09-132-2/+2
| * Version 2.11.0Dan Finlay2016-09-131-1/+1
| * Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
| * Fix clearing of account cache on vault restoreDan Finlay2016-09-131-3/+7
| * LintedDan Finlay2016-09-131-2/+2
| * Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
| * Add accounts back to metamask stateDan Finlay2016-09-131-1/+5
| * Fix keystore referenceDan Finlay2016-09-131-0/+1
| * Fix some referencesDan Finlay2016-09-131-2/+2
| * Fix account unlockingDan Finlay2016-09-132-10/+21
* | mascara - everything but the popup bundlekumavis2016-09-131-1/+1
* | popup - breakout popup-corekumavis2016-09-132-61/+71
* | popup - further clean and commentkumavis2016-09-131-17/+13
* | ui - remove unused currentDomain propkumavis2016-09-131-17/+2
* | Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-131-64/+61
|/
* Select first address when restoring vaultDan Finlay2016-09-121-2/+10
* Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
* Fixed caching bugDan Finlay2016-09-111-6/+1
* Correctly clear ethStore cache on new vault restoreDan Finlay2016-09-111-7/+16
* Captured #640 in failing testDan Finlay2016-09-111-0/+5
* Add new eth-lightwallet salting to vault.Dan Finlay2016-09-101-57/+43
* Do not trigger how-to-video on anything but install.Kevin Serrano2016-09-101-2/+4
* Only init one wallet on restoreDan Finlay2016-09-091-1/+1
* Reverting memory leak fixDan Finlay2016-09-071-1/+0
* Bump changelogDan Finlay2016-09-071-25/+0
* Ensure listener is cleaned upDan Finlay2016-09-073-1/+27
* Merge branch 'master' into first-timeKevin Serrano2016-09-071-0/+10
|\
| * Add negative value validation to tx approvalDan Finlay2016-09-071-0/+10
* | Replace chrome with generalized browser API.Kevin Serrano2016-09-071-2/+2
* | Redirect to video in a new tab on fresh install.Kevin Serrano2016-09-071-1/+6
|/
* lintingVincent Serpoul2016-09-061-1/+1
* Error message more helpfulVincent Serpoul2016-09-061-2/+3
* Version 2.10.2kumavis2016-09-031-1/+1
* notif - use standard err-first callback stylekumavis2016-09-031-18/+24
* Version 2.10.1kumavis2016-09-031-1/+1
* Merge branch 'master' into i566-NoPopupWhenOpenDan Finlay2016-09-021-4/+18
|\
| * inpage - remap ids on responsekumavis2016-09-011-4/+18
* | LintedDan Finlay2016-09-021-1/+1
* | Do not open popup for internally produced txsDan Finlay2016-09-021-11/+19
|/
* Add metamask route to infura urlsDan Finlay2016-09-011-2/+2
* Remove old notification cleanup codeDan Finlay2016-08-301-10/+0
* Make popup a type Edge supportsDan Finlay2016-08-301-1/+2
* Add extra edge compatibilityDan Finlay2016-08-301-2/+13
* Fix console.error referencesDan Finlay2016-08-301-3/+3
* Remove bind calls from console errorsDan Finlay2016-08-301-4/+4
* Merge branch 'master' into EdgeCompatibilityDan Finlay2016-08-3022-324/+329
|\
| * Version 2.10.0Dan Finlay2016-08-301-1/+1
| * Merge branch 'master' into i#563forgotPasswordFrankie2016-08-267-180/+94
| |\
| | * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-261-5/+5
| | |\
| | * \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-253-3/+4
| | |\ \
| | * \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+10
| | |\ \ \
| | * \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-241-0/+0
| | |\ \ \ \
| | * | | | | Close notification on opening main UIDan Finlay2016-08-242-2/+16
| | * | | | | Skip popup dismissal in testsDan Finlay2016-08-241-0/+6
| | * | | | | LintedDan Finlay2016-08-241-1/+0
| | * | | | | Close popup even if last tx is dismissed from main UIDan Finlay2016-08-241-8/+14
| | * | | | | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-243-53/+23
| | * | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-233-3/+35
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-233-0/+30
| | |\ \ \ \ \ \
| | * | | | | | | Limit to one popup, re-focus on additional notifications.Dan Finlay2016-08-231-6/+17
| | * | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-234-1/+42
| | |\ \ \ \ \ \ \
| | * | | | | | | | LintedDan Finlay2016-08-171-15/+5
| | * | | | | | | | MVP Popup Notifications WorkingDan Finlay2016-08-173-87/+3
| | * | | | | | | | Unify notification and popup ui filesDan Finlay2016-08-175-3/+27
| | * | | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-174-0/+82
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-174-128/+106
| * | | | | | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-269-6/+79
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Bump versioning.Kevin Serrano2016-08-251-1/+1
| | * | | | | | | | | Merge branch 'master' into shortcut-fixKevin Serrano2016-08-251-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Version 2.9.1Dan Finlay2016-08-251-1/+1
| | * | | | | | | | | Fixed prohibited shortcut combination.Kevin Serrano2016-08-251-4/+4
| | |/ / / / / / / /
| | * | | | | | | | Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-252-2/+12
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Implement usage of nock.Kevin Serrano2016-08-251-22/+12
| | | * | | | | | | | Added mock option to function.Kevin Serrano2016-08-251-13/+23
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Change shortcut again to Ctrl+Alt+MKevin Serrano2016-08-251-4/+4
| | | * | | | | | | Change shortcut to Alt+MKevin Serrano2016-08-251-4/+4
| | | * | | | | | | Add shortcut for opening MetaMask.Kevin Serrano2016-08-241-0/+10
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | LintedDan Finlay2016-08-251-1/+1
| | * | | | | | | Fix bug where unconfirmed message sig is lost when locked.Dan Finlay2016-08-251-0/+1
| | |/ / / / / /
| | * | | | | | Merge branch 'master' into fox-subKevin Serrano2016-08-246-3/+65
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch 'master' into kumavis-patch-1kumavis2016-08-231-0/+6
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into i390-TransactionLimitkumavis2016-08-234-2/+58
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-234-1/+42
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | * | | | | | Enforce tx history limitDan Finlay2016-08-191-0/+6
| | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | inpage - cleanContextForImports fixkumavis2016-08-231-1/+1
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch 'master' into i479kumavis2016-08-233-0/+30
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | First part of chinese translation.Kevin Serrano2016-08-231-0/+10
| | | | * | | | Add spanish locales.Kevin Serrano2016-08-232-0/+20
| | | | | |/ / | | | | |/| |
| | | * / | | inpage provider - reassign incomming idskumavis2016-08-231-2/+28
| | | |/ / /
| | * / / / Created option to pass in static file for fallback for logo.Kevin Serrano2016-08-241-0/+0
| | |/ / /
| * / / / Add a back button on lock screen to go back to init menuFrankie2016-08-261-0/+5
| |/ / /
| * | | Version 2.9.0Dan Finlay2016-08-231-1/+1
| * | | Create a ShapeShift tx in tx HistoryFrankie2016-08-192-7/+8
| * | | Merge branch 'master' into shapeshiftTxFrankie2016-08-195-1/+83
| |\| |
| | * | Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-171-3/+3
| | * | Fix uncalled fn.Kevin Serrano2016-08-171-1/+1
| | * | Add fallback to API failure.Kevin Serrano2016-08-171-0/+2
| | * | Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-171-1/+0
| | * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-171-1/+1
| | |\|
| | | * Version 2.8.0Dan Finlay2016-08-161-1/+1
| | * | Merge master.Kevin Serrano2016-08-1611-140/+30
| | |\|
| | * | Did not previously call functions before!Kevin Serrano2016-08-101-3/+3
| | * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-101-1/+1
| | * | Enable full listing of supported currencies by Cryptonator.Kevin Serrano2016-08-101-0/+1
| | * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-061-6/+0
| | * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-057-18/+59
| | |\ \
| | * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-234-10/+52
| | |\ \ \
| | * | | | Linting!Kevin Serrano2016-07-232-3/+5
| | * | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-222-8/+31
| | * | | | Add date access throughout the data flow.Kevin Serrano2016-07-223-4/+6
| | * | | | Provide date access.Kevin Serrano2016-07-221-1/+8
| | * | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-2211-34/+113
| | |\ \ \ \
| | * | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-222-2/+9
| | * | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-221-0/+10
| | * | | | | Progress on config manager. Plus tests.Kevin Serrano2016-07-211-0/+27
| * | | | | | WIP: ShapeShift txFrankie2016-08-193-0/+40
| | |_|_|_|/ | |/| | | |
| * | | | | Remove ethereum classic providerDan Finlay2016-08-152-7/+1
| * | | | | deps - extracted ensnare to modulekumavis2016-08-132-25/+1
| * | | | | Add global var for background.Kevin Serrano2016-08-124-5/+15
| * | | | | Merge github.com:MetaMask/metamask-plugin into logging-fixKevin Serrano2016-08-124-100/+7
| |\ \ \ \ \
| | * | | | | inpage-prov - sync error - fix linkkumavis2016-08-121-1/+1
| | * | | | | deps - local-message-stream extracted as module post-message-streamkumavis2016-08-123-58/+2
| | * | | | | clean -formattingkumavis2016-08-121-2/+2
| | * | | | | inpage-provider - remove createSyncProvider, just failkumavis2016-08-121-40/+3
| * | | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-122-9/+2
| * | | | | | Setting defaults to production.Kevin Serrano2016-08-121-1/+1
| * | | | | | Separate developmentMode conditional to only wrap log.Kevin Serrano2016-08-121-2/+4
| * | | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-122-3/+7
| |\| | | | |
| | * | | | | Fix ether warning checkbox.Kevin Serrano2016-08-112-3/+7
| | | |_|_|/ | | |/| | |
| * | | | | LintKevin Serrano2016-08-121-1/+1
| * | | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-122-3/+7
| |/ / / /
* / / / / Add MSFT Edge keys to manifest.jsonDan Finlay2016-08-081-1/+3
|/ / / /
* | | | Version 2.7.3Dan Finlay2016-07-301-1/+1
* | | | Fix account selection updatingDan Finlay2016-07-301-0/+1
* | | | Version 2.7.2Dan Finlay2016-07-301-1/+1
* | | | Merge branch 'master' into AddEthClassicDan Finlay2016-07-291-1/+1
|\ \ \ \
| * | | | Fix broken reference to host store.didUpdateDan Finlay2016-07-291-1/+1
* | | | | Add eth classic to provider menuDan Finlay2016-07-293-1/+6
|/ / / /
* | | | Version 2.7.1Dan Finlay2016-07-281-1/+1
* | | | Enhance manifest detailsDan Finlay2016-07-271-2/+2
* | | | Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuildDan Finlay2016-07-271-1/+1
|\ \ \ \
| * | | | Version 2.7.02.7.0Dan Finlay2016-07-221-1/+1
* | | | | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-272-1/+6
* | | | | Fix integration testsDan Finlay2016-07-261-4/+19
* | | | | Fix extension testsDan Finlay2016-07-262-2/+5
* | | | | Inject inpage script synchronouslyDan Finlay2016-07-261-1/+12
* | | | | Clean up extension polyfill abstractionDan Finlay2016-07-262-14/+14
* | | | | Allow page injection to look for cross-browser APIs appropriatelyDan Finlay2016-07-261-1/+2
| |_|_|/ |/| | |
* | | | Manifest fix for firefox-specific field (#475)Kevin Serrano2016-07-221-5/+0
|/ / /
* | / Buy button (#474)Frankie2016-07-223-1/+40
| |/ |/|
* | Implement some cross-browser practices (#473)Dan Finlay2016-07-229-30/+93
* | Make injected web3 fail hard on sync methods (#471)Dan Finlay2016-07-211-1/+9
* | Version 2.6.2 (#470)2.6.2Dan Finlay2016-07-211-1/+1
* | typo fixkumavis2016-07-191-1/+1
* | inpage - add try/catch to cleanContextForImportskumavis2016-07-191-2/+10
|/
* Version 2.6.1 (#442)Dan Finlay2016-07-141-1/+1
* new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-141-17/+37
* Add Japanese localization file.Kevin Serrano2016-07-141-0/+10
* Fix MetaMask title for EN.Kevin Serrano2016-07-141-1/+1
* Add one wallet to new accounts instead of three.Kevin Serrano2016-07-131-1/+1
* LintedDan Finlay2016-07-122-14/+9
* Merge branch 'master' into FixSvgIconsDan Finlay2016-07-121-1/+1
|\
| * Version 2.6Dan Finlay2016-07-121-1/+1
* | Add notification global for developmentDan Finlay2016-07-121-1/+3
|/
* Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-081-8/+7
|\
| * Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
* | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-072-5/+6
|\|
| * contentscript - remove timeout before stream setupkumavis2016-07-071-1/+1
| * appease the linting godskumavis2016-07-072-4/+1
| * web3 injection - use web3 dist for faster injectionkumavis2016-07-072-5/+9
* | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-075-2/+4
|\|
| * Merge branch 'master' into thinFontFrankie2016-07-061-2/+4
| |\
| | * Simplify error logDan Finlay2016-07-061-2/+1
| | * Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
| * | Add light and ultraLight fontsFrankie2016-07-064-0/+0
| |/
* / Began reworking tx conf viewDan Finlay2016-07-071-0/+74
|/
* Version 2.5.0Dan Finlay2016-07-021-1/+1
* Merge pull request #378 from MetaMask/UiDevkumavis2016-07-011-2/+4
|\
| * First simple version of ui mockerDan Finlay2016-07-011-2/+4
* | fix typokumavis2016-07-011-1/+1
* | Remove useless and buggy clearWallet functionDan Finlay2016-07-012-5/+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-011-1/+1
|/
* Unify wording for transaction options (#369)Kevin Serrano2016-06-301-2/+2
* Version 2.4.5Dan Finlay2016-06-301-1/+1
* fix bad mergekumavis2016-06-291-6/+1
* Merge branch 'master' into notif2kumavis2016-06-292-1/+16
|\
| * Merge branch 'master' into FixSomeFormattingkumavis2016-06-292-1/+16
| |\
| | * Move clearNotifications to popup.jsFrankie2016-06-291-0/+10
| | * fix #341 close notifications when oppening pop upFrankie2016-06-291-2/+2
* | | fix typokumavis2016-06-291-1/+1
* | | background - prepare state for notifcationskumavis2016-06-292-44/+28
|/ /
* / notif - change size for better readabilitykumavis2016-06-281-3/+3
|/
* Merge pull request #326 from MetaMask/conf-tx-refactorkumavis2016-06-252-53/+79
|\
| * clean - appease the linting machinekumavis2016-06-251-1/+0
| * svg notif now work for msg signatureskumavis2016-06-252-51/+79
| * breakout pending-tx-detailskumavis2016-06-251-4/+3
* | Debugged by using a real dappDan Finlay2016-06-251-3/+4
* | Manually debugged refactorDan Finlay2016-06-252-13/+14
* | Fixed testsDan Finlay2016-06-254-18/+21
* | Rename background-controller metamask-controllerDan Finlay2016-06-252-4/+4
* | Improve refactorDan Finlay2016-06-256-105/+124
* | Refactored background.js controller apart from chrome + transportDan Finlay2016-06-252-254/+301
|/
* contentscript - skip web3 injection if domain appears to be a pdfkumavis2016-06-251-32/+48
* notif - remove dummy dev notifkumavis2016-06-241-7/+0
* some legit linting fixeskumavis2016-06-241-0/+1
* svg notif - use actual txParamskumavis2016-06-241-15/+5
* tx-conf add non-interactive mode for notificationkumavis2016-06-241-0/+1
* svg notifications - remove unneeded deps and clean codekumavis2016-06-241-50/+31
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notifkumavis2016-06-2426-10632/+93
|\
| * 2.4.4kumavis2016-06-241-1/+1
| * 2.4.3kumavis2016-06-241-1/+1
| * Merge branch 'master' into fontChangeFrankie2016-06-232-7/+9
| |\
| * | Swap out Transat font for MontserratFrankie2016-06-2325-10631/+92
* | | initial svg notificationskumavis2016-06-232-16/+108
| |/ |/|
* | Version 2.4.2Dan Finlay2016-06-231-1/+1
* | Fix eth sign with dennis' test inputDan Finlay2016-06-221-6/+8
|/
* Fix conflictFrankie2016-06-2222-1405/+1342
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-221-11/+15
| |\
| | * background - batch rpc fix for origin domainkumavis2016-06-221-12/+15
| * | Manually lintedDan Finlay2016-06-225-27/+17
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-222-1/+3
| |\|
| * | Auto lintedDan Finlay2016-06-2222-1373/+1320
| * | Some manual fixesDan Finlay2016-06-221-3/+0
* | | add key.pngFrankie2016-06-221-0/+0
| |/ |/|
* | 2.4.1kumavis2016-06-211-1/+1
* | id-mgmt - add missing depskumavis2016-06-211-0/+3
|/
* Version 2.4.0Dan Finlay2016-06-211-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 04:51:57 +0800