crptm
|
b5414c5f81
|
update .editorconfig
|
2017-07-04 15:16:08 +04:00 |
Daniel Ternyak
|
27cb5fbee0
|
Merge pull request #29 from MyEtherWallet/onetime_reformat
reformat everything
|
2017-07-03 22:32:50 -05:00 |
|
Daniel Ternyak
|
12fa008755
|
reformat everything
|
2017-07-03 22:28:56 -05:00 |
|
Daniel Ternyak
|
bd531c91fc
|
Merge pull request #26 from MyEtherWallet/swap_part_3
Swap part 3
|
2017-07-03 22:25:17 -05:00 |
|
Daniel Ternyak
|
06ae70988a
|
merge develop into 'swap_part_3'
|
2017-07-03 22:21:19 -05:00 |
|
Daniel Ternyak
|
51899e8f4e
|
Merge pull request #12 from MyEtherWallet/wallet-decrypt
WIP: Wallet decrypt
|
2017-07-03 22:16:14 -05:00 |
|
crptm
|
4b6f20dd63
|
remove dupe ethereumjs-util
|
2017-07-04 06:44:08 +04:00 |
|
crptm
|
8696213e91
|
fix test
|
2017-07-04 06:42:52 +04:00 |
|
crptm
|
bead2b30ad
|
fix merge errors
|
2017-07-04 06:22:16 +04:00 |
|
crptm
|
40f2c4466a
|
merge develop
|
2017-07-04 06:18:16 +04:00 |
|
crptm
|
85759d73b4
|
type dropdown, config actions
|
2017-07-04 05:25:01 +04:00 |
|
Daniel Ternyak
|
20b1d85bb8
|
undo donation address hardcode temp
|
2017-07-03 19:39:36 -05:00 |
|
Daniel Ternyak
|
6ca8b2ece0
|
Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet into swap_part_3
|
2017-07-03 19:27:33 -05:00 |
|
Daniel Ternyak
|
ceb520d051
|
Merge pull request #27 from MyEtherWallet/donation_addresses
Fix instances where donation addresses were hardcoded
|
2017-07-03 19:27:22 -05:00 |
|
Daniel Ternyak
|
6b24a920d6
|
Merge branch 'donation_addresses' into swap_part_3
|
2017-07-03 19:25:51 -05:00 |
|
Daniel Ternyak
|
7846b2125a
|
merge develop info 'donation_addresses'
|
2017-07-03 19:24:22 -05:00 |
|
Daniel Ternyak
|
164e6a07bb
|
fix additional hardcoded address issues
|
2017-07-03 19:20:47 -05:00 |
|
crptm
|
13bb96e966
|
merge develop
|
2017-07-04 04:17:57 +04:00 |
|
Daniel Ternyak
|
29be2821a3
|
refactor donation addresses map; fix hardcoded instance of address in send
|
2017-07-03 19:16:20 -05:00 |
|
crptm
|
8603bbee2d
|
Revert "try building with node 6"
This reverts commit 9815d3e428.
|
2017-07-04 04:13:35 +04:00 |
|
crptm
|
9815d3e428
|
try building with node 6
|
2017-07-04 04:11:10 +04:00 |
|
Daniel Ternyak
|
8f77aedc70
|
swapProgress: create computed class for active step; cleanup
|
2017-07-03 19:09:33 -05:00 |
|
Daniel Ternyak
|
513b4c67b9
|
Bity: refactor and remove unnecessary class
|
2017-07-03 19:08:35 -05:00 |
|
crptm
|
65234a26c0
|
fix flow sagas errors
|
2017-07-04 03:59:27 +04:00 |
|
Daniel Ternyak
|
62150fb63b
|
swapProgress: add translations and remove ng-scopes
|
2017-07-03 16:53:02 -05:00 |
|
Daniel Ternyak
|
73d54f562d
|
merge develop info 'swap_part_3'
|
2017-07-03 13:23:44 -05:00 |
|
Daniel Ternyak
|
eaf76fb177
|
Merge pull request #23 from MyEtherWallet/feat/send-page
Send part1
|
2017-07-03 12:59:57 -05:00 |
|
Daniel Ternyak
|
4c3f3b8cd1
|
Merge branch 'develop' into feat/send-page
|
2017-07-03 12:50:36 -05:00 |
|
Daniel Ternyak
|
57fe301af6
|
Merge pull request #24 from MyEtherWallet/hot_reload
Keep redux state across hot module reloads
|
2017-07-03 12:30:42 -05:00 |
|
Daniel Ternyak
|
727a6d3975
|
Keep redux state across hot module reloads
|
2017-07-02 12:55:58 -05:00 |
|
Daniel Ternyak
|
7cf3d26bbe
|
Merge feat/send-page
|
2017-07-02 00:49:06 -05:00 |
|
Daniel Ternyak
|
b623a3efe9
|
Swap Part 3 WIP
|
2017-07-02 00:45:22 -05:00 |
|
crptm
|
63e7eb89e4
|
unlock wip
|
2017-06-30 03:03:11 +04:00 |
|
crptm
|
dbb90d0d5c
|
Merge branch 'feat/send-page' into wallet-decrypt
|
2017-06-27 03:39:04 +04:00 |
|
crptm
|
6fce9029c5
|
fix spec
|
2017-06-27 03:38:45 +04:00 |
|
crptm
|
d6b7cca10a
|
merge send-tx
|
2017-06-27 03:36:21 +04:00 |
|
crptm
|
0ad93101e7
|
validators merge
|
2017-06-27 03:27:26 +04:00 |
|
crptm
|
240007fe43
|
merge develop
|
2017-06-27 03:13:21 +04:00 |
|
crptm
|
9f2a209da5
|
typing fixes
|
2017-06-27 03:08:52 +04:00 |
|
Daniel Ternyak
|
2acd78473d
|
Merge pull request #21 from MyEtherWallet/swap_part_2
Swap Part 2
|
2017-06-26 18:08:18 -05:00 |
|
crptm
|
96c8c88ab6
|
remove obsolete comment
|
2017-06-27 02:46:15 +04:00 |
|
crptm
|
1fb4a004ac
|
send wip
|
2017-06-27 02:27:55 +04:00 |
|
Daniel Ternyak
|
afe2adbb5a
|
add translation support
|
2017-06-25 00:57:43 -05:00 |
|
Daniel Ternyak
|
142ed3adc5
|
Add tests for Validator
|
2017-06-24 15:46:30 -05:00 |
|
Daniel Ternyak
|
dab75a48b0
|
address comments
|
2017-06-24 15:39:03 -05:00 |
|
Daniel Ternyak
|
738606bdf0
|
Merge branch 'swap_part_2_more' into swap_part_2
|
2017-06-24 15:05:26 -05:00 |
|
Daniel Ternyak
|
d5875614de
|
create simplified toFixedIfLarger
|
2017-06-24 14:53:53 -05:00 |
|
Daniel Ternyak
|
08f44e1d4a
|
Merge branch 'swap_part_2' into swap_part_2_more
|
2017-06-24 13:19:14 -05:00 |
|
Daniel Ternyak
|
119dda77e1
|
Create toFixedIfLarger function, unit test, and use in app.
|
2017-06-24 13:17:09 -05:00 |
|
Daniel Ternyak
|
28415cd0e8
|
Consume new receivingAddressSwap action creator and receivingAddress state, validate receiving address input using Validator class.
|
2017-06-24 01:09:44 -05:00 |