Alexander Tseung 4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254		2018-04-05 23:17:22 -07:00
..
accounts/new-account	event object actually passed to this.createKeyringOnEnter in private-key.js	2018-04-04 21:18:12 -02:30
components	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -07:00
css	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
first-time	Fix lint errors	2018-04-02 16:24:37 -07:00
img
keychains/hd	Use new design for showing seed words	2018-04-03 18:20:51 -07:00
reducers	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
account-and-transaction-details.js
actions.js	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
app.js	commit	2018-04-03 17:43:42 -07:00
conf-tx.js	Fix transaction confirmations	2018-04-03 16:59:32 -07:00
conversion-util.js
i18n-provider.js	Add withRouter to I18nProvider component	2018-04-02 13:15:31 -07:00
infura-conversion.json
main-container.js	Fix merge conflicts	2018-03-27 00:20:35 -07:00
metamask-connect.js	Memoize t function in metamask-connect	2018-03-23 14:21:32 -02:30
new-keychain.js	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30
reducers.js	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
root.js	Stopping wrapping provider children in div; stop wrapping old-ui in provider.	2018-03-29 20:16:45 -02:30
routes.js	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
select-app.js	Fix merge conflicts	2018-03-30 16:18:48 -07:00
selectors.js	Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs	2018-03-21 12:53:28 -07:00
send-v2.js	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -07:00
store.js	build - correctly set METAMASK_ENV via envify	2018-04-03 09:51:33 -07:00
token-util.js
unlock.js	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30
util.js	Change double-quotes to single-quotes	2018-04-04 16:42:54 -07:00
welcome-screen.js	Fix lint errors	2018-04-02 16:24:37 -07:00