grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15d4bc9d6d
openethereum/js/src/views/Accounts/CreateAccount
History
Jaco Greeff 7bbd48a2bd Merge branch 'master' into ui-2 
# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js
2017-06-13 11:02:38 +02:00
..
AccountDetails Merge branch 'master' into ui-2 2017-06-13 11:02:38 +02:00
AccountDetailsGeth Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
ChangeVault Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
CreationType Merge branch 'master' into ui-2 2017-05-19 14:55:13 +02:00
GethCard Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
NewAccount Ui 2 additional MUI replacements (#5623) 2017-05-15 14:49:47 +02:00
NewGeth Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
NewImport Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
NewQr Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
RawKey Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
RecoveryPhrase Merge branch 'master' into ui-2 2017-05-19 14:55:13 +02:00
TypeIcon Ui 2 radios & imports (#5609) 2017-05-12 12:06:16 +02:00
createAccount.css Merge branch 'master' into ui-2 2017-06-13 11:02:38 +02:00
createAccount.js Merge branch 'master' into ui-2 2017-06-13 11:02:38 +02:00
createAccount.spec.js UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00
createAccount.test.js Merge branch 'master' into ui-2 2017-06-08 11:51:46 +02:00
errors.js Merge branch 'master' into ui-2 2017-06-13 11:02:38 +02:00
index.js UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00
print.js UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00
recoveryPage.ejs UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00
store.js Merge branch 'master' into ui-2 2017-06-13 11:02:38 +02:00
store.spec.js Merge branch 'master' into ui-2 2017-06-08 11:51:46 +02:00