aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* Add reveal of seed words.Kevin Serrano2016-11-022-2/+9
* Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-023-10/+48
* Fix seed phrase restoreDan Finlay2016-11-021-1/+1
* Made progress on parity for MultiVaultKevin Serrano2016-11-024-28/+60
* Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
* Implement seed word confirmation page.Kevin Serrano2016-11-014-10/+29
* Implement auto-faucetingKevin Serrano2016-11-011-1/+6
* Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-313-6/+79
|\
| * Now migrating old vaults to new DEN formatDan Finlay2016-10-293-6/+79
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-293-7/+111
|\|
| * Configure BIP44 Keychain as default oneDan Finlay2016-10-292-7/+25
| * Added hd wallet testsDan Finlay2016-10-281-4/+12
| * Add hd wallet keyringDan Finlay2016-10-281-0/+78
| * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-264-27/+0
| |\
| * \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-261-9/+14
| |\ \
* | \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-291-11/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-2/+2
| |\ \ \
| | * | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
| | * | | Fix delegate call analysisDan Finlay2016-10-261-1/+1
| | | |/ | | |/|
| * / | Rename wallet to accountDan Finlay2016-10-261-1/+1
| |/ /
| * | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-251-1/+1
| |\ \
| * \ \ Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-191-1/+1
| |\ \ \
| * | | | Reproduced issue 743 in test caseDan Finlay2016-10-181-9/+14
* | | | | Phase out extra warning screen.Kevin Serrano2016-10-264-27/+0
| |_|_|/ |/| | |
* | | | Fix loading indicationDan Finlay2016-10-221-1/+1
* | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
* | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-221-3/+5
* | | | Create basic keyring-controller unit test fileDan Finlay2016-10-222-12/+16
* | | | Added SimpleKeyring testsDan Finlay2016-10-223-18/+27
* | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
* | | | Improved simple account generationDan Finlay2016-10-212-34/+51
* | | | Began adding first basic keyringDan Finlay2016-10-214-9/+146
* | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
| | |/ | |/|
* | | Fix testsDan Finlay2016-10-212-7/+9
* | | Linted & added salting to vaultDan Finlay2016-10-213-35/+26
* | | Fix state updating after vault creation and unlockingDan Finlay2016-10-211-2/+2
* | | Fix unlock logicDan Finlay2016-10-211-6/+17
* | | Git merge resolution.Kevin Serrano2016-10-206-4/+56
|\| |
| * | Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-191-1/+1
| |/
| * Restore hex prefix to gas priceDan Finlay2016-10-181-1/+1
| * Increase gas estimate by 100000 weiDan Finlay2016-10-181-1/+9
| * Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-184-0/+33
| |\
| | * Fix for lintingFrankie2016-10-141-1/+1
| | * Create callback and Clean-up detailsFrankie2016-10-141-2/+7
| | * Specify base 10 in bignumberFrankie2016-10-141-1/+1
| | * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-147-37/+58
| | |\
| | * | Fix gasPrice rangeFrankie2016-10-144-4/+25
| | * | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-124-2/+52
| | |\ \
| | * \ \ Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-114-24/+12
| | |\ \ \
| | * | | | Add custom gas field to send pageFrankie2016-10-111-0/+7
| * | | | | Lint.Kevin Serrano2016-10-161-1/+1
| * | | | | Prevent XML from web3 injections.Kevin Serrano2016-10-161-2/+14
| | |_|_|/ | |/| | |
* | | | | Intermediary commit.Kevin Serrano2016-10-202-4/+44
* | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-201-2/+0
* | | | | Merge in crypto.Kevin Serrano2016-10-201-0/+119
* | | | | Initial work on UI sideKevin Serrano2016-10-162-0/+26
* | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into or...Kevin Serrano2016-10-132-13/+133
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-132-14/+92
| * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-134-2/+52
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add initial KeyringController filesDan Finlay2016-10-121-0/+42
| | |_|/ | |/| |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-131-2/+2
|\ \ \ \
| * | | | Remove logs.Kevin Serrano2016-10-131-2/+0
| * | | | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
| | |/ / | |/| |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-134-2/+52
|\| | |
| * | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tosKevin Serrano2016-10-121-0/+2
| |\ \ \
| | * | | Fix bug where new vaults had no nicknamesDan Finlay2016-10-121-0/+2
| * | | | Cleanup.Kevin Serrano2016-10-121-2/+0
| |/ / /
| * | | lintKevin Serrano2016-10-121-2/+1
| * | | Move tos hash comparison logic from background to mm controller.Kevin Serrano2016-10-122-27/+16
| * | | Move tos hash logic to build phase. Create dynamic global variables based on ...Kevin Serrano2016-10-121-1/+2
| * | | Fix linting and guarantees set TOS hash.Kevin Serrano2016-10-071-0/+1
| * | | Fix retention of terms of service hash across reloads of plugin.Kevin Serrano2016-10-071-1/+1
| * | | Renamed variables to make more sense.Kevin Serrano2016-10-071-2/+2
| * | | Add missing path require statement.Kevin Serrano2016-10-071-0/+1
| * | | On update, check whether the TOS has changed using hashes.Kevin Serrano2016-10-061-1/+16
| * | | Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
| * | | Add new functions for storing TOS hashes in config manager.Kevin Serrano2016-10-061-0/+11
| |/ /
* / / dapp reload - fixed disconnect detection via pollingkumavis2016-10-136-35/+56
|/ /
* | Add tolerance for sending from mixed-case addresses.Dan Finlay2016-10-061-2/+2
* | Correct async linkDan Finlay2016-10-061-4/+4
* | Make popup a little tallerDan 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
* Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+5
* Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-161-16/+9
|\
| * 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-132-61/+90
|\
| * Fix cache clearing reference for OperaDan 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
* notif - use standard err-first callback stylekumavis2016-09-031-18/+24
* 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 i#563forgotPasswordFrankie2016-08-266-180/+78
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-252-2/+3
| |\
| * | 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
| |\ \
| * | | Limit to one popup, re-focus on additional notifications.Dan Finlay2016-08-231-6/+17
| * | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-233-0/+41
| |\ \ \
| * | | | LintedDan Finlay2016-08-171-15/+5
| * | | | MVP Popup Notifications WorkingDan Finlay2016-08-173-87/+3
| * | | | Unify notification and popup ui filesDan Finlay2016-08-174-2/+21
| * | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-173-0/+81
| |\ \ \ \
| * | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-173-128/+95
* | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-264-5/+38
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-251-2/+2
| |\ \ \ \ \
| | * | | | | Implement usage of nock.Kevin Serrano2016-08-251-22/+12
| | * | | | | Added mock option to function.Kevin Serrano2016-08-251-13/+23
| | | |_|_|/ | | |/| | |
| * | | | | 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 kumavis-patch-1kumavis2016-08-231-0/+6
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into i390-TransactionLimitkumavis2016-08-231-2/+28
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-233-0/+41
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Enforce tx history limitDan Finlay2016-08-191-0/+6
| | | |_|_|/ | | |/| | |
| * | | | | inpage - cleanContextForImports fixkumavis2016-08-231-1/+1
| | |_|/ / | |/| | |
| * | | | inpage provider - reassign incomming idskumavis2016-08-231-2/+28
| | |/ / | |/| |
* / | | Add a back button on lock screen to go back to init menuFrankie2016-08-261-0/+5
|/ / /
* | | Create a ShapeShift tx in tx HistoryFrankie2016-08-192-7/+8
* | | Merge branch 'master' into shapeshiftTxFrankie2016-08-193-0/+81
|\| |
| * | 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 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
| * | 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-056-15/+51
| |\ \
| * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-233-5/+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-2210-33/+107
| |\ \ \ \
| * | | | | 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
|/ / / /
* | | | Fix account selection updatingDan Finlay2016-07-301-0/+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
|/ / / /
* | | | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-271-1/+1
* | | | 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
| |_|/ |/| |
* | | Buy button (#474)Frankie2016-07-223-1/+40
| |/ |/|
* | Implement some cross-browser practices (#473)Dan Finlay2016-07-228-30/+88
* | Make injected web3 fail hard on sync methods (#471)Dan Finlay2016-07-211-1/+9
* | typo fixkumavis2016-07-191-1/+1
* | inpage - add try/catch to cleanContextForImportskumavis2016-07-191-2/+10
|/
* new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-141-17/+37
* Add one wallet to new accounts instead of three.Kevin Serrano2016-07-131-1/+1
* LintedDan Finlay2016-07-122-14/+9
* Add notification global for developmentDan Finlay2016-07-121-1/+3
* Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
* 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
* Simplify error logDan Finlay2016-07-061-2/+1
* Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
* 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
* 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
|/
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 14:23:04 +0800