aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-061-12/+18
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-061-1/+1
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| * | remove unnecessary try statmentsFrankie2017-01-051-2/+1
| * | Merge branch 'dev' into fixtTxManagerFrankie2017-01-051-15/+24
| |\ \
| * | | Fix signing of transactionsFrankie2017-01-051-11/+19
* | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-061-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| | |/ | |/|
* / | MetaMask Controller - Convert to EventEmitterFrankie2017-01-061-6/+5
|/ /
* | Fix sendUpdate for new promisified getState methodDan Finlay2017-01-041-2/+6
* | Update UI state on ethStore updatesDan Finlay2017-01-041-0/+2
* | Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-031-8/+27
|\|
| * Merge branch 'dev' into TxManagerFrankie2016-12-241-2/+78
| |\
| * | fix some minor spelling mistakes and clean up codeFrankie2016-12-241-8/+2
| * | fix mergeFrances Pangilinan2016-12-221-1/+1
| * | Merge branch 'dev' into TxManagerFrankie2016-12-221-8/+24
| |\ \
| * | | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-221-2/+12
| * | | First pass at revision requestsFrances Pangilinan2016-12-221-18/+20
| * | | Create a TxManagerFrances Pangilinan2016-12-151-2/+14
* | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccountsDan Finlay2016-12-241-2/+2
|\ \ \ \
| * | | | Add additional migration testDan Finlay2016-12-241-2/+2
| | |_|/ | |/| |
* / | | Return keyring metadata on metamask state objectDan Finlay2016-12-231-10/+13
|/ / /
* | | Break up migration functionDan Finlay2016-12-231-24/+24
* | | Don't bother changing selected accounts since accounts are recoveredDan Finlay2016-12-231-13/+3
* | | Remove logsDan Finlay2016-12-231-2/+2
* | | LintedDan Finlay2016-12-221-4/+3
* | | Restructured migrationDan Finlay2016-12-221-19/+43
* | | Move old keystore migration code to metamask controllerDan Finlay2016-12-221-1/+49
* | | Make notices confirmation configurableDan Finlay2016-12-211-1/+16
| |/ |/|
* | Merged master into devDan Finlay2016-12-201-9/+24
|\ \ | |/ |/|
| * move notice code from metamask-controller + config-manager, in to notice-cont...kumavis2016-12-171-46/+19
| * Deactivate polling for now.Kevin Serrano2016-12-171-1/+3
| * CleanupDan Finlay2016-12-171-3/+0
| * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-18/+22
| * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-2/+40
| * Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-1/+1
| * Add to changelog.Kevin Serrano2016-11-231-1/+1
* | Ordered keyringController methods the same in metamask-controllerDan Finlay2016-11-301-4/+4
* | Fix nodeify usageDan Finlay2016-11-291-11/+11
* | Denodeify most of KeyringControllerDan Finlay2016-11-291-11/+15
* | Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-231-1/+1
|\ \
| * | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-1/+1
* | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-221-0/+6
* | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-5/+5
|/ /
* | Resolve merge conflicts.Kevin Serrano2016-11-161-1/+0
|\|
| * First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-151-1/+0
* | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-2/+2
* | Linting to the max.Kevin Serrano2016-11-121-21/+2
* | fix tx data so it has the network idFrankie2016-11-111-0/+6
* | Merge branch 'master' into i328-MultiVaultFrankie2016-11-111-1/+0
|\|
| * Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-101-1/+0
* | Add reveal of seed words.Kevin Serrano2016-11-021-0/+1
* | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-021-3/+2
* | Made progress on parity for MultiVaultKevin Serrano2016-11-021-1/+2
* | Implement seed word confirmation page.Kevin Serrano2016-11-011-0/+1
* | Configure BIP44 Keychain as default oneDan Finlay2016-10-291-0/+1
* | Phase out extra warning screen.Kevin Serrano2016-10-261-10/+0
* | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-221-1/+2
* | Added tx and msg signing to keychain & controllerDan Finlay2016-10-211-34/+34
* | Began adding first basic keyringDan Finlay2016-10-211-0/+2
* | Git merge resolution.Kevin Serrano2016-10-201-0/+9
|\|
| * Fix for lintingFrankie2016-10-141-1/+1
| * Create callback and Clean-up detailsFrankie2016-10-141-2/+7
| * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-141-2/+2
| |\
| * | Fix gasPrice rangeFrankie2016-10-141-0/+5
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into or...Kevin Serrano2016-10-131-13/+31
|\ \ \ | |_|/ |/| |
| * | Add minimal method signatures to new keyring controllerDan Finlay2016-10-131-13/+31
| |/
* | Remove logs.Kevin Serrano2016-10-131-2/+0
* | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
|/
* 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-121-10/+15
* 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
* Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
* 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
* Change Testfaucet urlFrankie2016-09-161-1/+1
* Ensure listener is cleaned upDan Finlay2016-09-071-1/+1
* Add negative value validation to tx approvalDan Finlay2016-09-071-0/+10
* Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+1
|\
| * LintedDan Finlay2016-08-251-1/+1
| * Fix bug where unconfirmed message sig is lost when locked.Dan Finlay2016-08-251-0/+1
* | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-241-5/+17
|/
* Create a ShapeShift tx in tx HistoryFrankie2016-08-191-3/+2
* Merge branch 'master' into shapeshiftTxFrankie2016-08-191-0/+30
|\
| * Fix uncalled fn.Kevin Serrano2016-08-171-1/+1
| * Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-171-1/+0
| * Merge master.Kevin Serrano2016-08-161-3/+7
| |\
| * | 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
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-051-0/+1
| |\ \
| * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-231-5/+34
| |\ \ \
| * | | | Linting!Kevin Serrano2016-07-231-2/+4
| * | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-221-1/+13
| * | | | Add date access throughout the data flow.Kevin Serrano2016-07-221-0/+1
| * | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-221-3/+4
| |\ \ \ \
| * | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-221-1/+6
| * | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-221-0/+10
* | | | | | WIP: ShapeShift txFrankie2016-08-191-0/+6
| |_|_|_|/ |/| | | |
* | | | | Add global var for background.Kevin Serrano2016-08-121-2/+6
* | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-121-7/+2
* | | | | Separate developmentMode conditional to only wrap log.Kevin Serrano2016-08-121-2/+4
* | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-121-1/+1
|\ \ \ \ \
| * | | | | Fix ether warning checkbox.Kevin Serrano2016-08-111-1/+1
| | |_|_|/ | |/| | |
* / | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-121-2/+5
|/ / / /
* | | / Fix account selection updatingDan Finlay2016-07-301-0/+1
| |_|/ |/| |
* | | Buy button (#474)Frankie2016-07-221-0/+28
| |/ |/|
* | Implement some cross-browser practices (#473)Dan Finlay2016-07-221-3/+4
|/
* Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
* Simplify error logDan Finlay2016-07-061-2/+1
* Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
* fix typokumavis2016-07-011-1/+1
* Debugged by using a real dappDan Finlay2016-06-251-3/+4
* Manually debugged refactorDan Finlay2016-06-251-9/+9
* Fixed testsDan Finlay2016-06-251-11/+12
* Rename background-controller metamask-controllerDan Finlay2016-06-251-0/+255
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:44:27 +0800