c77f5ef300
address sleep() hack -- get state directly from redux instead of relying on props
2017-06-18 23:53:32 -05:00
192efd4404
reformat
2017-06-18 20:00:54 -05:00
f2b8045c21
address additional comments
2017-06-18 19:56:11 -05:00
1ae411fbf0
Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet into swap
2017-06-18 19:32:44 -05:00
3ec7b5c834
Merge pull request #14 from MyEtherWallet/cleanup
...
Cleanup
2017-06-18 15:00:54 -05:00
3333169c27
Fix duplicate location key due to bad marge
2017-06-18 15:00:15 -05:00
125d8742ae
Merge branch 'cleanup' into swap
2017-06-18 14:58:45 -05:00
8e530fe476
use props.location instead of window
2017-06-18 14:56:12 -05:00
fb73be4214
WIP address comments
2017-06-18 14:47:00 -05:00
00e5962ae0
Merge branch 'cleanup' into swap
2017-06-18 14:39:46 -05:00
ef4c7c8868
Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet into swap
2017-06-18 14:31:02 -05:00
e98ac4ac57
Merge pull request #17 from MyEtherWallet/windows-run-build
...
Use `fs` library so even Windows users can run build.
2017-06-18 14:27:41 -05:00
d9ec50f859
Use `fs` library so even Windows users can run build.
2017-06-12 20:20:52 -04:00
df3ddd7351
Add swap link; fix activeOrNot nav option selection.
2017-06-11 20:08:48 -05:00
ee8c411c4e
Remove comments.
2017-06-11 20:08:19 -05:00
81d5f64100
Swap: add axios and lodash to package.json
2017-06-11 20:05:36 -05:00
d745729d95
Swap: Initial Swap Home View
2017-06-11 20:02:39 -05:00
e8a10b3848
Swap: Initial Bity API Class
2017-06-11 20:01:27 -05:00
0304bc8a67
Swap: Redux actions; Redux Reducers
2017-06-11 20:00:28 -05:00
9144d2c666
Merge pull request #11 from MyEtherWallet/feat/translator-names
...
translator names
2017-06-01 23:46:21 -05:00
3718e4f128
translator names
2017-06-02 00:45:00 +04:00
aca012af6a
tarnslate: html entites test
2017-06-02 00:13:59 +04:00
69e1fbd8ff
Merge pull request #10 from MyEtherWallet/key-markup-links
...
linkify in markup.js now adds keys to multiple links.
2017-05-31 20:06:59 -05:00
608f50ae1c
Added keys for bolding and linking for markup.js
...
If you were to mix-and-match or use multiple markdown elements in one
string, this would cause a React key error. This fixes it by key-ing all
the things!
2017-05-31 20:46:03 -04:00
9d557785e3
linkify in markup.js now adds keys to multiple links.
...
Notably, LID "VIEWWALLET_Subtitle" was causing an issue here, since it
had more than one link. React was complaining about it but now it's all
good.
2017-05-31 19:58:03 -04:00
083b7c5caa
Merge pull request #7 from MyEtherWallet/more_translations
...
More translations
2017-05-31 00:37:46 -04:00
e49e72d250
Let to Const
2017-05-31 00:36:00 -04:00
db70e17a67
PR comments
2017-05-30 22:34:57 -05:00
4a140b7901
Merge pull request #8 from MyEtherWallet/linting-routing
...
Linting routing
2017-05-30 20:57:46 -04:00
943161a863
Linting double quotes to single
2017-05-30 20:53:14 -04:00
62dcec96d9
fix merge conflicts
2017-05-30 18:35:30 -05:00
e9cddb516e
actually use friendly errors webpack plugin
2017-05-31 01:00:30 +04:00
96cf7f5969
eslint
2017-05-31 00:36:52 +04:00
e80ad3b053
trick reconciler into re-render on language change
2017-05-30 15:19:51 +04:00
b7ffa458b0
decode &s
2017-05-30 15:18:59 +04:00
ec4212ae8f
fix footer spacing
2017-05-30 15:18:39 +04:00
f9b351b4c8
Revert "fix & sign"
...
This reverts commit 448ffe64f4
2017-05-30 15:02:20 +04:00
f4e7f0648b
improve GenerateWalletPasswordComponent translation support
2017-05-30 01:18:44 -05:00
448ffe64f4
fix & sign
2017-05-30 01:18:23 -05:00
db19b45c0d
fix active bug in navbar
2017-05-30 01:18:12 -05:00
cf36d9eb52
footer, generate wallet improved translations
2017-05-29 23:53:28 -05:00
8754f5a2b4
Merge pull request #6 from MyEtherWallet/feat/translations
...
Baby translations
2017-05-28 11:03:32 +00:00
1602e19214
support translations markup
2017-05-26 02:05:11 +04:00
bea2b12f2d
add Korean to languages dropdown
2017-05-25 22:32:34 +04:00
6b7a555f19
+ ko.js
2017-05-25 22:29:55 +04:00
8b021be460
update ja.js
2017-05-25 22:27:14 +04:00
bb99a6f0b2
Merge branch 'develop' into feat/translations
2017-05-25 10:06:53 +00:00
a3bcea69c8
Merge pull request #5 from MyEtherWallet/help_view
...
Help view
2017-05-25 01:39:20 -05:00
c4d7738e14
translations alias for jest
2017-05-25 04:17:27 +04:00
8516b03343
baby translations
2017-05-25 04:06:30 +04:00
Daniel Ternyak
Daniel Kaspo
crptm