Commit graph

15 commits

Author SHA1 Message Date
Mayesters
dbb118c8ee Fix small error in merge master -> i18n 2017-05-26 17:30:18 +02:00
Mayesters
636a302e70 Merge branch 'master' into i18n + Windows development batch files 2017-05-26 17:21:52 +02:00
Intnick
85aa35122e help page trans 2017-05-26 02:27:05 +02:00
Jeremy Kauffman
aee0603dc9 fix version info on help 2017-05-25 14:29:28 -04:00
Jeremy Kauffman
a08a214d34 fix text areas and bug reporting 2017-05-21 18:34:12 -04:00
Jeremy Kauffman
209db5e3d0 Merge branch 'redux' into es6-classes 2017-05-19 09:17:41 -04:00
Jeremy Kauffman
9d8fa102ee bug fixes, file info and my claims refactor, list claims in channel 2017-05-18 19:14:26 -04:00
Alex Liebowitz
3e35d44978 Basics of conversion to ES6 classes 2017-05-18 04:39:18 -04:00
Jeremy Kauffman
3fa4d0dfe7 progress towards fixing settings and costs 2017-05-17 17:52:45 -04:00
6ea86b96
d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07:00
6ea86b96
494d885f31
Use SubHeader for all sub navigation 2017-05-05 12:28:28 +07:00
Jeremy Kauffman
36a992343f much progress towards a working merge 2017-05-03 23:44:08 -04:00
6ea86b96
089572880f Wallet progress 2017-05-02 18:47:03 -04:00
6ea86b96
3d5e1db5e3 Redux proof of concept 2017-05-02 18:37:19 -04:00
6ea86b96
0d3647c709 Redux proof of concept 2017-05-02 18:24:21 -04:00